From 917c28d31963e893d7dd26f933adfa3bde3cf260 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:54:29 +0800
Subject: [PATCH] feature 门锁不支持一键开锁设备按钮置灰&&门锁呼叫
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 31 ++++++++++++++++++++++++++++++-
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs | 8 ++++++++
3 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index c96f7ed..6edfc27 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 49ec379..6f303f6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -172,6 +172,26 @@
}
+ /// <summary>
+ /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
+ /// </summary>
+ /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
+ /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
+ /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
+ /// <param name="msgId">娑堟伅id</param>
+ private void SkipRTVActivity(string deviceSerial, string deviceId, string spk, string msgId)
+ {
+
+#if __IOS__
+ //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
+
+#else
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,"");
+#endif
+
+
+ }
/// <summary>
/// 娴忚鍘嗗彶璁板綍
@@ -342,7 +362,16 @@
if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
{
///鎵撳紑瑙嗛闂ㄩ攣
- this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
+ string currentTimeStr = Utlis.GetTimestamp(); // 褰撳墠鏃堕棿
+
+ if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
+ { // 瓒呮椂30s
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
+ }
+ else
+ {
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
+ }
}
else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
index 73f68c0..5f4bf85 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
@@ -103,6 +103,14 @@
/// 浜戦泙涓婂畾涔夌殑璁惧spk
/// </summary>
public string spk = string.Empty;
+ /// <summary>
+ /// 娑堟伅id
+ /// </summary>
+ public string msgId = string.Empty;
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂�
+ /// </summary>
+ public string currentTime = string.Empty;
}
}
--
Gitblit v1.8.0