From e29de9af8f507d288a61d9459fb3d1f72976876f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 10:40:08 +0800
Subject: [PATCH] 2020-05-18-1

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

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 8bdad2d..3eac3c1 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
 {
@@ -97,14 +98,14 @@
                 NSUserDefaults.StandardUserDefaults.SetString(DeviceToken, "PushDeviceToken");
                 string userPhoneName = UIDevice.CurrentDevice.Name;
 
-                UserConfig.Instance.PushDeviceToken = DeviceToken;
+                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                 //UserConfig.Instance.phoneName = userPhoneName;
                 //UserConfig.Instance.SaveUserConfig();
             }
-            if (UserConfig.Instance.PushDeviceToken != DeviceToken)
+            if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
             {
                 string userPhoneName = UIDevice.CurrentDevice.Name;
-                UserConfig.Instance.PushDeviceToken = DeviceToken;
+                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                 //UserConfig.Instance.phoneName = userPhoneName;
                 //UserConfig.Instance.SaveUserConfig();
             }
@@ -147,7 +148,6 @@
         public override void DidEnterBackground(UIApplication application)
         {
             SharedMethod.SharedMethod.IsBackground = true;
-            HDL_ON.Entity.DB_ResidenceData.residenceData.SaveResidenceData();
             Console.WriteLine("DidEnterBackground");
         }
 
@@ -156,6 +156,7 @@
         {
             SharedMethod.SharedMethod.IsBackground = false;
             BusSocket.Start(6000);
+            AppUnlockPage.LoadPage();
             Console.WriteLine("WillEnterForeground");
             UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
         }
@@ -169,6 +170,7 @@
         {
             Console.WriteLine("OnActivated");
             base.OnActivated(application);
+
         }
 
         public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
@@ -183,14 +185,14 @@
             application.StatusBarStyle = UIStatusBarStyle.DarkContent;
 
             string nsCount = NSLocale.CurrentLocale.CountryCode;
-            if (nsCount != UserConfig.Instance.CountryCode)
+            if (nsCount != OnAppConfig.Instance.CountryCode)
             {
-                UserConfig.Instance.CountryCode = nsCount;
-                UserConfig.Instance.SaveUserConfig();
+                OnAppConfig.Instance.CountryCode = 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;

--
Gitblit v1.8.0