From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 28 四月 2020 16:32:35 +0800 Subject: [PATCH] 上传合并后的代码 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs index fae3017..99c9608 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs @@ -78,7 +78,7 @@ if (result == null) { return null; } //濡傛灉宸茬粡鍒涘缓浜�,鍒欎笉鍐嶅垱寤� - var myData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.GetDoorLockDataRes>(result); + var myData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetListIdResult>(result); if (myData.PageData.Count > 0) { return myData.PageData[0].Id; @@ -88,7 +88,7 @@ var pra2 = new AddDoorPra(); pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken(); pra2.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint; - var result2 = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra, listCheck); + var result2 = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra2, listCheck); //浜戠鏄洿鎺ヨ繑鍥炲垱寤虹殑涓婚敭瀛楃涓� return result2; } @@ -122,6 +122,10 @@ /// 甯稿紑鎸佺画鏃堕棿(1~72灏忔椂 OtherOpenLockMode=9003鐨勬椂鍊欐湁鏁�) /// </summary> public string NormallyOpenContinuedTime = string.Empty; + /// <summary> + /// 寮�閿佹椂闂�(鍘嗗彶璁板綍鐨勬椂闂碏rom-To妫�绱㈢殑瀵硅薄) + /// </summary> + public string UnlockTime = DateTime.UtcNow.ToString(); } /// <summary> @@ -184,6 +188,32 @@ /// 鍏朵粬寮�閿佹柟寮� 鍥哄畾9000 /// </summary> public int OpenLockMode = 9000; + /// <summary> + /// 褰曞叆鏃堕棿 + /// </summary> + public string EntryTime = DateTime.Now.ToString(); + } + + /// <summary> + /// 鎺ユ敹浜戠ID鐨勭粨鏋� + /// </summary> + private class GetListIdResult + { + /// <summary> + /// 浜戠杩斿洖鐨勪富閿甀D + /// </summary> + public List<GetIdResult> PageData = new List<GetIdResult>(); + } + + /// <summary> + /// 鎺ユ敹浜戠ID鐨勭粨鏋� + /// </summary> + private class GetIdResult + { + /// <summary> + /// 浜戠杩斿洖鐨勪富閿甀D + /// </summary> + public string Id = string.Empty; } #endregion -- Gitblit v1.8.0