From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL-ON_iOS/AppDelegate.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 652593e..480e78e 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -165,8 +165,8 @@
public override void OnResignActivation(UIApplication application)
{
Console.WriteLine("OnResignActivation");
- OnAppConfig.Instance.unlockTime = DateTime.Now;
- //BusSocket.Stop();
+ UserInfo.Current.unlockTime = DateTime.Now;
+ HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
}
public override void DidEnterBackground(UIApplication application)
@@ -179,10 +179,11 @@
public override void WillEnterForeground(UIApplication application)
{
SharedMethod.SharedMethod.IsBackground = false;
- //BusSocket.Start();
+ HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
new AppUnlockPage().LoadPage();
Console.WriteLine("WillEnterForeground");
UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
+ HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
}
public override void WillTerminate(UIApplication application)
@@ -194,7 +195,7 @@
{
Console.WriteLine("OnActivated");
base.OnActivated(application);
-
+ Console.WriteLine("oooo...");
//if (haveToSignOut == true)
//{
////寮哄埗涓嬬嚎
@@ -210,6 +211,7 @@
{
//Shared.Application.FontSize = 12;
+ Shared.Application.IsEditTextContentTypePassword = false;
Shared.Application.IsUsePingFang = true;
Window = new UIWindow(UIScreen.MainScreen.Bounds);
rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
@@ -285,7 +287,8 @@
var expandData = "";
if (userInfo.ContainsKey(new NSString("expandData")))
{
- expandData = userInfo["expandData"] as NSString;
+ var expandDataNSD = userInfo["expandData"] as NSDictionary;
+ expandData = expandDataNSD["messageType"] as NSString;
}
var pushMes = new JPushMessageInfo()
{
@@ -299,7 +302,7 @@
if (bFinishedLaunching)
{
- if (pushMes.Extras != null && pushMes.Extras.Contains("Offline"))
+ if (pushMes.Extras != null && pushMes.Extras.Contains("OffLine"))
{
//haveToSignOut = true;
//寮哄埗涓嬬嚎
--
Gitblit v1.8.0