From 37dc5f07121946aa03ce96030a9f400af032367d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 16:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath
---
HDL-ON_iOS/AppDelegate.cs | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 480e78e..860b509 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -165,7 +165,7 @@
public override void OnResignActivation(UIApplication application)
{
Console.WriteLine("OnResignActivation");
- UserInfo.Current.unlockTime = DateTime.Now;
+ OnAppConfig.Instance.unlockTime = DateTime.Now;
HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
}
@@ -195,7 +195,7 @@
{
Console.WriteLine("OnActivated");
base.OnActivated(application);
- Console.WriteLine("oooo...");
+
//if (haveToSignOut == true)
//{
////寮哄埗涓嬬嚎
@@ -211,8 +211,16 @@
{
//Shared.Application.FontSize = 12;
+
+ //鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
Shared.Application.IsEditTextContentTypePassword = false;
+ //榛樿浣跨敤鑻规柟瀛椾綋
Shared.Application.IsUsePingFang = true;
+ ////榛樿绂佹闊充箰鏈嶅姟
+ //Shared.Application.IsMusicEnable = false;
+ //淇濇寔灞忓箷甯镐寒鎴栬�呰嚜鍔ㄩ攣灞�
+ application.IdleTimerDisabled = false;
+
Window = new UIWindow(UIScreen.MainScreen.Bounds);
rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
Window.RootViewController = rootViewController;
@@ -235,7 +243,7 @@
// OnAppConfig.Instance.SaveUserConfig();
//}
- application.IdleTimerDisabled = true;
+
application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
//window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -287,8 +295,28 @@
var expandData = "";
if (userInfo.ContainsKey(new NSString("expandData")))
{
- var expandDataNSD = userInfo["expandData"] as NSDictionary;
- expandData = expandDataNSD["messageType"] as NSString;
+ var expandDataStr = userInfo["expandData"] as NSString;
+ if(expandDataStr == null)
+ {
+ var expandDataNSD = userInfo["expandData"] as NSDictionary;
+ if (expandDataNSD != null)
+ {
+ expandData = expandDataNSD.ToString();
+ }
+ }
+ else
+ {
+ expandData = expandDataStr;
+ }
+
+ //var expandDataNSD = userInfo["expandData"] as NSDictionary;
+ //if (expandDataNSD != null && expandDataNSD is NSDictionary)
+ //{
+ // if (expandDataNSD.ContainsKey(new NSString("messageType")))
+ // {
+ // expandData = expandDataNSD["messageType"] as NSString;
+ // }
+ //}
}
var pushMes = new JPushMessageInfo()
{
--
Gitblit v1.8.0