上传

黄学彪

2020-05-07 309f878169da2f0482dd40b81a84b606ed29cedf

 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

                {

                    //上面是App手动推送,这里是网关或者门锁自己推送

@@ -655,6 +660,10 @@
                    {

                        continue;

                    }

                    if (data.CloudAccountId == null)

                    {

                        data.CloudAccountId = string.Empty;

                    }

                    listLog.Add(data);

                }



@@ -724,7 +733,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 +773,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 +828,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 +940,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 +979,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 +1113,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>