From 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期日, 26 四月 2020 12:05:28 +0800
Subject: [PATCH] 先上传一个非最新的版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
index fae3017..6544496 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
@@ -71,14 +71,14 @@
{
var pra = new GetDoorIdPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;
+ pra.DoorLockId = i_doorLock.DeviceAddr + "_200";
//涓嶄簩娆″彂閫�,涓嶆娴嬮敊璇爜
var listCheck = new List<string>() { "NotSetAgain", "NotCheck" };
var result = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockPager", true, pra, listCheck);
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;
@@ -87,8 +87,8 @@
//濡傛灉杩樻病鏈夊垱寤�,鍒欒櫄鎷熶竴涓壒娈婄殑涓滆タ鍑烘潵
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);
+ pra2.DoorLockId = i_doorLock.DeviceAddr + "_200";
+ 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