From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 26 七月 2023 13:14:00 +0800 Subject: [PATCH] 2023年07月26日13:12:21 --- HDL_ON/Common/HDLCommon.cs | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index b85e591..24e612e 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -258,12 +258,12 @@ { try { - + 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)); @@ -349,6 +358,14 @@ eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙� eSVideoInfo.HomeId = jpushMessageInfo.HomeId; + if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString())) + { + eSVideoInfo.msgId = json["msgId"].ToString(); + } + if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString())) + { + eSVideoInfo.currentTime = json["currentTime"].ToString(); + } } else if (interphoneTypeEnum == InterphoneType.HDL.ToString()) { @@ -386,18 +403,19 @@ 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); } + } } catch (Exception EX) @@ -449,7 +467,9 @@ switch (UserInfo.Current.AccountString) { case "464027401@qq.com": + case "13580507523": case "15626203746": + case "18316672920": return; } @@ -495,7 +515,7 @@ #if __IOS__ //5.鍏ㄨ閫氱櫥鍑� - Shared.IOS.HDLFVSDK.Video.Logout(); + //Shared.IOS.HDLFVSDK.Video.Logout(); //6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅 new Other.SkipControl().SetData(false, "", "", "", ""); var sDM = new SiriKit.SceneDateManager(); -- Gitblit v1.8.0