From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4

---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index ec84597..9c80179 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -72,6 +72,7 @@
                 Y = topFrame.Bottom,
                 Width = Application.GetRealWidth(792),
                 Height = Application.GetRealHeight(127),
+                Gravity = Gravity.BottomCenter,
             };
             tipFLayout.AddChidren(bottomFrame);
 
@@ -81,7 +82,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,
@@ -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,
@@ -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,7 +238,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,
@@ -281,8 +283,8 @@
 
 
                 }
-                dialog.Close();
                 action(editTime.Text);
+                dialog.Close();
 
             };
 
@@ -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,
@@ -412,7 +415,6 @@
                 dialog.Close();
             };
         }
-
         /// <summary>
         ///  闂敊鎻愮ず妗�
         /// </summary>
@@ -480,3 +482,5 @@
         }
     }
 }
+
+

--
Gitblit v1.8.0