From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL-ON_iOS/AppDelegate.cs | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index c10be06..bd6c6dc 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();
}
@@ -195,23 +200,30 @@
{
Console.WriteLine("OnActivated");
base.OnActivated(application);
+ HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
//if (haveToSignOut == true)
//{
- ////寮哄埗涓嬬嚎
- //UserInfo.Current.LastTime = DateTime.MinValue;
- //UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
- //UserInfo.Current.SaveUserInfo();
- //HDLCommon.Current.ShowAlert(Language.StringByID(StringId.LoggedOnOtherDevices));
+ ////寮哄埗涓嬬嚎
+ //UserInfo.Current.LastTime = DateTime.MinValue;
+ //UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
+ //UserInfo.Current.SaveUserInfo();
+ //HDLCommon.Current.ShowAlert(Language.StringByID(StringId.LoggedOnOtherDevices));
//}
}
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
-
//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;
@@ -284,16 +296,35 @@
var body = alert["body"] as NSString;
var title = alert["title"] as NSString;
var expandData = "";
+ var messageType = "";
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();
+ if(expandDataNSD.ContainsKey(new NSString("messageType"))){
+ messageType = expandDataNSD["messageType"] as NSString;
+ Utlis.WriteLine("messageType: "+ messageType);
+ }
+
+ }
+ }
+ else
+ {
+ expandData = expandDataStr;
+ }
+
}
var pushMes = new JPushMessageInfo()
{
Title = title,
Content = body,
Extras = expandData,
+ messageType = messageType
};
System.Console.WriteLine("PushMes title : " + pushMes.Title);
System.Console.WriteLine("PushMes message : " + pushMes.Content);
--
Gitblit v1.8.0