From 2ec9898778d3beda89278e2a53ac0e68b3035d29 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:06:24 +0800
Subject: [PATCH] 2020-7-1-2
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
old mode 100644
new mode 100755
index 9c80179..a292f9d
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -71,7 +71,7 @@
{
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
- Height = Application.GetRealHeight(127),
+ Height = Application.GetRealHeight(127),
Gravity = Gravity.BottomCenter,
};
tipFLayout.AddChidren(bottomFrame);
@@ -85,7 +85,7 @@
Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- TextID = R.MyInternationalizationString.cancel,
+ TextID = R.MyInternationalizationString.cancel,
};
bottomFrame.AddChidren(cancelBtn);
cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
@@ -157,7 +157,7 @@
Y = Application.GetRealHeight(69),
X = Application.GetRealWidth(150),
Height = Application.GetRealHeight(63),
- Width = Application.GetRealWidth(492),
+ Width = Application.GetRealWidth(492),
TextID = R.MyInternationalizationString.invalidSetting,
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicTipColor,
@@ -245,7 +245,7 @@
};
bottomFrame.AddChidren(okBtn);
- if (_if) {
+ if (_if) {
cancelBtn.X = Application.GetRealWidth(0);
cancelBtn.Width = Application.GetRealWidth(0);
okBtn.X = Application.GetRealWidth(0);
@@ -275,7 +275,7 @@
ShowErrorTip(Language.StringByID(R.MyInternationalizationString.timeNull),true);
return;
}
- if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12)
+ if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12|| int.Parse(editTime.Text)>(int.MaxValue-1))
{ ///闄愬埗杈撳叆鏁板瓧鑼冨洿;
string str = Language.StringByID(R.MyInternationalizationString.less) + Language.StringByID(R.MyInternationalizationString.or) + Language.StringByID(R.MyInternationalizationString.more);
ShowErrorTip(str, true);
@@ -468,8 +468,8 @@
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
};
- tipFLayout.AddChidren(Text1Btn);
-
+ tipFLayout.AddChidren(Text1Btn);
+
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(timeValue*1000);
--
Gitblit v1.8.0