From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 18 六月 2020 16:01:14 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
index 1cbd2ab..9f21fd5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
@@ -38,7 +38,7 @@
/// 娣诲姞鍘嗗彶璁板綍
/// </summary>
/// <param name="i_doorLock">闂ㄩ攣瀵硅薄</param>
- /// <param name="OtherOpenLockMode">鍏朵粬寮�閿佹柟寮� 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画</param>
+ /// <param name="OtherOpenLockMode">鍏朵粬寮�閿佹柟寮� 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画 9004:甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�</param>
/// <param name="NormallyOpenContinuedTime">甯稿紑鎸佺画鏃堕棿(1~72灏忔椂 OtherOpenLockMode=9003鐨勬椂鍊欐湁鏁�)</param>
public void AddDoorHistoryLog(ZigBee.Device.DoorLock i_doorLock, int OtherOpenLockMode, string NormallyOpenContinuedTime)
{
@@ -46,6 +46,11 @@
{
//鑾峰彇闂ㄩ攣鐨勪富閿甀D
var DoorLockId = await this.GetDoorHistoryDoorLockId(i_doorLock);
+ if (DoorLockId == null)
+ {
+ //缃戠粶涓嶉��
+ return;
+ }
var pra = new AddDoorHistoryLogPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
@@ -88,7 +93,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 +127,10 @@
/// 甯稿紑鎸佺画鏃堕棿(1~72灏忔椂 OtherOpenLockMode=9003鐨勬椂鍊欐湁鏁�)
/// </summary>
public string NormallyOpenContinuedTime = string.Empty;
+ /// <summary>
+ /// 寮�閿佹椂闂�(鍘嗗彶璁板綍鐨勬椂闂碏rom-To妫�绱㈢殑瀵硅薄)
+ /// </summary>
+ public string UnlockTime = DateTime.UtcNow.ToString();
}
/// <summary>
@@ -184,6 +193,10 @@
/// 鍏朵粬寮�閿佹柟寮� 鍥哄畾9000
/// </summary>
public int OpenLockMode = 9000;
+ /// <summary>
+ /// 褰曞叆鏃堕棿
+ /// </summary>
+ public string EntryTime = DateTime.Now.ToString();
}
/// <summary>
--
Gitblit v1.8.0