From 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 24 十一月 2020 15:58:10 +0800
Subject: [PATCH] 2020-11-24 1.优化登录界面失败提示。

---
 HDL-ON_iOS/AppDelegate.cs |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index b85adf9..9335648 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -7,6 +7,7 @@
 using Microsoft.AppCenter;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.AppCenter.Crashes;
+using HDL_ON.UI;
 
 namespace SharedMethod
 {
@@ -22,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}";
         //    }
@@ -40,7 +41,7 @@
     // The UIApplicationDelegate for the application. This class is responsible for launching the
     // User Interface of the application, as well as listening (and optionally responding) to application events from iOS.
     [Register("AppDelegate")]
-    public class AppDelegate : BaseApplicationDelegate
+    public class AppDelegate : BaseApplicationDelegateForHdlOn// BaseApplicationDelegate
     {
         // class-level declarations
 
@@ -56,6 +57,7 @@
         //    // If not required for your application you can safely delete this method
         //    return true;
         //}
+        internal static UINavigationController rootViewController;
 
         public static void CleanApplicationIconBadgeNumber()
         {
@@ -98,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();
             }
         }
 
@@ -141,14 +143,13 @@
         public override void OnResignActivation(UIApplication application)
         {
             Console.WriteLine("OnResignActivation");
-            BusSocket.Stop();
+            OnAppConfig.Instance.unlockTime = DateTime.Now;
+            //BusSocket.Stop();
         }
 
         public override void DidEnterBackground(UIApplication application)
         {
             SharedMethod.SharedMethod.IsBackground = true;
-            if (MainPage.LoginUser != null)
-                HDL_ON.Entity.DB_ResidenceData.residenceData.SaveResidenceData();
             Console.WriteLine("DidEnterBackground");
         }
 
@@ -156,7 +157,8 @@
         public override void WillEnterForeground(UIApplication application)
         {
             SharedMethod.SharedMethod.IsBackground = false;
-            BusSocket.Start(6000);
+            //BusSocket.Start();
+            new AppUnlockPage().LoadPage();
             Console.WriteLine("WillEnterForeground");
             UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
         }
@@ -170,32 +172,40 @@
         {
             Console.WriteLine("OnActivated");
             base.OnActivated(application);
+
         }
 
         public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
         {
-            AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e",
-                               typeof(Analytics), typeof(Crashes));
+
+            //Shared.Application.FontSize = 12;
+            //Shared.Application.IsUsePingFang = true;
+            Window = new UIWindow(UIScreen.MainScreen.Bounds);
+            rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
+            Window.RootViewController = rootViewController;
+            Window.MakeKeyAndVisible();
+
+
+
+            AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e",typeof(Analytics), typeof(Crashes));
             base.FinishedLaunching(application, launchOptions);
 
             SharedMethod.SharedMethod.sharedApp = application;
-            Shared.Application.IsGpsEnable = false;
             //NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
             application.StatusBarStyle = UIStatusBarStyle.DarkContent;
 
-            string nsCount = NSLocale.CurrentLocale.CountryCode;
-            if (nsCount != OnAppConfig.Instance.CountryCode)
-            {
-                OnAppConfig.Instance.CountryCode = nsCount;
-                OnAppConfig.Instance.SaveUserConfig();
-            }
+            //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.IdleTimerDisabled = true;
             application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
 
-            Window = new UIWindow(UIScreen.MainScreen.Bounds);
-            var Root = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
-            Window.RootViewController = Root;
-            Window.MakeKeyAndVisible();
             //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
             // check for a notification
             if (launchOptions != null)

--
Gitblit v1.8.0