From d5a7e0f0199959eac3a3a148624dfc58dbbe7a47 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 29 三月 2023 14:08:36 +0800
Subject: [PATCH] 1.更新EZSDK.IOS.dll 2.集成萤石相关方法 3.删除不必要的测试代码
---
HDL_ON/Common/HDLCommon.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index ba5977a..baff440 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -7,7 +7,7 @@
using HDL_ON.Entity;
using System.Threading;
using HDL_ON.DriverLayer;
-
+using Foundation;
namespace HDL_ON
{
/// <summary>
@@ -304,8 +304,9 @@
}
else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
{
+
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-
+
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
try
@@ -385,6 +386,21 @@
else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+ var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.VideoDoorLock.ExpantContent>(jpushMessageInfo.expantContent);
+ if (expantContent == null)
+ {
+ return;
+ }
+ ///瑙嗛闂ㄩ攣
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk,true);
+ }
+ catch { }
}
}
}
@@ -559,7 +575,7 @@
//闃叉澶氭寮圭獥澶勭悊
- if (alarmPushConfirmDialog == null)
+ if (alarmPushConfirmDialog == null)
{
alarmPushConfirmDialog = new ConfirmDialog(isAlarm);
alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
@@ -690,9 +706,11 @@
Console.WriteLine("loginToken锛�" + UserInfo.Current.LoginTokenString);
Console.WriteLine("refreshToken锛�" + UserInfo.Current.RefreshToken);
-
////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
+ //NSObject[] types = new NSObject[1];
+ //types[0] = new NSString("DL30V");
+ //EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types);
//EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
//info.de
--
Gitblit v1.8.0