From 8c1bf42c5fca66625b59728006bd47bae0b6a3ad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:18:16 +0800
Subject: [PATCH] Revert "Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL"

---
 HDL-ON_iOS/AppDelegate.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index ac81ce3..4dfffc8 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -23,7 +23,7 @@
         //    UserConfig.Instance.IsAppStoreVersionNewer = Harpy.Harpy.SharedInstance.TestIsAppStoreVersionNewer;
         //    UserConfig.Instance.StoreVersion = Harpy.Harpy.SharedInstance.CurrentAppStoreVersion;
         //    UserConfig.Instance.SaveUserConfig();
-        //    if (Shared.SimpleControl.MainPage.LoginUser.AccountString == @"464027401@qq.com")
+        //    if (Shared.SimpleControl. UserInfo.Current.AccountString == @"464027401@qq.com")
         //    {
         //        return $"TestIsAppStoreVersionNewer : {UserConfig.Instance.IsAppStoreVersionNewer};;  CurrentAppStoreVersion : {UserConfig.Instance.StoreVersion}";
         //    }
@@ -196,9 +196,11 @@
 
             string nsCount = NSLocale.CurrentLocale.CountryCode;
 
-            if (MainPage.LoginUser != null && nsCount != MainPage.LoginUser.areaCode.ToString())
+            if ( UserInfo.Current != null && nsCount !=  UserInfo.Current.areaCode.ToString())
             {
-                int.TryParse(nsCount,out MainPage.LoginUser.areaCode);
+                //int.TryParse(nsCount,out  UserInfo.Current.areaCode);
+                //2020-11-18
+                 UserInfo.Current.areaCode = nsCount;
                 OnAppConfig.Instance.SaveUserConfig();
             }
             application.IdleTimerDisabled = true;

--
Gitblit v1.8.0