Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL-ON_iOS/AppDelegate.cs

@@ -4,9 +4,6 @@
using Shared;
using UIKit;
using UserNotifications;
using Microsoft.AppCenter;
using Microsoft.AppCenter.Analytics;
using Microsoft.AppCenter.Crashes;
using HDL_ON.UI;
using HDL_ON.DAL.Server;
using Intents;
@@ -189,8 +186,12 @@
        public override void OnResignActivation(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);

            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            }
            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
        }
@@ -198,8 +199,12 @@
        public override void DidEnterBackground(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);

            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            //}
            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
            ////进入后台mqtt正在连接重置状态
@@ -226,8 +231,12 @@
        public override void OnActivated(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);

            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            //}
            Console.WriteLine("OnActivated");
            base.OnActivated(application);
            //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -285,12 +294,16 @@
        {

            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());

            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            //}
            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
            Bugly.Bugly.StartWithAppId("b58fb35436");
            Bugly.Bugly.StartWithAppId("1dc40c170a");
            //取消EditText默认密码输入方式
            //Shared.Application.IsEditTextContentTypePassword = false;
            //默认使用苹方字体
@@ -304,8 +317,6 @@
            Window.RootViewController = rootViewController;
            Window.MakeKeyAndVisible();

            AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e", typeof(Analytics), typeof(Crashes));

            SharedMethod.SharedMethod.sharedApp = application;
            //NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
            application.StatusBarStyle = UIStatusBarStyle.DarkContent;
@@ -318,20 +329,15 @@
            //    //RemoteInfo.Current.ReadMsgList(true);
            //}

            //高德key
            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");

            //高德key
            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
            Console.WriteLine("FinishedLaunching");
            return true;
        }

        
            /// <summary>
            /// 处理通知消息
            /// </summary>
            void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)

        /// <summary>
        /// 处理通知消息
        /// </summary>
        void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        {
            try
            {
@@ -349,13 +355,14 @@
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataStr = userInfo["expandData"] as NSString;
                        if(expandDataStr == null)
                        if (expandDataStr == null)
                        {
                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
                                if (expandDataNSD.ContainsKey(new NSString("messageType")))
                                {
                                    messageType = expandDataNSD["messageType"] as NSString;
                                    Utlis.WriteLine("messageType: " + messageType);
                                }
@@ -398,7 +405,7 @@
                        UserInfo.Current.pushMessageInfo = pushMes;
                        UserInfo.Current.inCall = DateTime.Now;
                    }
                    

                    if (bFinishedLaunching)
                    {
                        if (pushMes.Extras != null)
@@ -424,7 +431,7 @@
                        //HDLCommon.Current.AdjustPushMessage(pushMes);
                        this.CommonAdjustPushMessage(pushMes);
                    }
                   

                }
            }
            catch