From adf7df175e590b7d9e0f33c0c2ea1d2897da6301 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:33:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 261d0d6..fc60e23 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -44,20 +44,18 @@
/// android,ios婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗鍥炶皟鏂规硶
/// 鍐嶈鍙栦簯绔殑涓婅悿鐭宠澶囧垪琛�
/// <paramref name="spk"/>spk</param>
- /// </summary>
public void SkipAddDeviceActivity(string spk)
{
this.InitializationAndroidData((isBools) =>
{
- if (!isBools)
+
+ this.MainThread(() =>
{
- this.MainThread(() =>
+ if (!isBools)
{
this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
-
- });
- }
+ }
#if __IOS__
//璺宠浆娣诲姞钀ょ煶璁惧
ezsdkDelegate = new IosIHdlInterface();
@@ -97,6 +95,10 @@
}));
#endif
+
+ });
+
+
});
@@ -196,7 +198,7 @@
//鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
#else
- HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
+ HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
});
@@ -279,21 +281,15 @@
#endregion
/// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
- /// <param name="comerom">鏉ヨ嚜閭ｉ噷</param>
+ /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃
/// </summary>
- public string GetVideoDoorLockIcon(Comerom comerom)
+ /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+ public List<string> GetVideoDoorLockLockModelsList()
{
- if (comerom == Comerom.collect)
- {
- return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
- }
- else
- {
- return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
- }
-
+ return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
}
+
+
#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
/// 淇濆瓨鏈湴鏂囦欢
@@ -320,6 +316,23 @@
}
#endregion
/// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
+ /// <param name="comerom">鏉ヨ嚜閭ｉ噷</param>
+ /// </summary>
+ public string GetVideoDoorLockIcon(Comerom comerom)
+ {
+ if (comerom == Comerom.collect)
+ {
+ return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
+ }
+ else
+ {
+ return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
+ }
+
+ }
+
+ /// <summary>
/// 鑾峰彇Loading瀵硅薄
/// </summary>
/// <returns></returns>
--
Gitblit v1.8.0