From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index bb36178..1e3e308 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -486,8 +486,8 @@
{
return null;
}
- var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- foreach (var myInfo in dataInfo.PageData)
+ var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
+ foreach (var myInfo in dataInfo2.PageData)
{
var data = new HistoryInfo();
if (dic.ContainsKey(myInfo.CreatedOnUtc) == false)
@@ -495,7 +495,7 @@
dic[myInfo.CreatedOnUtc] = new List<HistoryInfo>();
listSort.Add(myInfo.CreatedOnUtc);
}
-
+
//璁惧瀵硅薄
var jobject = Newtonsoft.Json.Linq.JObject.Parse(myInfo.PayloadJson);
data.DeviceMac = jobject.Value<string>("DeviceAddr");
@@ -631,7 +631,7 @@
pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
pra.CloudAccountIdArr = listUser;
pra.OpenLockModeArr = listLock;
- pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString();
+ pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString();
pra.UnlockTimeEnd = dateTo.ToUniversalTime().ToString();
return pra;
}
--
Gitblit v1.8.0