From 4dce704aaf8587cf3f91cf88f2208315a03c4cbb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 13:54:58 +0800
Subject: [PATCH] 先上传一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
index d1de6cc..99aae10 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
+++ b/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;
}
--
Gitblit v1.8.0