From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1

---
 HDL-ON_iOS/AppDelegate.cs |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 28d9fd4..3eac3c1 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -4,6 +4,10 @@
 using Shared;
 using UIKit;
 using UserNotifications;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
+using HDL_ON.UI;
 
 namespace SharedMethod
 {
@@ -15,13 +19,10 @@
 
         //public static string CheckVersion()
         //{
-
         //    Harpy.Harpy.SharedInstance.CheckVersion();
-
         //    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")
         //    {
         //        return $"TestIsAppStoreVersionNewer : {UserConfig.Instance.IsAppStoreVersionNewer};;  CurrentAppStoreVersion : {UserConfig.Instance.StoreVersion}";
@@ -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();
             }
@@ -113,8 +114,6 @@
         public override void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
         {
             Console.WriteLine("DidReceiveRemoteNotification:" + application.ApplicationState.ToString());
-
-            UserConfig.Instance.SaveUserConfig();
 
             //璇诲彇鎺ㄩ�佷俊鎭�
             UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
@@ -152,10 +151,12 @@
             Console.WriteLine("DidEnterBackground");
         }
 
+
         public override void WillEnterForeground(UIApplication application)
         {
             SharedMethod.SharedMethod.IsBackground = false;
             BusSocket.Start(6000);
+            AppUnlockPage.LoadPage();
             Console.WriteLine("WillEnterForeground");
             UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
         }
@@ -169,11 +170,13 @@
         {
             Console.WriteLine("OnActivated");
             base.OnActivated(application);
+
         }
 
         public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
         {
-            //AppCenter.Start("b95f7814-49fb-4345-bac5-98e70d098252", typeof(Analytics), typeof(Crashes));
+            AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e",
+                               typeof(Analytics), typeof(Crashes));
             base.FinishedLaunching(application, launchOptions);
 
             SharedMethod.SharedMethod.sharedApp = application;
@@ -182,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