上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs

@@ -724,7 +724,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 +764,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 +819,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 +931,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 +970,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;