From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index e45f7e8..0bb7c0b 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);
@@ -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);
--
Gitblit v1.8.0