From 1aa53dcce192d9a5f5e1abd6ba1bad04427c6010 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 15 三月 2021 15:51:27 +0800
Subject: [PATCH] 2021-03-15 1.更新丰林推送处理
---
HDL_ON/Common/HDLCommon.cs | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 70b5864..1abb521 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -248,44 +248,58 @@
#region 鈻� 鎺ㄩ�佸鐞哶______________________
/// <summary>
/// 鎺ㄩ�佹秷鎭鐞�
+ /// 娉ㄦ剰锛欰ndroid瑕佸湪涓荤嚎绋嬶紙UI绾跨▼锛夋墽琛�
/// </summary>
/// <param name="jpushMessageInfo"></param>
public void AdjustPushMessage(JPushMessageInfo jpushMessageInfo)
{
try
{
- if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("OffLine"))
- {
- Shared.Application.RunOnMainThread(() =>
- {
- ////璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
- //new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- //閫�鍑虹櫥褰曟搷浣�
- CheckLogout();
+ //Extras涓虹┖涓嶅鐞�
+ if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
- });
- return;
+ if (jpushMessageInfo.Extras.Contains(PushMessageType.OffLine.ToString()))
+ {
+ CheckLogout();
}
else
{
- Shared.Application.RunOnMainThread(() =>
- {
- GetPushMessageAction?.Invoke();
- //鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
- if (jpushMessageInfo.messageType != null && jpushMessageInfo.messageType.Contains("Alarm"))
- {
- //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
- ShowAlarmPushMessage(jpushMessageInfo);
- //new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
- }
+ GetPushMessageAction?.Invoke();
- });
- return;
+ //messageType涓虹┖涓嶅鐞�
+ if (string.IsNullOrEmpty(jpushMessageInfo.messageType)) return;
+
+ //鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
+ if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+ {
+ //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
+ ShowAlarmPushMessage(jpushMessageInfo);
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
+ {
+#if DEBUG
+#if __Android__
+
+ ShowAlert("鏉ョ數閫氱煡锛侊紒锛侊紒");
+
+#else
+ ESOnVideo.Current.Test();
+#endif
+#endif
+ //瑙ｆ瀽鍛煎彨鐨勯棬鍙ｆ満UUID淇℃伅锛屽苟璺宠浆涓版灄鍛煎彨椤甸潰
+ //ESVideoInfo eSVideoInfo = new ESVideoInfo()
+ //{
+ // DeviceName = "瀹ゅ鏈�88",
+ // ESVideoUUID = "JJY000019VPLLF",
+ //};
+ //ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo);
+
+ }
}
}
- catch
+ catch(Exception EX)
{
-
+ Utlis.WriteLine("catch: " + EX.ToString());
}
}
--
Gitblit v1.8.0