先上传一个版本

黄学彪

2020-04-08 4dce704aaf8587cf3f91cf88f2208315a03c4cbb

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs

@@ -179,12 +179,12 @@
                btnMsg.Text = msgText;
            }



            if (msgType == DoorLockMsgType.Confirm || msgType == DoorLockMsgType.InValid || msgType == DoorLockMsgType.NomallyOpenMode)

            if (msgType == DoorLockMsgType.Confirm || msgType == DoorLockMsgType.InValid || msgType == DoorLockMsgType.NomallyOpenMode || msgType == DoorLockMsgType.CancelNomallyOpenModeWithLogic)

            {

                //初始化确认类型的底部按钮

                this.InitBottomConfirmButton(MsgControlFrameLayout, frameBack);

            }
            else if (msgType == DoorLockMsgType.DoorLockLogic || msgType == DoorLockMsgType.CancelNomallyOpenModeWithLogic)

            else if (msgType == DoorLockMsgType.DoorLockLogic)

            {

                //失效设置的底部按钮

                this.InitBottomLogicButton(MsgControlFrameLayout, frameBack);

@@ -326,7 +326,7 @@
            var btnCancel = new BottomLeftClickButton(Application.GetRealWidth(396), Application.GetRealHeight(127));

            frameBack.AddChidren(btnCancel);

            var bottomLeftText = Language.StringByID(R.MyInternationalizationString.uCancel);

            if (msgType == DoorLockMsgType.NomallyOpenMode)
            if (msgType == DoorLockMsgType.NomallyOpenMode || msgType == DoorLockMsgType.CancelNomallyOpenModeWithLogic)
            {
                bottomLeftText = Language.StringByID(R.MyInternationalizationString.KeepNomallyMode);
            }

@@ -380,11 +380,12 @@
        /// <returns></returns>
        private bool CheckInvalidTime(string tetxValue)

        {

            if (tetxValue == string.Empty) 
            if (tetxValue == string.Empty)

            {

                var msgContr = new ShowMsgControl(ShowMsgType.Error, "失效时间不能省略");

                var msg = Language.StringByID(R.MyInternationalizationString.InvalidTimeIsEmpty);

                var msgContr = new ShowMsgControl(ShowMsgType.Error, msg);

                msgContr.Show();

                return false; 
                return false;

            }

            foreach (var c in tetxValue)

            {

@@ -395,7 +396,8 @@
            }

            if (tetxValue.Length >= 3)

            {

                var msgContr = new ShowMsgControl(ShowMsgType.Error, "失效时间不能大于36小时");

                var msg = Language.StringByID(R.MyInternationalizationString.InvalidTimeMoreThan36);

                var msgContr = new ShowMsgControl(ShowMsgType.Error, msg);

                msgContr.Show();

                return false;

            }

@@ -403,13 +405,15 @@
            int value = Convert.ToInt32(tetxValue);

            if (value <= 0)

            {

                var msgContr = new ShowMsgControl(ShowMsgType.Error, "失效时间不能小于1小时");

                var msg = Language.StringByID(R.MyInternationalizationString.InvalidTimeLessThan1);

                var msgContr = new ShowMsgControl(ShowMsgType.Error, msg);

                msgContr.Show();

                return false;

            }

            if (value > 36)

            {

                var msgContr = new ShowMsgControl(ShowMsgType.Error, "失效时间不能大于36小时");

                var msg = Language.StringByID(R.MyInternationalizationString.InvalidTimeMoreThan36);

                var msgContr = new ShowMsgControl(ShowMsgType.Error, msg);

                msgContr.Show();

                return false;

            }