From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
index 1cbd2ab..b3ade01 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
@@ -38,14 +38,19 @@
/// 娣诲姞鍘嗗彶璁板綍
/// </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)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鑾峰彇闂ㄩ攣鐨勪富閿甀D
- var DoorLockId = await this.GetDoorHistoryDoorLockId(i_doorLock);
+ var DoorLockId = this.GetDoorHistoryDoorLockId(i_doorLock);
+ if (string.IsNullOrEmpty(DoorLockId) == true)
+ {
+ //缃戠粶涓嶉��
+ return;
+ }
var pra = new AddDoorHistoryLogPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
@@ -53,9 +58,9 @@
pra.OtherOpenLockMode = OtherOpenLockMode;
pra.NormallyOpenContinuedTime = NormallyOpenContinuedTime;
- //涓嶄簩娆″彂閫�,涓嶆娴嬮敊璇爜
- var listCheck = new List<string>() { "NotSetAgain", "NotCheck" };
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/AddDoorLockHistory", true, pra, listCheck);
+ //涓嶆娴嬮敊璇爜
+ var listCheck = new List<string>() { "NotCheck" };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/AddDoorLockHistory", true, pra, listCheck);
if (result == false)
{
}
@@ -67,15 +72,15 @@
/// </summary>
/// <param name="i_doorLock">闂ㄩ攣瀵硅薄</param>
/// <returns></returns>
- private async System.Threading.Tasks.Task<string> GetDoorHistoryDoorLockId(ZigBee.Device.DoorLock i_doorLock)
+ private string GetDoorHistoryDoorLockId(ZigBee.Device.DoorLock i_doorLock)
{
var pra = new GetDoorIdPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;
- //涓嶄簩娆″彂閫�,涓嶆娴嬮敊璇爜
- var listCheck = new List<string>() { "NotSetAgain", "NotCheck" };
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockPager", true, pra, listCheck);
- if (result == null) { return null; }
+ //涓嶆娴嬮敊璇爜
+ var listCheck = new List<string>() { "NotCheck" };
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockPager", true, pra, listCheck);
+ if (string.IsNullOrEmpty(result) == true) { return null; }
//濡傛灉宸茬粡鍒涘缓浜�,鍒欎笉鍐嶅垱寤�
var myData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetListIdResult>(result);
@@ -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 = 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