请合并小模块

xm

2020-04-30 2eacb04ca1ec0ad20fda4186b59a9bce67004cb4

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

@@ -1104,7 +1109,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>