From c1cb2d8c6034a2ee7aa8a5710bba15b14f76cebc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 八月 2023 18:54:31 +0800
Subject: [PATCH] 2023年08月18日18:54:22
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 77 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index e9cb4c6..49ec379 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -55,6 +55,7 @@
this.SunThread(() =>
{
var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
+
this.MainThread(() =>
{
#if __IOS__
@@ -76,7 +77,8 @@
#else
HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
- HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) =>
+ HDLEzvizSdk.SetAddCallback(new
+ AndroidIHdlInterface((isBool, serials) =>
{
if (isBool)
{
@@ -165,7 +167,7 @@
EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
#else
- HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,"");
#endif
@@ -289,6 +291,7 @@
#if __IOS__
#else
HDLEzvizSdk.Instance.SetHomeId(home.id);
+
#endif
}
@@ -300,7 +303,15 @@
/// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
public List<string> GetVideoDoorLockLockModelsList(string mode = "lockModels")
{
- return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList(mode);
+ var lockModels = VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
+ if (mode == "lockModels")
+ {
+ return lockModels.lockModels;
+ }
+ else
+ {
+ return lockModels.notAllowedConfigNetworkModels;
+ }
}
/// <summary>
/// 闂ㄩ攣鎺ㄩ��
@@ -312,30 +323,40 @@
this.MainThread(() =>
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
- //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
- var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
- if (expantContent == null)
+ try
{
- return;
- }
- if (expantContent.spk != SPK.VideoDoorLock)
+ //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
+ var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
+ if (expantContent == null)
+ {
+ return;
+ }
+ if (expantContent.spk == null)
+ {
+ return;
+ }
+ if ( expantContent.spk != SPK.VideoDoorLock)
+ {
+ return;
+ }
+ if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ {
+ ///鎵撳紑瑙嗛闂ㄩ攣
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+ {
+ //浣庣數閲忔帹閫�
+ this.UpdateDoorLockState(PushMessageType.Alarm);
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+ {
+ //寮�闂ㄦ帹閫�
+ this.UpdateDoorLockState(PushMessageType.Prompt);
+ }
+ }catch(Exception ex)
{
- return;
- }
- if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
- {
- ///鎵撳紑瑙嗛闂ㄩ攣
- this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
- }
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
- {
- //浣庣數閲忔帹閫�
- this.UpdateDoorLockState(PushMessageType.Alarm);
- }
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
- {
- //寮�闂ㄦ帹閫�
- this.UpdateDoorLockState(PushMessageType.Prompt);
+
}
});
@@ -588,6 +609,7 @@
{
Action<bool,string> mAction;
+ Action<string> mDoorlockAnswer;
public AndroidIHdlInterface(Action<bool,string> action)
{
mAction = action;
@@ -602,7 +624,10 @@
mAction?.Invoke(p0,p1);
}
-
+ public void DoorlockAnswer(string p0)
+ {
+ mDoorlockAnswer?.Invoke(p0);
+ }
}
#endif
--
Gitblit v1.8.0