2020-03-23-3

WJC

2020-03-23 bba578c2f0acf2eca747edcb69426771e0cadd32

 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;

        }