From 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
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