From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。
---
HDL-ON_iOS/AppDelegate.cs | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 860b509..48c27f5 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();
}
@@ -216,8 +221,6 @@
Shared.Application.IsEditTextContentTypePassword = false;
//榛樿浣跨敤鑻规柟瀛椾綋
Shared.Application.IsUsePingFang = true;
- ////榛樿绂佹闊充箰鏈嶅姟
- //Shared.Application.IsMusicEnable = false;
//淇濇寔灞忓箷甯镐寒鎴栬�呰嚜鍔ㄩ攣灞�
application.IdleTimerDisabled = false;
@@ -293,6 +296,7 @@
var body = alert["body"] as NSString;
var title = alert["title"] as NSString;
var expandData = "";
+ var messageType = "";
if (userInfo.ContainsKey(new NSString("expandData")))
{
var expandDataStr = userInfo["expandData"] as NSString;
@@ -302,6 +306,11 @@
if (expandDataNSD != null)
{
expandData = expandDataNSD.ToString();
+ if(expandDataNSD.ContainsKey(new NSString("messageType"))){
+ messageType = expandDataNSD["messageType"] as NSString;
+ Utlis.WriteLine("messageType: "+ messageType);
+ }
+
}
}
else
@@ -309,20 +318,13 @@
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()
{
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