Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-11 82423359112f65458fd9a80418da0bda5e9364d9

 HDL-ON_iOS/AppDelegate.cs

@@ -165,7 +165,7 @@
        public override void OnResignActivation(UIApplication application)
        {
            Console.WriteLine("OnResignActivation");
            OnAppConfig.Instance.unlockTime = DateTime.Now;
            UserInfo.Current.unlockTime = DateTime.Now;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
        }

@@ -218,6 +218,8 @@
            Shared.Application.IsUsePingFang = true;
            ////默认禁止音乐服务
            //Shared.Application.IsMusicEnable = false;
            //保持屏幕常亮或者自动锁屏
            application.IdleTimerDisabled = false;

            Window = new UIWindow(UIScreen.MainScreen.Bounds);
            rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
@@ -241,7 +243,7 @@
            //    OnAppConfig.Instance.SaveUserConfig();
            //}

            application.IdleTimerDisabled = true;
           
            application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);

            //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -293,8 +295,28 @@
                    var expandData = "";
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        expandData = expandDataNSD["messageType"] as NSString;
                        var expandDataStr = userInfo["expandData"] as NSString;
                        if(expandDataStr == null)
                        {
                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                            }
                        }
                        else
                        {
                            expandData = expandDataStr;
                        }

                        //var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        //if (expandDataNSD != null && expandDataNSD is NSDictionary)
                        //{
                        //    if (expandDataNSD.ContainsKey(new NSString("messageType")))
                        //    {
                        //        expandData = expandDataNSD["messageType"] as NSString;
                        //    }
                        //}
                    }
                    var pushMes = new JPushMessageInfo()
                    {