From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index 39a09ef..3d6b287 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -395,6 +395,11 @@
//甯稿紑妯″紡鍚敤{0}灏忔椂
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uNormallyOpenModeOpenSomeTime).Replace("{0}", historyInfo.NormallyOpenContinuedTime);
}
+ else if (historyInfo.OtherOpenLockMode == 9004)
+ {
+ //甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+ btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uNormallyOpenLogicManualClose);
+ }
else
{
//涓婇潰鏄疉pp鎵嬪姩鎺ㄩ��,杩欓噷鏄綉鍏虫垨鑰呴棬閿佽嚜宸辨帹閫�
@@ -724,7 +729,7 @@
private void AdjustDoorOtherAlarmData(ref List<HistoryInfo> listLog, string result)
{
var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- string doorKey = this.DeviceDoor.DeviceAddr + "_200";
+ string doorKey = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
foreach (var myInfo in dataInfo2.PageData)
{
//璁惧瀵硅薄
@@ -764,7 +769,7 @@
private void AdjustDoorNormallyOpenData(ref List<HistoryInfo> listLog, string result)
{
var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- string doorKey = this.DeviceDoor.DeviceAddr + "_200";
+ string doorKey = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
foreach (var myInfo in dataInfo2.PageData)
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(myInfo.PayloadJson);
@@ -819,7 +824,7 @@
private void AdjustDoorTemporaryPasswordData(ref List<HistoryInfo> listLog, string result)
{
var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- string doorKey = this.DeviceDoor.DeviceAddr + "_200";
+ string doorKey = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
foreach (var myInfo in dataInfo2.PageData)
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(myInfo.PayloadJson);
@@ -931,7 +936,7 @@
pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString();
pra.UnlockTimeEnd = dateTo.ToUniversalTime().ToString();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_200";
+ pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
return pra;
}
@@ -970,7 +975,7 @@
pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString();
pra.UnlockTimeEnd = dateTo.ToUniversalTime().ToString();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_200";
+ pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
pra.CloudAccountIds = listUser;
pra.OpenLockModes = listLock;
@@ -1104,7 +1109,7 @@
/// </summary>
public string CloudAccountId = string.Empty;
/// <summary>
- /// 鍏朵粬寮�閿佹柟寮�(OpenLockMode=9000鏃舵湁鏁�) 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画
+ /// 鍏朵粬寮�閿佹柟寮�(OpenLockMode=9000鏃舵湁鏁�) 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画 9004:甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
/// </summary>
public int? OtherOpenLockMode = -1;
/// <summary>
--
Gitblit v1.8.0