合并新代码

xm

2020-04-15 bff8993501334c4f3c5f902216fe03253be747f8

 ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

@@ -908,9 +908,9 @@
            string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
            var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
            var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
            var HaveLogicNormallyOpenMode = await Shared.Phone.Device.Logic.SkipView.Exist();
            var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist();

            if (HaveLogicNormallyOpenMode)
            if (resTemp == 1)
            {
                //有逻辑设置的弹窗
                alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);