From 213daac33c9d318703bfebe31ef96f67e23b6c50 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 14 四月 2023 10:41:14 +0800
Subject: [PATCH] 2023年04月14日10:40:52

---
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs     |   10 +++++++++-
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs |   13 ++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index e9cb4c6..a4456b7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -300,7 +300,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>
         /// 闂ㄩ攣鎺ㄩ��
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
index c6f260d..c43b939 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
@@ -171,24 +171,19 @@
         /// </summary>
         /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
         /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<string> GetVideoDoorLockLockModelsList(string mode,TipType tipType = TipType.flicker)
+        public LockModels GetVideoDoorLockLockModelsList(TipType tipType = TipType.flicker)
         {
             var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(new object { }, NewAPI.Api_Post_Lock_Models, "鑾峰彇钀ょ煶闂ㄩ攣鍨嬪彿鍒楄〃");
             if (!this.DataChecking(responsePackNew, tipType))
             {
-                return new List<string>();
+                return new LockModels();
             }
             var lockModels = Newtonsoft.Json.JsonConvert.DeserializeObject<LockModels>(responsePackNew.Data.ToString());
             if (lockModels == null)
             {
-                return new LockModels().lockModels;
+                return new LockModels();
             }
-            if ( mode =="lockModels") {
-                return lockModels.lockModels;
-            }
-            else {
-                return lockModels.notAllowedConfigNetworkModels;
-            }
+            return lockModels;
         }
 
         /// <summary>

--
Gitblit v1.8.0