From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 15 十月 2019 11:06:05 +0800
Subject: [PATCH] 首次合并了全部的代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 1235 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 837 insertions(+), 398 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 2e14c60..54dd41d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -14,106 +14,172 @@
         {
             Tag = "Logic";
         }
-        public void Show ()
+        public void Show()
         {
-            
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
 
-            var topFrameLayout = new FrameLayout {
-                Height = Application.GetRealHeight (140),
-                Y = Application.GetRealHeight (80),
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor= ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren (topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button {
-                TextID = MyInternationalizationString.selection,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.selection,
             };
-            topFrameLayout.AddChidren (titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var back = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                X = Application.GetRealWidth (20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58+40),
+                Y = Application.GetRealHeight(98-40),
             };
-            topFrameLayout.AddChidren (back);
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren (back);
             back.MouseDownEventHandler += (sender, e) => {
                 RemoveFromParent ();
             };
+            #endregion
 
-            var middle = new FrameLayout ();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight (1920 - 220);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-            this.AddChidren (middle);
-             
-                   
-            #region   ----鏃堕棿鏉′欢----
-            var timerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                //Y=pointtimerowlayout.Bottom,
+            #region  鏈�涓嬮潰鐨勫竷灞�浠g爜
+            var middle = new FrameLayout {
+                Y=topRowLayout.Bottom,
+                Height=Application.GetRealHeight(1920-184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
-            middle.AddChidren (timerowlayout);
+            this.AddChidren (middle);
+
+            #region   ----鏃堕棿鏉′欢----
+            var timeframelayout= new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(timeframelayout);
+
+
+            var timeiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/time.png",
+
+            };
+            timeframelayout.AddChidren(timeiconBtn);
+
+            var timerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor= ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            timeframelayout.AddChidren(timerow);
             ///鏃堕棿鏉′欢
             var btntime = new Button {
                 Text=Language.StringByID (MyInternationalizationString.timecondition),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (60),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            timerowlayout.AddChidren (btntime);
+            timerow.AddChidren (btntime);
 
             var btntimeback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080 - 140),
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
             };
-            timerowlayout.AddChidren (btntimeback);
+            timerow.AddChidren (btntimeback);
 
-            EventHandler<MouseEventArgs> timeclick = (sender, e) => {
-                //var timePage = new TimePage ();
-                //UserView.HomePage.Instance.AddChidren (timePage);
-                //UserView.HomePage.Instance.PageIndex += 1;
-                //timePage.Show ();
+            EventHandler<MouseEventArgs> timeclick = (sender, e) =>
+            {
                 TimeView();
             };
             btntime.MouseUpEventHandler += timeclick;
             btntimeback.MouseUpEventHandler += timeclick;
+            timeframelayout.MouseUpEventHandler += timeclick;
+            timeiconBtn.MouseUpEventHandler += timeclick;
+            timerow.MouseUpEventHandler += timeclick;
+
             #endregion
 
             #region   ----璁惧鐘舵�佹潯浠�----
-            var devicerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                Y=timerowlayout.Bottom,
+            var deviceframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y = timeframelayout.Bottom,
             };
-            middle.AddChidren (devicerowlayout);
+            middle.AddChidren (deviceframelayout);
+
+            var deviceiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/function.png",
+
+            };
+            deviceframelayout.AddChidren(deviceiconBtn);
+
+            var devicerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            deviceframelayout.AddChidren(devicerow);
+
+          
             ///璁惧鐘舵�佹潯浠�
             var btndevice = new Button {
                 //Text = "璁惧鐘舵�佹潯浠�",
                 TextID = MyInternationalizationString.device,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (60),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            devicerowlayout.AddChidren (btndevice);
+            devicerow.AddChidren (btndevice);
 
             var btndeviceback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080-140),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+
             };
-            devicerowlayout.AddChidren (btndeviceback);
+            devicerow.AddChidren (btndeviceback);
 
             EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
             {
@@ -127,39 +193,61 @@
                 UserView.HomePage.Instance.PageIndex += 1;
                 deviceStateCondition.Show();
             };
-            devicerowlayout.MouseUpEventHandler += devicestateclick;
+            deviceframelayout.MouseUpEventHandler += devicestateclick;
             btndevice.MouseUpEventHandler += devicestateclick;
             btndeviceback.MouseUpEventHandler += devicestateclick;
+            deviceiconBtn.MouseUpEventHandler += devicestateclick;
+            devicerow.MouseUpEventHandler += devicestateclick;
             #endregion
 
             #region   ----瀹夐槻鏉′欢----
-            var securityrowlayout = new RowLayout
+            var securityframelayout = new FrameLayout
             {
-                Height = Application.GetRealHeight(180),
-                Y = devicerowlayout.Bottom,
+                Height = Application.GetRealHeight(160),
+                Y = deviceframelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren(securityrowlayout);
+            middle.AddChidren(securityframelayout);
+
+            var securityiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/security.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            securityframelayout.AddChidren(securityiconBtn);
+
+            var securityrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            securityframelayout.AddChidren(securityrow);
+
 
             var btnsecurity = new Button
             {
                 //Text = "瀹夐槻鏉′欢",
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(60),
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            securityrowlayout.AddChidren(btnsecurity);
+            securityrow.AddChidren(btnsecurity);
 
             var btnsecurityback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
-                Gravity = Gravity.CenterVertical,
+                X = Application.GetRealWidth(789),
+                Gravity=Gravity.CenterVertical,
             };
-            securityrowlayout.AddChidren(btnsecurityback);
+            securityrow.AddChidren(btnsecurityback);
 
             EventHandler<MouseEventArgs> securityclick = (sender, e) =>
             {
@@ -167,15 +255,77 @@
                 this.AddChidren(flMain);
                 SecurityView(flMain, false);
             };
-            securityrowlayout.MouseUpEventHandler += securityclick;
+            securityframelayout.MouseUpEventHandler += securityclick;
             btnsecurity.MouseUpEventHandler += securityclick;
             btnsecurityback.MouseUpEventHandler += securityclick;
+            securityiconBtn.MouseUpEventHandler += securityclick;
+            securityrow.MouseUpEventHandler += securityclick;
+            #endregion
+
+            #region   ----鍦扮悊鍥存爮鏉′欢----
+            var locationframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = securityframelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(locationframelayout);
+
+            var locationiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/position.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            locationframelayout.AddChidren(locationiconBtn);
+
+            var locationrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            locationframelayout.AddChidren(locationrow);
+
+            var btnlocation = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = MyInternationalizationString.location,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            locationrow.AddChidren(btnlocation);
+
+            var btnlocationback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+            };
+            locationrow.AddChidren(btnlocationback);
+
+            EventHandler<MouseEventArgs> locationclick = (sender, e) =>
+            {
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                this.AddChidren(flMain);
+                LocationView(flMain, false);
+            };
+            locationframelayout.MouseUpEventHandler += locationclick;
+            locationiconBtn.MouseUpEventHandler += locationclick;
+            locationrow.MouseUpEventHandler += locationclick;
+            btnlocation.MouseUpEventHandler += locationclick;
+            btnlocationback.MouseUpEventHandler += locationclick;
             #endregion
 
             #region   ----宸叉湁鑷姩鍖栨潯浠�----
             var existencerowlayout = new RowLayout {
                 Height = Application.GetRealHeight (180),
-                Y= securityrowlayout.Bottom,
+                Y= securityframelayout.Bottom,
             };
             //middle.AddChidren (existencerowlayout);
             ///宸叉湁鑷姩鍖栨潯浠�
@@ -210,48 +360,10 @@
             existencerowlayout.MouseUpEventHandler += logicclick;
             #endregion
 
-            #region   ----鍦扮悊鍥存爮鏉′欢----
-            var locationrowlayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = securityrowlayout.Bottom,
-            };
-            //middle.AddChidren(locationrowlayout);
+            
 
-            var btnlocation = new Button
-            {
-                //Text = "鍦扮悊鍥存爮",
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(60),
-                TextID = MyInternationalizationString.location,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            locationrowlayout.AddChidren(btnlocation);
-
-            var btnlocationback = new Button
-            {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
-                Gravity = Gravity.CenterVertical,
-            };
-            locationrowlayout.AddChidren(btnlocationback);
-
-            EventHandler<MouseEventArgs> locationclick = (sender, e) =>
-            {
-                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-                this.AddChidren(flMain);
-                LocationView(flMain, false);
-            };
-            locationrowlayout.MouseUpEventHandler += locationclick;
-            btnlocation.MouseUpEventHandler += locationclick;
-            btnlocationback.MouseUpEventHandler += locationclick;
             #endregion
-         
-          
-           
+
         }
         /// <summary>
         /// 瀹夐槻鏉′欢View
@@ -268,143 +380,217 @@
             {
                 flMain.RemoveFromParent();
             };
-            var devicefra = new FrameLayout
+
+            var securityfra1= new FrameLayout
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
             };
-            flMain.AddChidren(devicefra);
-
-            var devicename = new Button
+            flMain.AddChidren(securityfra1);
+            var securityfra = new FrameLayout
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.securityconditions,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(690),
+                Y = Application.GetRealHeight(1920-690),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
             };
-            devicefra.AddChidren(devicename);
-
-            if (SecurityConditionsInfo.ContainsKey("Type"))
+            flMain.AddChidren(securityfra);
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
             {
-                SecurityConditionsInfo.Remove("Type");
-            }
-            if (SecurityConditionsInfo.ContainsKey("IsValid"))
-            {
-                SecurityConditionsInfo.Remove("IsValid");
-            }
-            if (SecurityConditionsInfo.ContainsKey("ModeId"))
-            {
-                SecurityConditionsInfo.Remove("ModeId"); 
-            }
-          
-            SecurityConditionsInfo.Add("Type", "6");
-            SecurityConditionsInfo.Add("IsValid", "1");
-            SecurityConditionsInfo.Add("ModeId", "0");
-
-            var defenceRowLayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = devicename.Bottom,
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            devicefra.AddChidren(defenceRowLayout);
+            securityfra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
-            var btndefence = new Button
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+
+            #region  ----鍦ㄥ甯冮槻 绂诲甯冮槻  鎾ら槻
+
+            #region  鍦ㄥ甯冮槻
+
+
+            var athomeFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = timetype.Bottom + Application.GetRealHeight(20),
+            };
+            securityfra.AddChidren(athomeFrameLayout);
+
+            var athomedefenceRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            athomeFrameLayout.AddChidren(athomedefenceRowLayout);
+
+            var btnathomedefence = new Button
             {
                 Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.defence,
+                TextID = MyInternationalizationString.logicathomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="甯冮槻",
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
             };
-            defenceRowLayout.AddChidren(btndefence);
-            var defenceSelected = new Button
+            athomedefenceRowLayout.AddChidren(btnathomedefence);
+
+
+            var athomedefenceSelected = new SelectedButton();
+            athomedefenceRowLayout.AddChidren(athomedefenceSelected);
+
+            #endregion
+            #region  绂诲甯冮槻
+
+            var leavehomeFrameLayout = new FrameLayout
             {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
+                Height = Application.GetRealHeight(160),
+                Y = athomeFrameLayout.Bottom,
             };
-            defenceRowLayout.AddChidren(defenceSelected);
+            securityfra.AddChidren(leavehomeFrameLayout);
+
+            var leavehomedefenceRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            leavehomeFrameLayout.AddChidren(leavehomedefenceRowLayout);
+
+            var leavehomebtndefence = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.logicremovehomegarrison,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
+            var leavehomedefenceSelected = new SelectedButton();
+            leavehomedefenceRowLayout.AddChidren(leavehomedefenceSelected);
+            #endregion
+            #region  鎾ら槻
+            var withdrawalFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = leavehomeFrameLayout.Bottom,
+            };
+            securityfra.AddChidren(withdrawalFrameLayout);
+
 
             var withdrawalRowLayout = new RowLayout
             {
-                Y = defenceRowLayout.Bottom,
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            devicefra.AddChidren(withdrawalRowLayout);
+            withdrawalFrameLayout.AddChidren(withdrawalRowLayout);
 
             var btnwithdrawal = new Button
             {
+
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.withdrawal,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鎾ら槻",
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
             };
             withdrawalRowLayout.AddChidren(btnwithdrawal);
-            var withdrawalSelected = new Button
-            {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
+            var withdrawalSelected = new SelectedButton();
             withdrawalRowLayout.AddChidren(withdrawalSelected);
+            #endregion
 
-            ///甯冮槻鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> copenclick = (sedner14, e14) =>
+            #region  ----鍦ㄥ甯冮槻 绂诲甯冮槻  鎾ら槻鐐瑰嚮浜嬩欢
+            ///鍦ㄥ甯冮槻鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> athomeclick = (sedner14, e14) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                defenceSelected.Visible = true;
+                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomedefenceSelected.Visible = true;
+                leavehomedefenceSelected.Visible = false;
                 withdrawalSelected.Visible = false;
-                if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
-                {
-                    SecurityConditionsInfo.Remove("EnOrWithdrawMode");
-                }
-                SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
-
-                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
             };
-            btndefence.MouseUpEventHandler += copenclick;
-            defenceRowLayout.MouseUpEventHandler += copenclick;
-            defenceSelected.MouseUpEventHandler += copenclick;
+            athomedefenceRowLayout.MouseUpEventHandler += athomeclick;
+            btnathomedefence.MouseUpEventHandler += athomeclick;
+            athomedefenceSelected.MouseUpEventHandler += athomeclick;
+            athomeFrameLayout.MouseUpEventHandler += athomeclick;
 
-
+            ///绂诲甯冮槻鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            {
+                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = true;
+                withdrawalSelected.Visible = false;
+            };
+            leavehomedefenceRowLayout.MouseUpEventHandler += leavehomeclick;
+            leavehomebtndefence.MouseUpEventHandler += leavehomeclick;
+            leavehomedefenceSelected.MouseUpEventHandler += leavehomeclick;
+            leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
             ///鎾ら槻鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> disableclick = (sedner15, e15) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                defenceSelected.Visible = false;
+                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = false;
                 withdrawalSelected.Visible = true;
-                if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
-                {
-                    SecurityConditionsInfo.Remove("EnOrWithdrawMode");
-                }
-                SecurityConditionsInfo.Add("EnOrWithdrawMode", "1");
-                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
             };
             withdrawalRowLayout.MouseUpEventHandler += disableclick;
             btnwithdrawal.MouseUpEventHandler += disableclick;
             withdrawalSelected.MouseUpEventHandler += disableclick;
+            withdrawalFrameLayout.MouseUpEventHandler += disableclick;
+            #endregion
+            #endregion
+
 
             if (edit)
             {
@@ -415,36 +601,107 @@
                     {
                         if (securityifon["EnOrWithdrawMode"] == "0")
                         {
-                            defenceSelected.Visible = true;
-                            withdrawalSelected.Visible = false;
+                            if (securityifon["ModeId"] == "1")
+                            {
+                                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                athomedefenceSelected.Visible = true;
+                                leavehomedefenceSelected.Visible = false;
+                                withdrawalSelected.Visible = false;
+                            }
+                            else
+                            {
+                                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                athomedefenceSelected.Visible = false;
+                                leavehomedefenceSelected.Visible = true;
+                                withdrawalSelected.Visible = false;
+                            }
+
 
                         }
                         else
                         {
-                            defenceSelected.Visible = false;
+                            btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            athomedefenceSelected.Visible = false;
+                            leavehomedefenceSelected.Visible = false;
                             withdrawalSelected.Visible = true;
                         }
                         break;
                     }
                 }
             }
-            var cancel = new Button
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = devicefra.Height - Application.GetRealHeight(160),
-
-            };
-            devicefra.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
-            {
-                flMain.RemoveFromParent();
+                if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible)
+                {
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                if (SecurityConditionsInfo.ContainsKey("Type"))
+                {
+                    SecurityConditionsInfo.Remove("Type");
+                }
+                if (SecurityConditionsInfo.ContainsKey("IsValid"))
+                {
+                    SecurityConditionsInfo.Remove("IsValid");
+                }
+                if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                {
+                    SecurityConditionsInfo.Remove("ModeId");
+                }
 
+                SecurityConditionsInfo.Add("Type", "6");
+                SecurityConditionsInfo.Add("IsValid", "1");
+                SecurityConditionsInfo.Add("ModeId", "0");
+                //鍦ㄥ甯冮槻
+                if (athomedefenceSelected.Visible)
+                {
+                    if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                    {
+                        SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                    }
+                    if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                    {
+                        SecurityConditionsInfo.Remove("ModeId");
+                    }
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
+                    SecurityConditionsInfo.Add("ModeId", "1");
+                }
+                //绂诲甯冮槻
+                if (leavehomedefenceSelected.Visible)
+                {
+                    if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                    {
+                        SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                    }
+                    if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                    {
+                        SecurityConditionsInfo.Remove("ModeId");
+                    }
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
+                    SecurityConditionsInfo.Add("ModeId", "2");
+                }
+                //鎾ら槻
+                if (withdrawalSelected.Visible)
+                {
+                    if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                    {
+                        SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                    }
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "1");
+                }
+                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
+                var logicCommunalPage = new LogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
+            };
+           
         }
         /// <summary>
         /// 鍦扮悊鍥存爮View
@@ -461,139 +718,168 @@
             {
                 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 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(Locationfra);
 
-            var locationviewname = new Button
+
+            #region  -------鍙栨秷   瀹屾垚
+            var typeRow = new RowLayout
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.locationmode,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
-                //Text="浣嶇疆妯″紡",
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            Locationfra.AddChidren(locationviewname);
-
-            if (LocationConditionsInfo.ContainsKey("Type"))
+            Locationfra.AddChidren(typeRow);
+            var Btncancel = new Button
             {
-                LocationConditionsInfo.Remove("Type");
-            }
-            if (LocationConditionsInfo.ContainsKey("IsValid"))
-            {
-                LocationConditionsInfo.Remove("IsValid");
-            }
-           
-            LocationConditionsInfo.Add("Type", "7");
-            LocationConditionsInfo.Add("IsValid", "1");
-
-            var leavehomeRowLayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = locationviewname.Bottom,
-            };
-            Locationfra.AddChidren(leavehomeRowLayout);
-
-            var btnleavehome = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.leavehome,
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="绂诲",
             };
-            leavehomeRowLayout.AddChidren(btnleavehome);
-            var leavehomeSelected = new Button
+            typeRow.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
             {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
             };
-            leavehomeRowLayout.AddChidren(leavehomeSelected);
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.location,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            typeRow.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            typeRow.AddChidren(Btncomplete);
+            #endregion
+
+            #region  ------鍦ㄥ   绂诲  
+            #region ------鍦ㄥ
+
+            var athomeFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = typeRow.Bottom + Application.GetRealHeight(20),
+            };
+            Locationfra.AddChidren(athomeFrameLayout);
 
             var athomeRowLayout = new RowLayout
             {
-                Y = leavehomeRowLayout.Bottom,
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            Locationfra.AddChidren(athomeRowLayout);
+            athomeFrameLayout.AddChidren(athomeRowLayout);
 
             var btnathome = new Button
             {
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.athome,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鍦ㄥ",
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+
+
             };
             athomeRowLayout.AddChidren(btnathome);
-            var athomeSelected = new Button
-            {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
+            var athomeSelected = new SelectedButton();
             athomeRowLayout.AddChidren(athomeSelected);
+            #endregion
 
-            ///绂诲鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            #region -------绂诲 
+            var leavehomeFrameLayout = new FrameLayout
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                leavehomeSelected.Visible = true;
-                athomeSelected.Visible = false;
-                if (LocationConditionsInfo.ContainsKey("AtHome"))
-                {
-                    LocationConditionsInfo.Remove("AtHome");
-                }
-                LocationConditionsInfo.Add("AtHome", "0");
-
-                LogicIfon.AddLocationconditions(LocationConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
+                Height = Application.GetRealHeight(160),
+                Y = athomeFrameLayout.Bottom,
             };
-            btnleavehome.MouseUpEventHandler += leavehomeclick;
-            leavehomeSelected.MouseUpEventHandler += leavehomeclick;
-            leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
-           
+            Locationfra.AddChidren(leavehomeFrameLayout);
 
+            var leavehomeRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            leavehomeFrameLayout.AddChidren(leavehomeRowLayout);
+
+            var btnleavehome = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.leavehome,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            leavehomeRowLayout.AddChidren(btnleavehome);
+            var leavehomeSelected = new SelectedButton();
+            leavehomeRowLayout.AddChidren(leavehomeSelected);
+            #endregion
+
+            #endregion
+            string strname = "";
             ///鍦ㄥ鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> athomeclick = (sedner15, e15) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
+                strname = btnathome.Text;
+                btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                 leavehomeSelected.Visible = false;
                 athomeSelected.Visible = true;
-                if (LocationConditionsInfo.ContainsKey("AtHome"))
-                {
-                    LocationConditionsInfo.Remove("AtHome");
-                }
-                LocationConditionsInfo.Add("AtHome", "1");
-                LogicIfon.AddLocationconditions(LocationConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
+
+
             };
             btnathome.MouseUpEventHandler += athomeclick;
             athomeSelected.MouseUpEventHandler += athomeclick;
             athomeRowLayout.MouseUpEventHandler += athomeclick;
+            athomeFrameLayout.MouseUpEventHandler += athomeclick;
+
+            ///绂诲鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            {
+                strname = btnleavehome.Text;
+                btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnathome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leavehomeSelected.Visible = true;
+                athomeSelected.Visible = false;
+            };
+            btnleavehome.MouseUpEventHandler += leavehomeclick;
+            leavehomeSelected.MouseUpEventHandler += leavehomeclick;
+            leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
+            leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
 
             if (edit)
             {
@@ -604,36 +890,102 @@
                     {
                         if (Locationifon["AtHome"] == "0")
                         {
+                            strname = btnleavehome.Text;
                             leavehomeSelected.Visible = true;
                             athomeSelected.Visible = false;
-
+                            btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            btnathome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                         }
                         else
                         {
+                            strname = btnathome.Text;
                             leavehomeSelected.Visible = false;
                             athomeSelected.Visible = true;
+                            btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                         }
                         break;
                     }
                 }
             }
-            var cancel = new Button
-            {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = Locationfra.Height - Application.GetRealHeight(160),
 
-            };
-            Locationfra.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                flMain.RemoveFromParent();
+
+                if (!leavehomeSelected.Visible && !athomeSelected.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                if (LocationConditionsInfo.ContainsKey("Type"))
+                {
+                    LocationConditionsInfo.Remove("Type");
+                }
+                if (LocationConditionsInfo.ContainsKey("IsValid"))
+                {
+                    LocationConditionsInfo.Remove("IsValid");
+                }
+                LocationConditionsInfo.Add("Type", "7");
+                LocationConditionsInfo.Add("IsValid", "1");
+                if (leavehomeSelected.Visible)
+                {
+                    if (LocationConditionsInfo.ContainsKey("AtHome"))
+                    {
+                        LocationConditionsInfo.Remove("AtHome");
+                    }
+                    LocationConditionsInfo.Add("AtHome", "0");
+                }
+                else
+                {
+                    if (LocationConditionsInfo.ContainsKey("AtHome"))
+                    {
+                        LocationConditionsInfo.Remove("AtHome");
+                    }
+                    LocationConditionsInfo.Add("AtHome", "1");
+                }
+                double a1 = 23.134421, a2 = 113.267189;
+                //璋冪敤鏂规硶锛岃烦杞〉闈�
+                GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+                {
 
+                    //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+                    var latitud = (int)Math.Truncate(mLatitude * 1000000);
+                    var longitude = (int)Math.Truncate(mLongitude * 1000000);
+                    Dictionary<string, string> accounts = new Dictionary<string, string>();
+                    if (accounts.ContainsKey("Account"))
+                    {
+                        accounts.Remove("Account");
+                    }
+                    if (accounts.ContainsKey("Type"))
+                    {
+                        accounts.Remove("Type");
+                    }
+                    if (accounts.ContainsKey("Latitude"))
+                    {
+                        accounts.Remove("latitude");
+                    }
+                    if (accounts.ContainsKey("Longitude"))
+                    {
+                        accounts.Remove("Longitude");
+                    }
+                    if (accounts.ContainsKey("Radius"))
+                    {
+                        accounts.Remove("radius");
+                    }
+                    accounts.Add("Account", Config.Instance.Guid);
+                    accounts.Add("Type", "7");
+                    accounts.Add("Latitude", latitud.ToString());
+                    accounts.Add("Longitude", longitude.ToString());
+                    accounts.Add("Radius", mRadius.ToString());
+                    LogicIfon.Addaccounts(accounts);
+                    LogicIfon.AddLocationconditions(LocationConditionsInfo);
+                    var logicCommunalPage = new LogicCommunalPage();
+                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    logicCommunalPage.Show(() => { });
+                }, strname, true, a1, a2, 500);
+            };
         }
 
         /// <summary>
@@ -643,126 +995,213 @@
         {
             UserView.HomePage.Instance.ScrollEnabled = false;
             Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
-            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
             this.AddChidren(flMain);
             flMain.MouseUpEventHandler += (sender12, e12) =>
             {
                 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
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(timetypeframelayout);
 
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            timetypeframelayout.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X=Application.GetRealWidth(80),
+                TextAlignment=TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
             var Btntitle= new Button
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.Selectedtimetype,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
-                //Text="鏃堕棿绫诲瀷",
+                TextID = MyInternationalizationString.type,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X= Btncancel.Right+Application.GetRealWidth(100),
+                TextSize = 16,
             };
-            timetypeframelayout.AddChidren(Btntitle);
-
-          
-
-            var timepointrow= new RowLayout
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
             {
-                Height = Application.GetRealHeight(180),
-                Y = Btntitle.Bottom,
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+                
             };
-            timetypeframelayout.AddChidren(timepointrow);
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+            #region  -------绔嬪嵆鎵ц   鏃堕棿鑼冨洿
+
+            #region  -------绔嬪嵆鎵ц 
+            var timepointFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = timetype.Bottom+Application.GetRealHeight(20),
+            };
+            timetypeframelayout.AddChidren(timepointFrameLayout);
+
+            var timerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            timepointFrameLayout.AddChidren(timerow);
+
 
             var Btntimepoint = new Button
             {
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.immediateexecution,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text="绔嬪嵆鎵ц",
             };
-            timepointrow.AddChidren(Btntimepoint);
+            timerow.AddChidren(Btntimepoint);
 
-            var timerow = new RowLayout
+            var timepointSelected = new SelectedButton();
+            timerow.AddChidren(timepointSelected);
+            #endregion
+
+
+            #region  -------鏃堕棿鑼冨洿
+            var timeFrameLayout = new FrameLayout
             {
-                Y = timepointrow.Bottom,
-                Height = Application.GetRealHeight(180),
+                Height = Application.GetRealHeight(160),
+                Y =timepointFrameLayout.Bottom,
             };
-            timetypeframelayout.AddChidren(timerow);
+            timetypeframelayout.AddChidren(timeFrameLayout);
+
+            var time1row = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            timeFrameLayout.AddChidren(time1row);
 
             var Btntime = new Button
             {
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.timeframe,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text = "鏃堕棿鑼冨洿",
             };
-            timerow.AddChidren(Btntime);
+            time1row.AddChidren(Btntime);
 
+            var timeSelected = new SelectedButton();
+            time1row.AddChidren(timeSelected);
+            #endregion
+
+        
             ///绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> timepointclick = (sedner14, e14) =>
             {
-                Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
-                timeConditionsInfo.Add("Type", "0");
-                timeConditionsInfo.Add("IsValid", "1");
-                timeConditionsInfo.Add("DateType", "1");
-                timeConditionsInfo.Add("RemindTime", "0");
-                timeConditionsInfo.Add("EnDelay", "0");
-                timeConditionsInfo.Add("DelayTime", "0");
-                timeConditionsInfo.Add("AdjustTime", "0");
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                flMain.RemoveFromParent();
-                var timePoint = new TimePoint();
-                UserView.HomePage.Instance.AddChidren(timePoint);
-                UserView.HomePage.Instance.PageIndex += 1;
-                timePoint.Show(timeConditionsInfo);
+                Btntimepoint.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                Btntime.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                timepointSelected.Visible = true;
+                timeSelected.Visible = false;
             };
+            timepointFrameLayout.MouseUpEventHandler += timepointclick;
+            timerow.MouseUpEventHandler += timepointclick;
             Btntimepoint.MouseUpEventHandler += timepointclick;
-            timepointrow.MouseUpEventHandler += timepointclick;
+            timepointSelected.MouseUpEventHandler += timepointclick;
 
 
             ///鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> timeclick = (sedner15, e15) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                flMain.RemoveFromParent();
-                var timePage = new TimePage();
-                UserView.HomePage.Instance.AddChidren (timePage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                timePage.Show ();
-               
+                Btntimepoint.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                Btntime.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                timepointSelected.Visible = false;
+                timeSelected.Visible = true;
             };
             Btntime.MouseUpEventHandler += timeclick;
-            timerow.MouseUpEventHandler += timeclick;
+            time1row.MouseUpEventHandler += timeclick;
+            timeSelected.MouseUpEventHandler += timeclick;
+            timeFrameLayout.MouseUpEventHandler += timeclick;
+            #endregion
 
 
-            var cancel = new Button
+
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = timetypeframelayout.Height - Application.GetRealHeight(160),
-
-            };
-            timetypeframelayout.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
-            {
-                flMain.RemoveFromParent();
+                if (!timepointSelected.Visible && !timeSelected.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                flMain.RemoveFromParent();
+                if (timepointSelected.Visible)
+                {
 
+                    Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
+                    timeConditionsInfo.Add("Type", "0");
+                    timeConditionsInfo.Add("IsValid", "1");
+                    timeConditionsInfo.Add("DateType", "1");
+                    timeConditionsInfo.Add("RemindTime", "0");
+                    timeConditionsInfo.Add("EnDelay", "0");
+                    timeConditionsInfo.Add("DelayTime", "0");
+                    timeConditionsInfo.Add("AdjustTime", "0");
+
+                    var timePoint = new TimePoint();
+                    UserView.HomePage.Instance.AddChidren(timePoint);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    timePoint.Show(timeConditionsInfo);
+                }
+                else
+                {
+                    var timePage = new TimePage();
+                    UserView.HomePage.Instance.AddChidren(timePage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    timePage.Show();
+
+                }
+            };
         }
 
     }

--
Gitblit v1.8.0