Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 HDL-ON_iOS/AppDelegate.cs

@@ -99,16 +99,16 @@
                NSUserDefaults.StandardUserDefaults.SetString(DeviceToken, "PushDeviceToken");
                string userPhoneName = UIDevice.CurrentDevice.Name;

                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                OnAppConfig.Instance.PhoneName = userPhoneName;
                OnAppConfig.Instance.SaveUserConfig();
                UserInfo.Current.PushDeviceToken = DeviceToken;
                UserInfo.Current.PhoneName = userPhoneName;
                UserInfo.Current.SaveUserInfo();
            }
            if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
            if (UserInfo.Current.PushDeviceToken != DeviceToken)
            {
                string userPhoneName = UIDevice.CurrentDevice.Name;
                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                OnAppConfig.Instance.PhoneName = userPhoneName;
                OnAppConfig.Instance.SaveUserConfig();
                UserInfo.Current.PushDeviceToken = DeviceToken;
                UserInfo.Current.PhoneName = userPhoneName;
                UserInfo.Current.SaveUserInfo();
            }
        }