Revert "20201127 合并嘉乐代码"

wei

2020-11-27 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c

 HDL-ON_iOS/AppDelegate.cs

@@ -100,15 +100,15 @@
                string userPhoneName = UIDevice.CurrentDevice.Name;

                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                OnAppConfig.Instance.PhoneName = userPhoneName;
                OnAppConfig.Instance.SaveUserConfig();
                //UserConfig.Instance.phoneName = userPhoneName;
                //UserConfig.Instance.SaveUserConfig();
            }
            if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
            {
                string userPhoneName = UIDevice.CurrentDevice.Name;
                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                OnAppConfig.Instance.PhoneName = userPhoneName;
                OnAppConfig.Instance.SaveUserConfig();
                //UserConfig.Instance.phoneName = userPhoneName;
                //UserConfig.Instance.SaveUserConfig();
            }
        }

@@ -194,15 +194,15 @@
            //NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
            application.StatusBarStyle = UIStatusBarStyle.DarkContent;

            //string nsCount = NSLocale.CurrentLocale.CountryCode;
            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();
            //}
            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.IdleTimerDisabled = true;
            application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);