Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL-ON_iOS/AppDelegate.cs

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

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