From 33857f71aec3895e42e57f11deaa7f8e7fbf245b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 07 四月 2023 09:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 6613907..37fa625 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -4,6 +4,7 @@
using Shared;
using HDL_ON.DAL.Server;
#if __IOS__
+using Foundation;
#else
using Com.Videogo.Hdl;
#endif
@@ -50,34 +51,44 @@
this.InitializationAndroidData((isEzChildAccessToken) =>
{
-
- this.MainThread(() =>
+ this.SunThread(() =>
{
-#if __IOS__
- //璺宠浆娣诲姞钀ょ煶璁惧
- ezsdkDelegate = new IosIHdlInterface();
- ezsdkDelegate.mAction += (serials) =>
+ var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
+ this.MainThread(() =>
{
- this.GetYingshiDeviceList(serials);
- };
- EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate;
- EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
+#if __IOS__
+ //璺宠浆娣诲姞钀ょ煶璁惧
+ ezsdkDelegate = new IosIHdlInterface();
+ ezsdkDelegate.mAction += (serials) =>
+ {
+ this.GetYingshiDeviceList(serials);
+ };
+ EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate;
+ NSObject[] nSObject = new NSObject[list.Count];
+ for (int i = 0; i < list.Count; i++)
+ {
+ string strValue = list[i];
+ nSObject[i] = new NSString(strValue);
+ }
+ EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject;
+ EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
#else
- HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk);
- HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) =>
- {
- if (isBool)
+ HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
+ HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) =>
{
- this.GetYingshiDeviceList(serials);
- }
+ if (isBool)
+ {
+ this.GetYingshiDeviceList(serials);
+ }
- }));
+ }));
#endif
+ });
+
+
});
-
-
});
@@ -275,9 +286,9 @@
/// 鑾峰彇銆愰棬閿佸瀷鍙枫�戝垪琛�
/// </summary>
/// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
- public List<string> GetVideoDoorLockLockModelsList()
+ public List<string> GetVideoDoorLockLockModelsList(string mode = "lockModels")
{
- return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
+ return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList(mode);
}
/// <summary>
/// 闂ㄩ攣鎺ㄩ��
@@ -531,6 +542,7 @@
collect,//鏀惰棌
room,//鎴块棿
push,//鎺ㄩ��
+ sanfan,//涓夋柟
}
#if __IOS__
--
Gitblit v1.8.0