From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 1145 +++++++++++++++++++++++++-------------------------------
 1 files changed, 514 insertions(+), 631 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
old mode 100644
new mode 100755
index 467f613..34909fd
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -5,254 +5,91 @@
 using Shared.Phone.Device;
 using Shared.R;
 using ZigBee.Device;
+using Shared.Phone.Device.Logic.LogicView;
+
 
 namespace Shared.Phone.Device.Logic
 {
+
     public class AddLogicPage : FrameLayout
     {
-        public AddLogicPage ()
+        public AddLogicPage()
         {
             Tag = "Logic";
         }
-        public void Show ()
+        public void Show()
         {
-            
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
+          
+            #region  鐣岄潰鐨勫竷灞�浠g爜
+            TopView view = new TopView();
+            this.AddChidren(view.TopRowView());
+            view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
+            view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
+           
+            var middle = new FrameLayout
+            {
+                Y = view.topRowLayout.Bottom,
+                Height = Application.GetRealHeight(Method.H - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+            ///鏃堕棿
+            FunView timeView = new FunView();
+            timeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
+            timeView.funnameBtn.TextID = MyInternationalizationString.timecondition;
+            middle.AddChidren(timeView.FunFrameView());
+          
+            ///璁惧
+            FunView functionView = new FunView();
+            functionView.funFrameLayout.Y = timeView.funFrameLayout.Bottom;
+            functionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
+            functionView.funnameBtn.TextID = MyInternationalizationString.device;
+            middle.AddChidren(functionView.FunFrameView());
+          
+            ///瀹夐槻
+            FunView securityView = new FunView();
+            securityView.funFrameLayout.Y = functionView.funFrameLayout.Bottom;
+            securityView.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
+            securityView.funnameBtn.TextID = MyInternationalizationString.security;
+            middle.AddChidren(securityView.FunFrameView());
+    
+            ///鍦扮悊鍥存爮
+            FunView positionView = new FunView();
+            positionView.funFrameLayout.Y = securityView.funFrameLayout.Bottom;
+            positionView.funFrameLayout.Height = Application.GetRealHeight(160+20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+            positionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
+            positionView.funnameBtn.TextID = MyInternationalizationString.location;
+            positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+            middle.AddChidren(positionView.FunFrameView());
+            #endregion
 
-            var topFrameLayout = new FrameLayout {
-                Height = Application.GetRealHeight (140),
-                Y = Application.GetRealHeight (80),
-            };
-            AddChidren (topFrameLayout);
-
-            var titleName = new Button {
-                TextID = MyInternationalizationString.selection,
-                TextSize = 17,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
-            };
-            topFrameLayout.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",
-            };
-            topFrameLayout.AddChidren (back);
-            back.MouseDownEventHandler += (sender, e) => {
-                RemoveFromParent ();
-            };
-
-            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,
-            };
-            middle.AddChidren (timerowlayout);
-            ///鏃堕棿鏉′欢
-            var btntime = new Button {
-                Text=Language.StringByID (MyInternationalizationString.timecondition),
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (60),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            timerowlayout.AddChidren (btntime);
-
-            var btntimeback = 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,
-            };
-            timerowlayout.AddChidren (btntimeback);
-
-            EventHandler<MouseEventArgs> timeclick = (sender, e) => {
-                //var timePage = new TimePage ();
-                //UserView.HomePage.Instance.AddChidren (timePage);
-                //UserView.HomePage.Instance.PageIndex += 1;
-                //timePage.Show ();
+            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
                 TimeView();
             };
-            btntime.MouseUpEventHandler += timeclick;
-            btntimeback.MouseUpEventHandler += timeclick;
-            #endregion
-
-            #region   ----璁惧鐘舵�佹潯浠�----
-            var devicerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                Y=timerowlayout.Bottom,
-            };
-            middle.AddChidren (devicerowlayout);
-            ///璁惧鐘舵�佹潯浠�
-            var btndevice = new Button {
-                //Text = "璁惧鐘舵�佹潯浠�",
-                TextID = MyInternationalizationString.devicestate,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (60),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            devicerowlayout.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),
-                Gravity = Gravity.CenterVertical,
-            };
-            devicerowlayout.AddChidren (btndeviceback);
-
-            EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
+            functionView.clickviewBtn.MouseUpEventHandler += (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);
+                var roomAndDeviceView = new RoomAndDeviceView();
+                UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
                 UserView.HomePage.Instance.PageIndex += 1;
-                deviceStateCondition.Show();
-            };
-            devicerowlayout.MouseUpEventHandler += devicestateclick;
-            btndevice.MouseUpEventHandler += devicestateclick;
-            btndeviceback.MouseUpEventHandler += devicestateclick;
-            #endregion
+                roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
+                roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));
 
-            #region   ----瀹夐槻鏉′欢----
-            var securityrowlayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = devicerowlayout.Bottom,
             };
-            middle.AddChidren(securityrowlayout);
-
-            var btnsecurity = new Button
-            {
-                //Text = "瀹夐槻鏉′欢",
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(60),
-                TextID = MyInternationalizationString.securityconditions,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            securityrowlayout.AddChidren(btnsecurity);
-
-            var btnsecurityback = 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,
-            };
-            securityrowlayout.AddChidren(btnsecurityback);
-
-            EventHandler<MouseEventArgs> securityclick = (sender, e) =>
+            securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
                 var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                 this.AddChidren(flMain);
                 SecurityView(flMain, false);
             };
-            securityrowlayout.MouseUpEventHandler += securityclick;
-            btnsecurity.MouseUpEventHandler += securityclick;
-            btnsecurityback.MouseUpEventHandler += securityclick;
-            #endregion
-
-            #region   ----宸叉湁鑷姩鍖栨潯浠�----
-            var existencerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                Y= securityrowlayout.Bottom,
-            };
-            //middle.AddChidren (existencerowlayout);
-            ///宸叉湁鑷姩鍖栨潯浠�
-            var btnexistence = new Button
-            {
-                //Text = "宸叉湁鑷姩鍖栨潯浠�",
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(60),
-                TextID = MyInternationalizationString.automation,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            existencerowlayout.AddChidren (btnexistence);
-
-            var btnexistenceback = 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,
-            };
-            existencerowlayout.AddChidren (btnexistenceback);
-
-            EventHandler<MouseEventArgs> logicclick = (sender, e) => {
-                var logicListAutomation = new LogicListAutomation ();
-                UserView.HomePage.Instance.AddChidren (logicListAutomation);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicListAutomation.Show ();
-            };
-            btnexistenceback.MouseUpEventHandler += logicclick;
-            btnexistence.MouseUpEventHandler += logicclick;
-            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) =>
+            positionView.clickviewBtn.MouseUpEventHandler += (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
         /// </summary>
@@ -262,149 +99,85 @@
         {
             UserView.HomePage.Instance.ScrollEnabled = false;
             Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
-            //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-            //this.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender12, e12) =>
+            #region  ---鐣岄潰甯冨眬閮ㄥ垎---
+            CompleteView completeView = new CompleteView();
+            flMain.AddChidren(completeView.Show(4));
+            completeView.Btntitle.TextID = MyInternationalizationString.security;
+            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
             {
+                UserView.HomePage.Instance.ScrollEnabled = true;
                 flMain.RemoveFromParent();
             };
-            var devicefra = new FrameLayout
+            flMain.MouseUpEventHandler += clickcancel;
+            completeView.Btncancel.MouseUpEventHandler += clickcancel;
+            //鍦ㄥ甯冮槻
+            mFunView athomeView = new mFunView();
+            athomeView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+            completeView.Show(4).AddChidren(athomeView.Show());
+            athomeView.titleBtn.TextID = MyInternationalizationString.logicathomegarrison;
+            //绂诲甯冮槻
+            mFunView removeView = new mFunView();
+            removeView.frameLayout.Y = athomeView.frameLayout.Bottom;
+            completeView.Show(4).AddChidren(removeView.Show());
+            removeView.titleBtn.TextID = MyInternationalizationString.logicremovehomegarrison;
+            //鎾ら槻
+            mFunView withdrawalView = new mFunView();
+            withdrawalView.frameLayout.Y = removeView.frameLayout.Bottom;
+            completeView.Show(4).AddChidren(withdrawalView.Show());
+            withdrawalView.titleBtn.TextID = MyInternationalizationString.withdrawal;
+            //鑳佽揩鎾ら槻
+            mFunView urgentwithdrawalView = new mFunView();
+            urgentwithdrawalView.frameLayout.Y = withdrawalView.frameLayout.Bottom;
+            completeView.Show(4).AddChidren(urgentwithdrawalView.Show());
+            urgentwithdrawalView.titleBtn.TextID = MyInternationalizationString.urgentwithdrawal;
+            urgentwithdrawalView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            #endregion
+            athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomeView.selectedIconBtn.Visible = true;
+                removeView.selectedIconBtn.Visible = false;
+                withdrawalView.selectedIconBtn.Visible = false;
+                urgentwithdrawalView.selectedIconBtn.Visible = false;
             };
-            flMain.AddChidren(devicefra);
-
-            var devicename = new Button
+            removeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.securityconditions,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
+                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomeView.selectedIconBtn.Visible = false;
+                removeView.selectedIconBtn.Visible = true;
+                withdrawalView.selectedIconBtn.Visible = false;
+                urgentwithdrawalView.selectedIconBtn.Visible = false;
+
             };
-            devicefra.AddChidren(devicename);
-
-            if (SecurityConditionsInfo.ContainsKey("Type"))
+            withdrawalView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
-                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,
+                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomeView.selectedIconBtn.Visible = false;
+                removeView.selectedIconBtn.Visible = false;
+                withdrawalView.selectedIconBtn.Visible = true;
+                urgentwithdrawalView.selectedIconBtn.Visible = false;
             };
-            devicefra.AddChidren(defenceRowLayout);
-
-            var btndefence = new Button
+            urgentwithdrawalView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.defence,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="甯冮槻",
-            };
-            defenceRowLayout.AddChidren(btndefence);
-            var defenceSelected = new Button
-            {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
-            defenceRowLayout.AddChidren(defenceSelected);
+                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                athomeView.selectedIconBtn.Visible = false;
+                removeView.selectedIconBtn.Visible = false;
+                withdrawalView.selectedIconBtn.Visible = false;
+                urgentwithdrawalView.selectedIconBtn.Visible = true;
 
-            var withdrawalRowLayout = new RowLayout
-            {
-                Y = defenceRowLayout.Bottom,
-                Height = Application.GetRealHeight(180),
             };
-            devicefra.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 = "鎾ら槻",
-            };
-            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
-            };
-            withdrawalRowLayout.AddChidren(withdrawalSelected);
-
-            ///甯冮槻鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> copenclick = (sedner14, e14) =>
-            {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                defenceSelected.Visible = true;
-                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;
-
-
-            ///鎾ら槻鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> disableclick = (sedner15, e15) =>
-            {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                defenceSelected.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;
 
             if (edit)
             {
@@ -415,34 +188,119 @@
                     {
                         if (securityifon["EnOrWithdrawMode"] == "0")
                         {
-                            defenceSelected.Visible = true;
-                            withdrawalSelected.Visible = false;
+                            if (securityifon["ModeId"] == "1")
+                            {
+                                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                athomeView.selectedIconBtn.Visible = true;
+                                removeView.selectedIconBtn.Visible = false;
+                                withdrawalView.selectedIconBtn.Visible = false;
+                                urgentwithdrawalView.selectedIconBtn.Visible = false;
+                            }
+                            else
+                            {
+                                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                athomeView.selectedIconBtn.Visible = false;
+                                removeView.selectedIconBtn.Visible = true;
+                                withdrawalView.selectedIconBtn.Visible = false;
+                                urgentwithdrawalView.selectedIconBtn.Visible = false;
+                            }
+
 
                         }
-                        else
+                        else if (securityifon["EnOrWithdrawMode"] == "1")
                         {
-                            defenceSelected.Visible = false;
-                            withdrawalSelected.Visible = true;
+                            athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            athomeView.selectedIconBtn.Visible = false;
+                            removeView.selectedIconBtn.Visible = false;
+                            withdrawalView.selectedIconBtn.Visible = true;
+                            urgentwithdrawalView.selectedIconBtn.Visible = false;
+                        }
+                        else if (securityifon["EnOrWithdrawMode"] == "2")
+                        {
+                            athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            removeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            withdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            urgentwithdrawalView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            athomeView.selectedIconBtn.Visible = false;
+                            removeView.selectedIconBtn.Visible = false;
+                            withdrawalView.selectedIconBtn.Visible = false;
+                            urgentwithdrawalView.selectedIconBtn.Visible = true;
                         }
                         break;
                     }
                 }
             }
-            var cancel = new Button
+            completeView.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 (!athomeView.selectedIconBtn.Visible && !removeView.selectedIconBtn.Visible && !withdrawalView.selectedIconBtn.Visible && !urgentwithdrawalView.selectedIconBtn.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");
+                if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                {
+                    SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                }
+                if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                {
+                    SecurityConditionsInfo.Remove("ModeId");
+                }
+                //鍦ㄥ甯冮槻
+                if (athomeView.selectedIconBtn.Visible)
+                {
+
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
+                    SecurityConditionsInfo.Add("ModeId", "1");
+                }
+                //绂诲甯冮槻
+                if (removeView.selectedIconBtn.Visible)
+                {
+
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
+                    SecurityConditionsInfo.Add("ModeId", "2");
+                }
+                //鎾ら槻
+                if (withdrawalView.selectedIconBtn.Visible)
+                {
+
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "1");
+                    SecurityConditionsInfo.Add("ModeId", "0");
+                }
+                //鑳佽揩鎾ら槻
+                if (urgentwithdrawalView.selectedIconBtn.Visible)
+                {
+
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "2");
+                    SecurityConditionsInfo.Add("ModeId", "0");
+                }
+                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
+                var logicCommunalPage = new LogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
             };
 
         }
@@ -455,185 +313,250 @@
         {
             UserView.HomePage.Instance.ScrollEnabled = false;
             Dictionary<string, string> LocationConditionsInfo = new Dictionary<string, string>();
-            //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-            //this.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender12, e12) =>
+            #region  ------鐣岄潰甯冨眬閮ㄥ垎   
+            CompleteView completeView = new CompleteView();
+            flMain.AddChidren(completeView.Show(2));
+            completeView.Btntitle.TextID = MyInternationalizationString.location;
+            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
             {
+                UserView.HomePage.Instance.ScrollEnabled = true;
                 flMain.RemoveFromParent();
             };
-            var Locationfra = new FrameLayout
+            flMain.MouseUpEventHandler += clickcancel;
+            completeView.Btncancel.MouseUpEventHandler += clickcancel;
+            //鍒拌揪鍦扮偣
+            mFunView athomeView = new mFunView();
+            athomeView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+            completeView.Show(2).AddChidren(athomeView.Show());
+            athomeView.titleBtn.TextID = MyInternationalizationString.athome;
+            //绂诲紑鍦扮偣
+            mFunView leaveView = new mFunView();
+            leaveView.frameLayout.Y = athomeView.frameLayout.Bottom;
+            completeView.Show(2).AddChidren(leaveView.Show());
+            leaveView.titleBtn.TextID = MyInternationalizationString.leavehome;
+            leaveView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            #endregion
+            string strname = "";
+            //鍒拌揪鍦扮偣鐐瑰嚮浜嬩欢
+            athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
-            };
-            flMain.AddChidren(Locationfra);
 
-            var locationviewname = new Button
-            {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.locationmode,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
-                //Text="浣嶇疆妯″紡",
+                strname = athomeView.titleBtn.Text;
+                leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                leaveView.selectedIconBtn.Visible = false;
+                athomeView.selectedIconBtn.Visible = true;
             };
-            Locationfra.AddChidren(locationviewname);
-
-            if (LocationConditionsInfo.ContainsKey("Type"))
+            //绂诲紑鍦扮偣鐐瑰嚮浜嬩欢
+            leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
             {
-                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,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="绂诲",
-            };
-            leavehomeRowLayout.AddChidren(btnleavehome);
-            var leavehomeSelected = new Button
-            {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
-            leavehomeRowLayout.AddChidren(leavehomeSelected);
-
-            var athomeRowLayout = new RowLayout
-            {
-                Y = leavehomeRowLayout.Bottom,
-                Height = Application.GetRealHeight(180),
-            };
-            Locationfra.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 = "鍦ㄥ",
-            };
-            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
-            };
-            athomeRowLayout.AddChidren(athomeSelected);
-
-            ///绂诲鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
-            {
-                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(() => { });
-            };
-            btnleavehome.MouseUpEventHandler += leavehomeclick;
-            leavehomeSelected.MouseUpEventHandler += leavehomeclick;
-            leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
-           
-
-            ///鍦ㄥ鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> athomeclick = (sedner15, e15) =>
-            {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                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;
-
+                strname = leaveView.titleBtn.Text;
+                leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leaveView.selectedIconBtn.Visible = true;
+                athomeView.selectedIconBtn.Visible = false;
+            };
+
+            double latitude = Config.Instance.Home.Latitude;//绾害
+            double longitude = Config.Instance.Home.Longitude;//缁忓害
+            int r = 500;//鍗婂緞
             if (edit)
             {
+                string guid = "";
                 foreach (var Locationifon in Common.Logic.CurrentLogic.Conditions)
                 {
 
                     if (Locationifon["Type"] == "7")
                     {
-                        if (Locationifon["AtHome"] == "0")
+                        guid = Locationifon["WhoSiteUId"];
+                        if (Locationifon["AtHome"] == "1")
                         {
-                            leavehomeSelected.Visible = true;
-                            athomeSelected.Visible = false;
-
+                            strname = athomeView.titleBtn.Text;
+                            leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            leaveView.selectedIconBtn.Visible = false;
+                            athomeView.selectedIconBtn.Visible = true;
                         }
                         else
                         {
-                            leavehomeSelected.Visible = false;
-                            athomeSelected.Visible = true;
+                            strname = leaveView.titleBtn.Text;
+                            leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            leaveView.selectedIconBtn.Visible = true;
+                            athomeView.selectedIconBtn.Visible = false;
                         }
                         break;
                     }
                 }
+
+                foreach (var accounts in Common.Logic.CurrentLogic.Accounts)
+                {
+
+                    if (accounts["Type"] == "7" && accounts["Account"] == guid)
+                    {
+
+                        ///杞崲涓篸ouble绫诲瀷锛�
+                        latitude = Convert.ToDouble(accounts["Latitude"]) / 1000000.0;
+                        longitude = Convert.ToDouble(accounts["Longitude"]) / 1000000.0;
+                        r = int.Parse(accounts["Radius"]);
+                        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) =>
+            completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                flMain.RemoveFromParent();
+
+                if (!leaveView.selectedIconBtn.Visible && !athomeView.selectedIconBtn.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                if (LocationConditionsInfo.ContainsKey("Type"))
+                {
+                    LocationConditionsInfo.Remove("Type");
+                }
+                if (LocationConditionsInfo.ContainsKey("IsValid"))
+                {
+                    LocationConditionsInfo.Remove("IsValid");
+                }
+                if (LocationConditionsInfo.ContainsKey("WhoSiteUId"))
+                {
+                    LocationConditionsInfo.Remove("WhoSiteUId");
+                }
+                LocationConditionsInfo.Add("Type", "7");
+                LocationConditionsInfo.Add("IsValid", "1");
+                LocationConditionsInfo.Add("WhoSiteUId", Config.Instance.Guid);
+                if (leaveView.selectedIconBtn.Visible)
+                {
+                    if (LocationConditionsInfo.ContainsKey("AtHome"))
+                    {
+                        LocationConditionsInfo.Remove("AtHome");
+                    }
+                    LocationConditionsInfo.Add("AtHome", "0");
+                }
+                else
+                {
+                    if (LocationConditionsInfo.ContainsKey("AtHome"))
+                    {
+                        LocationConditionsInfo.Remove("AtHome");
+                    }
+                    LocationConditionsInfo.Add("AtHome", "1");
+                }
+
+#if Android
+            //鐢宠瀹氫綅鏉冮檺
+            ((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
+            {
+                if (result1 == false) { return; }
+
+                //鐢宠鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍锛屽SD鍗′笂鍐欐枃浠�
+                ((BaseActivity)Application.Activity).SetPermission((result2) =>
+                {
+                    if (result2 == false) { return; }
+                     //璇诲彇鐢佃瘽鐘舵�佹潈闄�
+                     ((BaseActivity)Application.Activity).SetPermission((result3) =>
+                     {
+                         if (result3 == false) { return; }
+
+                         //璋冪敤鏂规硶锛岃烦杞〉闈�
+                         GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+                         {
+                             //鎴彇瀛楃涓插悗绗�6浣嶏紱
+                             //var len = name.Substring(name.Length - 6, 6);
+
+                             //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+                             var latitudW = (int)Math.Truncate(mLatitude * 1000000);
+                             var longitudeH = (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", latitudW.ToString());
+                             accounts.Add("Longitude", longitudeH.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, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+
+                     }, "android.permission.READ_PHONE_STATE");
+
+                }, "android.permission.WRITE_EXTERNAL_STORAGE");
+            });
+#endif
+#if iOS
+                //璋冪敤鏂规硶锛岃烦杞〉闈�
+                GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+                {
+                    //鎴彇瀛楃涓插悗绗�6浣嶏紱
+                    //var len = name.Substring(name.Length - 6, 6);
+
+                    //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+                    var latitudW = (int)Math.Truncate(mLatitude * 1000000);
+                    var longitudeH = (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", latitudW.ToString());
+                    accounts.Add("Longitude", longitudeH.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, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+#endif
+            };
         }
 
         /// <summary>
@@ -641,129 +564,89 @@
         /// </summary>
         void TimeView()
         {
+
             UserView.HomePage.Instance.ScrollEnabled = false;
             Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
-            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            #region  ------鐣岄潰甯冨眬閮ㄥ垎   
+            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
             this.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender12, e12) =>
-            {
-                flMain.RemoveFromParent();
-            };
-            var timetypeframelayout = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
-            };
-            flMain.AddChidren(timetypeframelayout);
-
-            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="鏃堕棿绫诲瀷",
-            };
-            timetypeframelayout.AddChidren(Btntitle);
-
-          
-
-            var timepointrow= new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = Btntitle.Bottom,
-            };
-            timetypeframelayout.AddChidren(timepointrow);
-
-            var Btntimepoint = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.immediateexecution,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="绔嬪嵆鎵ц",
-            };
-            timepointrow.AddChidren(Btntimepoint);
-
-            var timerow = new RowLayout
-            {
-                Y = timepointrow.Bottom,
-                Height = Application.GetRealHeight(180),
-            };
-            timetypeframelayout.AddChidren(timerow);
-
-            var Btntime = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.timeframe,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鏃堕棿鑼冨洿",
-            };
-            timerow.AddChidren(Btntime);
-
-            ///绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
-            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.MouseUpEventHandler += timepointclick;
-            timepointrow.MouseUpEventHandler += timepointclick;
-
-
-            ///鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> timeclick = (sedner15, e15) =>
+            CompleteView completeView = new CompleteView();
+            flMain.AddChidren(completeView.Show(2));
+            completeView.Btntitle.TextID = MyInternationalizationString.type;
+            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
             {
                 UserView.HomePage.Instance.ScrollEnabled = true;
                 flMain.RemoveFromParent();
-                var timePage = new TimePage();
-                UserView.HomePage.Instance.AddChidren (timePage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                timePage.Show ();
-               
             };
-            Btntime.MouseUpEventHandler += timeclick;
-            timerow.MouseUpEventHandler += timeclick;
+            flMain.MouseUpEventHandler += clickcancel;
+            completeView.Btncancel.MouseUpEventHandler += clickcancel;
 
+            //绔嬪嵆鎵ц
+            mFunView timepointView = new mFunView();
+            timepointView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+            completeView.Show(2).AddChidren(timepointView.Show());
+            timepointView.titleBtn.TextID = MyInternationalizationString.immediateexecution;
+            //鏃堕棿鑼冨洿
+            mFunView timeView = new mFunView();
+            timeView.frameLayout.Y = timepointView.frameLayout.Bottom;
+            completeView.Show(2).AddChidren(timeView.Show());
+            timeView.titleBtn.TextID = MyInternationalizationString.timeframe;
+            timeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            #endregion
+            //绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
+            timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
 
-            var cancel = new Button
-            {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = timetypeframelayout.Height - Application.GetRealHeight(160),
-
+                timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                timeView.selectedIconBtn.Visible = false;
+                timepointView.selectedIconBtn.Visible = true;
             };
-            timetypeframelayout.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
+            //鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
+            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
+                timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                timeView.selectedIconBtn.Visible = true;
+                timepointView.selectedIconBtn.Visible = false;
+            };
+
+            completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                flMain.RemoveFromParent();
+                if (!timepointView.selectedIconBtn.Visible && !timeView.selectedIconBtn.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                flMain.RemoveFromParent();
+                if (timepointView.selectedIconBtn.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