From cf7623fe25a008b4e128c6083e362578e2a1e3b0 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 29 三月 2023 14:29:09 +0800 Subject: [PATCH] 2023年03月29日14:23:28 --- HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs index c012769..5847867 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs @@ -49,14 +49,13 @@ this.InitializationAndroidData((isBools) => { - if (!isBools) + + this.MainThread(() => { - this.MainThread(() => + if (!isBools) { this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�"); - - }); - } + } #if __IOS__ #else @@ -81,6 +80,10 @@ })); #endif + + }); + + }); @@ -175,7 +178,7 @@ } #if __IOS__ #else - HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId); + HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId); #endif }); @@ -253,21 +256,15 @@ #endregion /// <summary> - /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍� - /// <param name="comerom">鏉ヨ嚜閭i噷</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> /// 淇濆瓨鏈湴鏂囦欢 @@ -294,6 +291,23 @@ } #endregion /// <summary> + /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍� + /// <param name="comerom">鏉ヨ嚜閭i噷</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