From 23d7cefd31bd431dd177b3b5267331e070c5fc5f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 17 七月 2023 13:26:01 +0800
Subject: [PATCH] 视频门锁
---
HDL_ON/Common/HDLCommon.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 14d03fa..ba7989b 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -258,12 +258,12 @@
{
try
{
- MainPage.Log($"鎺ユ敹鍒版帹閫�");
+ MainPage.Log($"鎺ユ敹鍒版帹閫�.\r\n{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
- if (jpushMessageInfo.Extras.Contains(PushMessageType.OffLine.ToString()))
+ if (jpushMessageInfo.Extras == (PushMessageType.OffLine.ToString()))
{
CheckLogout();
}
@@ -275,14 +275,14 @@
if (string.IsNullOrEmpty(jpushMessageInfo.messageType)) return;
//鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
- if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+ if (jpushMessageInfo.messageType == (PushMessageType.Alarm.ToString()))
{
//鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
ShowAlarmPushMessage(jpushMessageInfo, true);
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
@@ -305,7 +305,7 @@
ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString());
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.HDL_INTERPHONE.ToString()))
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
@@ -314,7 +314,16 @@
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
try
{
+ //var pushHomeId = json["homeId"];
+ //if (pushHomeId == null || string.IsNullOrEmpty(pushHomeId.ToString())){
+ // Console.WriteLine("homeId is null");
+ // return;
+ //}
var pushTime = json["pushTime"];
+ if(pushTime == null)
+ {
+ return;
+ }
if (!string.IsNullOrEmpty(pushTime.ToString()))
{
var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
@@ -386,13 +395,13 @@
ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
{
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
--
Gitblit v1.8.0