Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL-ON_iOS/AppDelegate.cs

@@ -132,6 +132,8 @@
            }

            Console.WriteLine(userInfo);
            //HDLCommon.Current.ShowAlert("DidReceiveRemoteNotification:" + userInfo.ToString());


            if (application.ApplicationState == UIApplicationState.Active || application.ApplicationState == UIApplicationState.Background)
            {
@@ -215,17 +217,44 @@

        }

        /// <summary>
        /// 设置当前使用语言
        /// </summary>
        void SetCurrentLanguage()
        {
            if (string.IsNullOrEmpty(OnAppConfig.Instance.SetLanguage))
            {
                if (NSLocale.PreferredLanguages[0].Contains("zh-"))
                {
                    Language.CurrentLanguage = "Chinese";
                }
                else if (NSLocale.PreferredLanguages[0].Contains("cs-"))
                {
                    Language.CurrentLanguage = "Czech";
                }
                else
                {
                    Language.CurrentLanguage = "English";
                }
            }
            else
            {
                Language.CurrentLanguage = OnAppConfig.Instance.SetLanguage;
            }
        }

        public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
        {
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
            //Bugly.Bugly.StartWithAppId("b58fb35436");

            //取消EditText默认密码输入方式
            //Shared.Application.IsEditTextContentTypePassword = false;
            //默认使用苹方字体
            Shared.Application.IsUsePingFang = true;
            //保持屏幕常亮或者自动锁屏
            application.IdleTimerDisabled = false;
            base.FinishedLaunching(application, launchOptions);

            Window = new UIWindow(UIScreen.MainScreen.Bounds);
            rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
@@ -234,54 +263,18 @@

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

            base.FinishedLaunching(application, launchOptions);

            SharedMethod.SharedMethod.sharedApp = application;
            //NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
            application.StatusBarStyle = UIStatusBarStyle.DarkContent;

            //string nsCount = NSLocale.CurrentLocale.CountryCode;

            //if ( UserInfo.Current != null && nsCount !=  UserInfo.Current.areaCode.ToString())
            //{
            //    //int.TryParse(nsCount,out  UserInfo.Current.areaCode);
            //    //2020-11-18
            //     UserInfo.Current.areaCode = nsCount;
            //    OnAppConfig.Instance.SaveUserConfig();
            //}

           
            application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);

            //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
            // check for a notification
            DealWithPushMes(launchOptions);

            //if (UIApplication.SharedApplication.ApplicationIconBadgeNumber > 0)
            //{
            //    //RemoteInfo.Current.ReadMsgList(true);
            //}
          
            if (UIDevice.CurrentDevice.CheckSystemVersion(8, 0))
            {
                var notificationSettings = UIUserNotificationSettings.GetSettingsForTypes(UIUserNotificationType.Alert | UIUserNotificationType.Badge | UIUserNotificationType.Sound, null);
                application.RegisterUserNotificationSettings(notificationSettings);
                application.RegisterForRemoteNotifications();
            }
            else
            {
                //==== register for remote notifications and get the device token
                // set what kind of notification types we want
                UIRemoteNotificationType notificationTypes = UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge;
                // register for remote notifications
                UIApplication.SharedApplication.RegisterForRemoteNotificationTypes(notificationTypes);
            }

            if (UIApplication.SharedApplication.ApplicationIconBadgeNumber > 0)
            {
                //RemoteInfo.Current.ReadMsgList(true);
            }

            //Harpy.Harpy.SharedInstance.PresentingViewController = this.Window.RootViewController;
            //Harpy.Harpy.SharedInstance.WeakDelegate = this;
            //Harpy.Harpy.SharedInstance.AlertType = Harpy.HarpyAlertType.Skip;
            //Harpy.Harpy.SharedInstance.DebugEnabled = false;
            //Harpy.Harpy.SharedInstance.ForceLanguageLocalization = Harpy.Constants.HarpyLanguageChineseSimplified;
            Console.WriteLine("FinishedLaunching");
            return true;
        }
@@ -301,6 +294,8 @@
                    var title = alert["title"] as NSString;
                    var expandData = "";
                    var messageType = "";
                    var expantContent = "";
                    var homeId = "";
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataStr = userInfo["expandData"] as NSString;
@@ -312,9 +307,21 @@
                                expandData = expandDataNSD.ToString();
                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
                                    messageType = expandDataNSD["messageType"] as NSString;
                                    Utlis.WriteLine("messageType: "+ messageType);
                                    Utlis.WriteLine("messageType: " + messageType);
                                }
                                

                                if (expandDataNSD.ContainsKey(new NSString("expantContent")))
                                {
                                    expantContent = expandDataNSD["expantContent"] as NSString;
                                    Utlis.WriteLine("expantContent: " + expantContent);
                                }

                                if (expandDataNSD.ContainsKey(new NSString("homeId")))
                                {
                                    homeId = expandDataNSD["homeId"].ToString();
                                    Utlis.WriteLine("homeId: " + homeId);
                                }

                            }
                        }
                        else
@@ -325,10 +332,12 @@
                    }
                    var pushMes = new JPushMessageInfo()
                    {
                        HomeId = homeId,
                        Title = title,
                        Content = body,
                        Extras = expandData,
                        messageType = messageType
                        messageType = messageType,
                        expantContent = expantContent
                    };
                    Utlis.WriteLine("PushMes title : " + pushMes.Title);
                    Utlis.WriteLine("PushMes message : " + pushMes.Content);
@@ -336,14 +345,21 @@

                    if (bFinishedLaunching)
                    {
                        if (pushMes.Extras != null && pushMes.Extras.Contains("OffLine"))
                        if (pushMes.Extras != null)
                        {
                            //haveToSignOut = true;
                            //强制下线
                            UserInfo.Current.LastTime = DateTime.MinValue;
                            UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
                            UserInfo.Current.SaveUserInfo();
                            HDLCommon.Current.ShowAlert(Language.StringByID(StringId.LoggedOnOtherDevices));
                            if (pushMes.Extras.Contains("OffLine"))
                            {
                                //haveToSignOut = true;
                                //强制下线
                                UserInfo.Current.LastTime = DateTime.MinValue;
                                UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
                                UserInfo.Current.SaveUserInfo();
                                HDLCommon.Current.ShowAlert(Language.StringByID(StringId.LoggedOnOtherDevices));
                            }
                            else
                            {
                                HDLCommon.Current.AdjustPushMessage(pushMes);
                            }
                        }
                    }
                    else
@@ -355,7 +371,7 @@
            }
            catch
            {

                //HDLCommon.Current.ShowAlert("catch2222");
            }
        }

@@ -379,7 +395,7 @@

                    if (userInfo != null)
                    {
                        HandleNotificationMessageUserInfo(userInfo, true);
                        //HandleNotificationMessageUserInfo(userInfo, true);

                    }
                }