From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13

---
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs |   57 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index c24c8fd..8f89c08 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -28,7 +28,7 @@
             this.AddChidren(topRowLayout);
 
             var titleName = new Button {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(176),
@@ -108,6 +108,7 @@
                 Text = Language.StringByID(MyInternationalizationString.timecondition),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize=15,
             };
             timerow.AddChidren(btntime);
 
@@ -169,6 +170,7 @@
                 TextID = MyInternationalizationString.device,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             devicerow.AddChidren(btndevice);
 
@@ -232,6 +234,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             securityrow.AddChidren(btnsecurity);
 
@@ -292,6 +295,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = MyInternationalizationString.location,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             locationrow.AddChidren(btnlocation);
 
@@ -332,6 +336,7 @@
                 X = Application.GetRealWidth(60),
                 TextID = MyInternationalizationString.automation,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             existencerowlayout.AddChidren(btnexistence);
 
@@ -378,23 +383,17 @@
                 flMain.RemoveFromParent();
             };
 
-            var securityfra1 = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080),
-                Height = Application.GetRealHeight(100),
-                Y = Application.GetRealHeight(1920 - 100),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            flMain.AddChidren(securityfra1);
+          
             var securityfra = new FrameLayout
             {
                 Width = Application.GetRealWidth(1080),
                 Height = Application.GetRealHeight(690),
                 Y = Application.GetRealHeight(1920 - 690),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(60),
+                //Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(securityfra);
+            securityfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
             #region  -------鍙栨秷   瀹屾垚
             var timetype = new RowLayout
             {
@@ -410,6 +409,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -437,6 +437,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -471,6 +472,7 @@
                 TextID = MyInternationalizationString.logicathomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             athomedefenceRowLayout.AddChidren(btnathomedefence);
 
@@ -504,6 +506,7 @@
                 TextID = MyInternationalizationString.logicremovehomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
             var leavehomedefenceSelected = new SelectedButton();
@@ -535,6 +538,7 @@
                 TextID = MyInternationalizationString.withdrawal,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             withdrawalRowLayout.AddChidren(btnwithdrawal);
             var withdrawalSelected = new SelectedButton();
@@ -716,24 +720,17 @@
                 flMain.RemoveFromParent();
             };
 
-            var Locationfra1 = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080),
-                Height = Application.GetRealHeight(100),
-                Y = Application.GetRealHeight(1920 - 100),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            flMain.AddChidren(Locationfra1);
+
             var Locationfra = new FrameLayout
             {
                 Width = Application.GetRealWidth(1080),
                 Height = Application.GetRealHeight(530),
                 Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(60),
+                //Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(Locationfra);
-
+            Locationfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
 
             #region  -------鍙栨秷   瀹屾垚
             var typeRow = new RowLayout
@@ -750,6 +747,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             typeRow.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -777,6 +775,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             typeRow.AddChidren(Btncomplete);
@@ -808,6 +807,7 @@
                 TextID = MyInternationalizationString.athome,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
 
 
             };
@@ -840,6 +840,7 @@
                 TextID = MyInternationalizationString.leavehome,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             leavehomeRowLayout.AddChidren(btnleavehome);
             var leavehomeSelected = new SelectedButton();
@@ -999,14 +1000,7 @@
                 flMain.RemoveFromParent();
             };
 
-            var timetypeframelayout1 = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080),
-                Height = Application.GetRealHeight(100),
-                Y = Application.GetRealHeight(1920 - 100),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            flMain.AddChidren(timetypeframelayout1);
+           
 
             var timetypeframelayout = new FrameLayout
             {
@@ -1014,9 +1008,10 @@
                 Height = Application.GetRealHeight(530),
                 Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(60),
+               // Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(timetypeframelayout);
+            timetypeframelayout.SetCornerWithSameRadius(20,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
 
             #region  -------鍙栨秷   瀹屾垚
             var timetype = new RowLayout
@@ -1033,6 +1028,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1060,6 +1056,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -1093,6 +1090,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text="绔嬪嵆鎵ц",
+                TextSize = 14,
             };
             timerow.AddChidren(Btntimepoint);
 
@@ -1126,6 +1124,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text = "鏃堕棿鑼冨洿",
+                TextSize = 14,
             };
             time1row.AddChidren(Btntime);
 

--
Gitblit v1.8.0