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 |  155 +++++++++++++++++++++++++--------------------------
 1 files changed, 76 insertions(+), 79 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index df2d07c..8f89c08 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+锘�       using System;
 using System.Collections.Generic;
 using Shared;
 using Shared.Common;
@@ -8,9 +8,10 @@
 
 namespace Shared.Phone.Device.Logic
 {
+    
     public class AddLogicPage : FrameLayout
     {
-        public AddLogicPage ()
+        public AddLogicPage()
         {
             Tag = "Logic";
         }
@@ -22,16 +23,16 @@
             {
                 BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
                 Height = Application.GetRealHeight(184),
-                LineColor= ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
             this.AddChidren(topRowLayout);
 
             var titleName = new Button {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(176),
-                Width = Application.GetRealWidth(400),
+                Width = Application.GetRealWidth(600),
                 Height = Application.GetRealHeight(69),
                 Y = Application.GetRealHeight(92),
                 TextID = MyInternationalizationString.selection,
@@ -41,8 +42,8 @@
             var clickBtn = new Button
             {
                 Width = Application.GetRealWidth(81 + 51),
-                Height = Application.GetRealHeight(58+40),
-                Y = Application.GetRealHeight(98-40),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
             topRowLayout.AddChidren(clickBtn);
             clickBtn.MouseDownEventHandler += (sender, e) =>
@@ -59,28 +60,28 @@
                 //Gravity = Gravity.CenterVertical;
                 UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topRowLayout.AddChidren (back);
+            topRowLayout.AddChidren(back);
             back.MouseDownEventHandler += (sender, e) => {
-                RemoveFromParent ();
+                RemoveFromParent();
             };
             #endregion
 
             #region  鏈�涓嬮潰鐨勫竷灞�浠g爜
             var middle = new FrameLayout {
-                Y=topRowLayout.Bottom,
-                Height=Application.GetRealHeight(1920-184),
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
-            this.AddChidren (middle);
+            this.AddChidren(middle);
 
             #region   ----鏃堕棿鏉′欢----
-            var timeframelayout= new FrameLayout
+            var timeframelayout = new FrameLayout
             {
                 Height = Application.GetRealHeight(160),
                 BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
             middle.AddChidren(timeframelayout);
-            
+
 
             var timeiconBtn = new Button
             {
@@ -99,16 +100,17 @@
                 Width = Application.GetRealWidth(850),
                 Height = Application.GetRealHeight(130),
                 X = Application.GetRealWidth(176),
-                LineColor= ZigbeeColor.Current.LogicRowLayoutLineColor,
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
             timeframelayout.AddChidren(timerow);
             ///鏃堕棿鏉′欢
             var btntime = new Button {
-                Text=Language.StringByID (MyInternationalizationString.timecondition),
+                Text = Language.StringByID(MyInternationalizationString.timecondition),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize=15,
             };
-            timerow.AddChidren (btntime);
+            timerow.AddChidren(btntime);
 
             var btntimeback = new Button {
                 Width = Application.GetRealWidth(58),
@@ -117,7 +119,7 @@
                 X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
             };
-            timerow.AddChidren (btntimeback);
+            timerow.AddChidren(btntimeback);
 
             EventHandler<MouseEventArgs> timeclick = (sender, e) =>
             {
@@ -138,7 +140,7 @@
                 BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                 Y = timeframelayout.Bottom,
             };
-            middle.AddChidren (deviceframelayout);
+            middle.AddChidren(deviceframelayout);
 
             var deviceiconBtn = new Button
             {
@@ -161,15 +163,16 @@
             };
             deviceframelayout.AddChidren(devicerow);
 
-          
+
             ///璁惧鐘舵�佹潯浠�
             var btndevice = new Button {
                 //Text = "璁惧鐘舵�佹潯浠�",
                 TextID = MyInternationalizationString.device,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
-            devicerow.AddChidren (btndevice);
+            devicerow.AddChidren(btndevice);
 
             var btndeviceback = new Button {
                 Width = Application.GetRealWidth(58),
@@ -179,15 +182,10 @@
                 UnSelectedImagePath = "ZigeeLogic/next.png",
 
             };
-            devicerow.AddChidren (btndeviceback);
+            devicerow.AddChidren(btndeviceback);
 
             EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
             {
-                Common.Logic.LogicDviceList.Clear();
-                if (Common.Logic.LogicDviceList.Count == 0)
-                {
-                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
-                }
                 var deviceStateCondition = new DeviceStateCondition();
                 UserView.HomePage.Instance.AddChidren(deviceStateCondition);
                 UserView.HomePage.Instance.PageIndex += 1;
@@ -236,6 +234,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             securityrow.AddChidren(btnsecurity);
 
@@ -245,7 +244,7 @@
                 Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
                 X = Application.GetRealWidth(789),
-                Gravity=Gravity.CenterVertical,
+                Gravity = Gravity.CenterVertical,
             };
             securityrow.AddChidren(btnsecurityback);
 
@@ -296,6 +295,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = MyInternationalizationString.location,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             locationrow.AddChidren(btnlocation);
 
@@ -324,8 +324,8 @@
 
             #region   ----宸叉湁鑷姩鍖栨潯浠�----
             var existencerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                Y= securityframelayout.Bottom,
+                Height = Application.GetRealHeight(180),
+                Y = securityframelayout.Bottom,
             };
             //middle.AddChidren (existencerowlayout);
             ///宸叉湁鑷姩鍖栨潯浠�
@@ -336,35 +336,37 @@
                 X = Application.GetRealWidth(60),
                 TextID = MyInternationalizationString.automation,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
-            existencerowlayout.AddChidren (btnexistence);
+            existencerowlayout.AddChidren(btnexistence);
 
             var btnexistenceback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
+                Width = Application.GetRealWidth(110),
+                Height = Application.GetRealHeight(110),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
                 SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080 - 140),
-                Gravity=Gravity.CenterVertical,
+                X = Application.GetRealWidth(1080 - 140),
+                Gravity = Gravity.CenterVertical,
             };
-            existencerowlayout.AddChidren (btnexistenceback);
+            existencerowlayout.AddChidren(btnexistenceback);
 
             EventHandler<MouseEventArgs> logicclick = (sender, e) => {
-                var logicListAutomation = new LogicListAutomation ();
-                UserView.HomePage.Instance.AddChidren (logicListAutomation);
+                var logicListAutomation = new LogicListAutomation();
+                UserView.HomePage.Instance.AddChidren(logicListAutomation);
                 UserView.HomePage.Instance.PageIndex += 1;
-                logicListAutomation.Show ();
+                logicListAutomation.Show();
             };
             btnexistenceback.MouseUpEventHandler += logicclick;
             btnexistence.MouseUpEventHandler += logicclick;
             existencerowlayout.MouseUpEventHandler += logicclick;
             #endregion
 
-            
+
 
             #endregion
 
         }
+       
         /// <summary>
         /// 瀹夐槻鏉′欢View
         /// </summary>
@@ -381,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),
+                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
             {
@@ -413,6 +409,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -440,6 +437,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -474,6 +472,7 @@
                 TextID = MyInternationalizationString.logicathomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             athomedefenceRowLayout.AddChidren(btnathomedefence);
 
@@ -507,6 +506,7 @@
                 TextID = MyInternationalizationString.logicremovehomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
             var leavehomedefenceSelected = new SelectedButton();
@@ -538,6 +538,7 @@
                 TextID = MyInternationalizationString.withdrawal,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             withdrawalRowLayout.AddChidren(btnwithdrawal);
             var withdrawalSelected = new SelectedButton();
@@ -701,7 +702,7 @@
                 UserView.HomePage.Instance.PageIndex += 1;
                 logicCommunalPage.Show(() => { });
             };
-           
+
         }
         /// <summary>
         /// 鍦扮悊鍥存爮View
@@ -719,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
@@ -753,6 +747,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             typeRow.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -780,6 +775,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             typeRow.AddChidren(Btncomplete);
@@ -811,6 +807,7 @@
                 TextID = MyInternationalizationString.athome,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
 
 
             };
@@ -843,6 +840,7 @@
                 TextID = MyInternationalizationString.leavehome,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             leavehomeRowLayout.AddChidren(btnleavehome);
             var leavehomeSelected = new SelectedButton();
@@ -944,7 +942,7 @@
                     }
                     LocationConditionsInfo.Add("AtHome", "1");
                 }
-                double a1 = 23.134421, a2 = 113.267189;
+                double a1 = Config.Instance.Home.Latitude, a2 = Config.Instance.Home.Longitude;
                 //璋冪敤鏂规硶锛岃烦杞〉闈�
                 GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
                 {
@@ -1002,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
             {
@@ -1017,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
@@ -1034,8 +1026,9 @@
                 TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                 Height = Application.GetRealHeight(140),
                 Width = Application.GetRealWidth(200),
-                X=Application.GetRealWidth(80),
-                TextAlignment=TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1044,14 +1037,14 @@
                 UserView.HomePage.Instance.ScrollEnabled = true;
             };
 
-            var Btntitle= new Button
+            var Btntitle = new Button
             {
                 TextID = MyInternationalizationString.type,
                 TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
                 Height = Application.GetRealHeight(140),
                 Width = Application.GetRealWidth(320),
                 TextAlignment = TextAlignment.Center,
-                X= Btncancel.Right+Application.GetRealWidth(100),
+                X = Btncancel.Right + Application.GetRealWidth(100),
                 TextSize = 16,
             };
             timetype.AddChidren(Btntitle);
@@ -1063,7 +1056,8 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
-                
+                TextSize = 14,
+
             };
             timetype.AddChidren(Btncomplete);
             #endregion
@@ -1074,7 +1068,7 @@
             var timepointFrameLayout = new FrameLayout
             {
                 Height = Application.GetRealHeight(160),
-                Y = timetype.Bottom+Application.GetRealHeight(20),
+                Y = timetype.Bottom + Application.GetRealHeight(20),
             };
             timetypeframelayout.AddChidren(timepointFrameLayout);
 
@@ -1096,6 +1090,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text="绔嬪嵆鎵ц",
+                TextSize = 14,
             };
             timerow.AddChidren(Btntimepoint);
 
@@ -1108,7 +1103,7 @@
             var timeFrameLayout = new FrameLayout
             {
                 Height = Application.GetRealHeight(160),
-                Y =timepointFrameLayout.Bottom,
+                Y = timepointFrameLayout.Bottom,
             };
             timetypeframelayout.AddChidren(timeFrameLayout);
 
@@ -1129,6 +1124,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text = "鏃堕棿鑼冨洿",
+                TextSize = 14,
             };
             time1row.AddChidren(Btntime);
 
@@ -1136,7 +1132,7 @@
             time1row.AddChidren(timeSelected);
             #endregion
 
-        
+
             ///绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> timepointclick = (sedner14, e14) =>
             {
@@ -1205,4 +1201,5 @@
         }
 
     }
+ 
 }

--
Gitblit v1.8.0