From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index e45f7e8..a292f9d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -71,7 +71,8 @@
{
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
- Height = Application.GetRealHeight(127),
+ Height = Application.GetRealHeight(127),
+ Gravity = Gravity.BottomCenter,
};
tipFLayout.AddChidren(bottomFrame);
@@ -81,10 +82,10 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ 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);
@@ -95,7 +96,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -156,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,
@@ -215,6 +216,7 @@
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
Height = Application.GetRealHeight(127),
+ Gravity=Gravity.BottomCenter,
};
tipFLayout.AddChidren(bottomFrame);
///鍙栨秷鎺т欢
@@ -223,7 +225,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -236,14 +238,14 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
};
bottomFrame.AddChidren(okBtn);
- if (_if) {
+ if (_if) {
cancelBtn.X = Application.GetRealWidth(0);
cancelBtn.Width = Application.GetRealWidth(0);
okBtn.X = Application.GetRealWidth(0);
@@ -273,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);
@@ -355,6 +357,7 @@
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
Height = Application.GetRealHeight(127),
+ Gravity = Gravity.BottomCenter,
};
tipFLayout.AddChidren(bottomFrame);
///鍙栨秷鎺т欢
@@ -363,7 +366,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -376,7 +379,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -465,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);
@@ -479,3 +482,5 @@
}
}
}
+
+
--
Gitblit v1.8.0