From 387383a243879bf8c63a4611e2ed2c5a519e218d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:14:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL-ON_iOS/AppDelegate.cs | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 7d7622e..ac81ce3 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -41,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
@@ -57,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()
{
@@ -142,7 +143,8 @@
public override void OnResignActivation(UIApplication application)
{
Console.WriteLine("OnResignActivation");
- BusSocket.Stop();
+ OnAppConfig.Instance.unlockTime = DateTime.Now;
+ //BusSocket.Stop();
}
public override void DidEnterBackground(UIApplication application)
@@ -155,7 +157,7 @@
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;
@@ -175,9 +177,17 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
- Shared.Application.IsGpsEnable = false;
- 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;
@@ -185,18 +195,15 @@
application.StatusBarStyle = UIStatusBarStyle.DarkContent;
string nsCount = NSLocale.CurrentLocale.CountryCode;
- if (nsCount != OnAppConfig.Instance.CountryCode)
+
+ if (MainPage.LoginUser != null && nsCount != MainPage.LoginUser.areaCode.ToString())
{
- OnAppConfig.Instance.CountryCode = nsCount;
+ int.TryParse(nsCount,out MainPage.LoginUser.areaCode);
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