From 7bea8bc6d399e9097e3565c2eed48ee6145d6b2f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 七月 2023 20:49:11 +0800
Subject: [PATCH] 萤石猫眼，门锁，摄像头功能对接
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index e9cb4c6..631c295 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>
/// 闂ㄩ攣鎺ㄩ��
@@ -588,6 +599,7 @@
{
Action<bool,string> mAction;
+ Action<string> mDoorlockAnswer;
public AndroidIHdlInterface(Action<bool,string> action)
{
mAction = action;
@@ -602,7 +614,10 @@
mAction?.Invoke(p0,p1);
}
-
+ public void DoorlockAnswer(string p0)
+ {
+ mDoorlockAnswer?.Invoke(p0);
+ }
}
#endif
--
Gitblit v1.8.0