From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL-ON_iOS/AppDelegate.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index c10be06..437d7e3 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -99,18 +99,23 @@
// Save new device token
NSUserDefaults.StandardUserDefaults.SetString(DeviceToken, "PushDeviceToken");
- string userPhoneName = UIDevice.CurrentDevice.Name;
- UserInfo.Current.PushDeviceToken = DeviceToken;
- UserInfo.Current.PhoneName = userPhoneName;
- UserInfo.Current.SaveUserInfo();
+ //UserInfo.Current.PushDeviceToken = DeviceToken;
+ //UserInfo.Current.PhoneName = userPhoneName;
+ //UserInfo.Current.SaveUserInfo();
+ OnAppConfig.Instance.PushDeviceToken = DeviceToken;
+ OnAppConfig.Instance.PhoneName = UIDevice.CurrentDevice.Name;
+ OnAppConfig.Instance.SaveConfig();
}
- if (UserInfo.Current.PushDeviceToken != DeviceToken)
+ if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
{
- string userPhoneName = UIDevice.CurrentDevice.Name;
- UserInfo.Current.PushDeviceToken = DeviceToken;
- UserInfo.Current.PhoneName = userPhoneName;
- UserInfo.Current.SaveUserInfo();
+ //string userPhoneName = UIDevice.CurrentDevice.Name;
+ //UserInfo.Current.PushDeviceToken = DeviceToken;
+ //UserInfo.Current.PhoneName = userPhoneName;
+ //UserInfo.Current.SaveUserInfo();
+ OnAppConfig.Instance.PushDeviceToken = DeviceToken;
+ OnAppConfig.Instance.PhoneName = UIDevice.CurrentDevice.Name;
+ OnAppConfig.Instance.SaveConfig();
}
}
@@ -165,7 +170,7 @@
public override void OnResignActivation(UIApplication application)
{
Console.WriteLine("OnResignActivation");
- OnAppConfig.Instance.unlockTime = DateTime.Now;
+ UserInfo.Current.unlockTime = DateTime.Now;
HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
}
@@ -211,7 +216,14 @@
{
//Shared.Application.FontSize = 12;
+
+ //鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
+ Shared.Application.IsEditTextContentTypePassword = false;
+ //榛樿浣跨敤鑻规柟瀛椾綋
Shared.Application.IsUsePingFang = true;
+ //淇濇寔灞忓箷甯镐寒鎴栬�呰嚜鍔ㄩ攣灞�
+ application.IdleTimerDisabled = false;
+
Window = new UIWindow(UIScreen.MainScreen.Bounds);
rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
Window.RootViewController = rootViewController;
@@ -234,7 +246,7 @@
// OnAppConfig.Instance.SaveUserConfig();
//}
- application.IdleTimerDisabled = true;
+
application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
//window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -286,8 +298,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