请合并最新代码，优化绑定信息

xm

2020-05-08 6bca8fcd37a48808a0b9c9342fc1be0adddfece6

 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手动推送,这里是网关或者门锁自己推送

@@ -654,6 +659,10 @@
                    if (data.OpenLockMode == 9000 && data.OtherOpenLockMode <= 9000)

                    {

                        continue;

                    }

                    if (data.CloudAccountId == null)

                    {

                        data.CloudAccountId = string.Empty;

                    }

                    listLog.Add(data);

                }

@@ -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>