From da3634e011bbda29cf4e1c168997b780fe795b20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 09:05:23 +0800
Subject: [PATCH] 优化新风模块和新风面板的测试功能,请合并代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs |  483 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 270 insertions(+), 213 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
old mode 100644
new mode 100755
index 9f042fa..c78f7f4
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -8,16 +8,28 @@
 {
     public class SoneLogicList : FrameLayout
     {
-        /// <summary>
-        /// 缁橲one闂ㄩ攣寰愭鏇存柊鐣岄潰鐢ㄧ殑
-        /// </summary>
-        ///
+
+        public static SoneLogicList soneLogicList;
         public SoneLogicList()
         {
             Tag = "SoneLogic";
+            soneLogicList = this;
         }
         /// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
         public Action<bool> action;
+        ///绗簩鍧楃涓�绾х埗鎺т欢
+        FrameLayout fLayout = new FrameLayout();
+        ///甯稿紑妯″紡鍥炬爣
+        Button modeIconBtn = new Button();
+        ///绗簩鍧楃浜岀骇鐖舵帶浠�
+        FrameLayout modeFl = new FrameLayout();
+        Button button1 = new Button();
+        Button button2= new Button();
+        ///绗笁鍧楃涓�绾х埗鎺т欢
+        FrameLayout listLogicFl = new FrameLayout();
+        ///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
+        VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();
+
         public async void Show()
         {
 
@@ -25,11 +37,17 @@
             UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
             TopView view = new TopView();
             this.AddChidren(view.TopRowView());
-            view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
+            view.toptitleNameBtn.TextID = MyInternationalizationString.openmode;
             view.clickBtn.MouseDownEventHandler += (sender, e) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+                if (updateThread != null && updateThread.IsAlive)
+                {
+                    updateThread.Abort();
+                }
+                //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
+                soneLogicList = null;
+                this.RemoveFromParent();
                 if (action != null)
                 {
                     action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
@@ -47,7 +65,7 @@
 
             #region  甯稿紑妯″紡鍥炬爣 鏃舵晥鎬у父寮�璁剧疆
             ///绗簩鍧楃涓�绾х埗鎺т欢
-            var fLayout = new FrameLayout
+            fLayout = new FrameLayout
             {
                 Width = Application.GetRealWidth(1080),
                 Height = Application.GetRealHeight(829 - 184),
@@ -55,7 +73,7 @@
             };
             middle.AddChidren(fLayout);
             ///甯稿紑妯″紡鍥炬爣
-            var modeIconBtn = new Button
+            modeIconBtn = new Button
             {
                 X = Application.GetRealWidth(395),
                 Y = Application.GetRealHeight(92),
@@ -63,198 +81,27 @@
                 Height = Application.GetMinRealAverage(294),
             };
             fLayout.AddChidren(modeIconBtn);
-
-            if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+            ///绗簩鍧楃浜岀骇鐖舵帶浠�
+            modeFl = new FrameLayout
             {
-                /// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
-                var logic = await SkipView.GetLogicIfon();
+            };
+            fLayout.AddChidren(modeFl);
 
-                fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
-                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
-                ///绗簩绾х埗鎺т欢
-                var openModeFl = new FrameLayout
-                {
-                    Y = Application.GetRealHeight(455),
-                    Height = Application.GetRealHeight(127 + 199),
-                    Width = Application.GetRealWidth(1080),
-                };
-                fLayout.AddChidren(openModeFl);
-                ///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲
-                Button closeBtn = new Button
-                {
-                    X = Application.GetRealWidth(86),
-                    Height = Application.GetRealHeight(127),
-                    Width = Application.GetRealWidth(907),
-                    Radius = (uint)Application.GetRealHeight(58),
-                    BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
-                    TextID = MyInternationalizationString.closeUp,
-                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
-                    TextSize = 16,
-                };
-                openModeFl.AddChidren(closeBtn);
-                closeBtn.MouseUpEventHandler += async (sender, e) =>
-                {
-                    var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
-                    if (result)
-                    {
-                        if (logic != null)
-                        {
-                            ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
-                            ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
-                            Send.DelLogic(logic.LogicId);
-                        }
-                        Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
-                        this.RemoveFromParent();
-                        var soneLogicList = new SoneLogicList();
-                        UserView.HomePage.Instance.AddChidren(soneLogicList);
-                        UserView.HomePage.Instance.PageIndex += 1;
-                        soneLogicList.Show();
-                        soneLogicList.action = action;
-                    }
-                    else
-                    {
-                        LogicView.TipView.ShowFlashTip("鍏抽棴澶辫触");
-                    }
-
-                };
-
-                ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
-                var timeTextBtn = new Button
-                {
-                    Y = Application.GetRealHeight(127 + 69),
-                    X = Application.GetRealWidth(125),
-                    Width = Application.GetRealWidth(634 + 200),
-                    Height = Application.GetRealHeight(60),
-                    TextSize = 15,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    Text = "鏃舵晥鎬у父寮�璁剧疆12:20",
-                };
-                if (logic != null)
-                {
-                    ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
-                    openModeFl.AddChidren(timeTextBtn);
-                }
-                ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
-                try
-                {
-                    var y = DateTime.Now.ToString("yy");//閭d竴骞�
-                    var m = DateTime.Now.ToString("mm");//閭d竴鏈�
-                    var d = DateTime.Now.ToString("dd");//閭d竴澶�
-                    var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
-                    var me = DateTime.Now.ToLongDateString();
-                    var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
-                    int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
-                    int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
-                    int days = int.Parse(d) + dayInt;
-                    timeTextBtn.Text = "鏃舵晥鎬у父寮�璁剧疆" + y + "骞�" + m + "鏈�" + days.ToString() + "鍙�" + hour.ToString() + "鏃�" + "鎵ц";
-                }
-                catch { }
-
-            }
-            else
+            button1 = new Button
             {
-                fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
-                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
-                ///绗簩绾х埗鎺т欢
-                var modeFl = new FrameLayout
-                {
-                    Y = Application.GetRealHeight(478),
-                    X = Application.GetRealWidth(58),
-                    Height = Application.GetRealHeight(138),
-                    Width = Application.GetRealWidth(1022),
-                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
-                };
-                fLayout.AddChidren(modeFl);
-                modeFl.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
-                modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
-                ///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢
-                var modeTextBtn = new Button
-                {
+            };
+            modeFl.AddChidren(button1);
 
-                    Y = Application.GetRealHeight(40),
-                    X = Application.GetRealWidth(58),
-                    Width = Application.GetRealWidth(600),
-                    Height = Application.GetRealHeight(60),
-                    TextSize = 15,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    // Text = "鏃舵晥鎬у父寮�璁剧疆",
-                    TextID = MyInternationalizationString.timeSetSone,
-                };
-                modeFl.AddChidren(modeTextBtn);
-                ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
-                var nextIconBtn = new Button
-                {
-                    Width = Application.GetMinRealAverage(104),
-                    Height = Application.GetMinRealAverage(104),
-                    X = Application.GetRealWidth(861),
-                    Y = Application.GetRealHeight(17),
-                    UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
-                };
-                modeFl.AddChidren(nextIconBtn);
-
-
-
-                nextIconBtn.MouseUpEventHandler += (sender, e) =>
-                {
-
-                    LogicView.TipView.ShowConfrimTip(() =>
-
-                    {///鍐嶆纭
-                        LogicView.TipView.ShowInputTip(true, async (str) =>
-                        {///纭鍙戦�佸懡浠�
-                            try
-                            {
-                                ///xm
-                                var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
-                                if (!result)
-                                {
-                                    LogicView.TipView.ShowFlashTip("寮�鍚け璐�");
-                                    return;
-                                }
-                                else
-                                {
-                                    ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
-                                    SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
-                                    var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
-                                    if (!addResult)
-                                    {
-                                        ///鎻愮ず澶辫触
-                                        LogicView.TipView.ShowFlashTip("娣诲姞澶辫触");
-                                        return;
-                                    }
-                                    Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
-                                    this.RemoveFromParent();
-                                    var soneLogicList = new SoneLogicList();
-                                    UserView.HomePage.Instance.AddChidren(soneLogicList);
-                                    UserView.HomePage.Instance.PageIndex += 1;
-                                    soneLogicList.Show();
-                                    soneLogicList.action = action;
-                                    //soneLogicList.action += (c) => {
-                                    //    if (action != null)
-                                    //    {
-                                    //        action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
-                                    //    }
-                                    //};
-
-                                }
-                            }
-                            catch
-                            {
-
-                            }
-                        });
-
-                    });
-
-                };
-            }
-
+            button2 = new Button
+            {
+            };
+            modeFl.AddChidren(button2);
+            ModeView();
             #endregion
 
             #region 甯稿紑鑷姩鍖�
             ///绗笁鍧楃涓�绾х埗鎺т欢
-            var listLogicFl = new FrameLayout
+            listLogicFl = new FrameLayout
             {
                 Y = fLayout.Bottom,
                 X = Application.GetRealWidth(58),
@@ -296,7 +143,16 @@
                 UnSelectedImagePath = "ZigeeLogic/add.png",
             };
             addLogicfL.AddChidren(addIconBtn);
-            addIconBtn.MouseUpEventHandler += (sender, e) =>
+
+            var addIconclickBtn = new Button
+            {
+                Width = Application.GetRealWidth(90+69+63),
+                Height = Application.GetRealHeight(69),
+                X = Application.GetRealWidth(800),
+                Y = Application.GetRealHeight(60),
+            };
+            addLogicfL.AddChidren(addIconclickBtn);
+            addIconclickBtn.MouseUpEventHandler += (sender, e) =>
             {
 
                 //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
@@ -334,7 +190,7 @@
             };
 
             ///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
-            var verticalRefresh = new VerticalRefreshLayout
+            verticalRefresh = new VerticalRefreshLayout
             {
 
                 Y = addLogicfL.Bottom,
@@ -346,17 +202,194 @@
             verticalRefresh.BeginHeaderRefreshingAction += () =>
             {
                 Common.Logic.SoneLogicList.Clear();
-                Read(verticalRefresh, false);
+                Read(false);
                 verticalRefresh.EndHeaderRefreshing();
             };
-            Read(verticalRefresh, true);
+            Read(true);
             #endregion
+        }
+        /// <summary>
+        /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
+        /// </summary>
+        public async void ModeView()
+        {
+
+            if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+            {
+                /// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
+                var logic = await SkipView.GetLogicIfon();
+
+                fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害 
+                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
+                modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
+                modeFl.X = Application.GetRealWidth(0);
+                modeFl.Height = Application.GetRealHeight(127 + 199);
+                modeFl.Width = Application.GetRealHeight(1080);
+                modeFl.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                modeFl.SetCornerWithSameRadius(Application.GetRealHeight(0), HDLUtils.RectCornerBottomLeft);
+
+                ///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲
+                button1.Y = Application.GetRealHeight(0);
+                button1.X = Application.GetRealWidth(86);
+                button1.Width = Application.GetRealWidth(907);
+                button1.Height = Application.GetRealHeight(127);
+                button1.Radius = (uint)Application.GetRealHeight(58);
+                button1.BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor;
+                button1.TextAlignment = TextAlignment.Center;
+                button1.TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor;
+                button1.TextID = MyInternationalizationString.closeUp;
+                button1.TextSize = 16;
+
+                button1.MouseUpEventHandler = async (sender, e) =>
+                {
+                    var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+                    if (result)
+                    {
+                        if (logic != null)
+                        {
+                            ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+                            ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
+                            Send.DelLogic(logic.LogicId);
+                        }
+                        Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+                        ModeView();
+                    }
+                    else
+                    {
+                        LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
+                    }
+
+                };
+                if (logic != null)
+                {
+                    ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
+                    button2.Y = Application.GetRealHeight(127 + 69);
+                    button2.X = Application.GetRealWidth(125);
+                    button2.Width = Application.GetRealWidth(634 + 200);
+                    button2.Height = Application.GetRealHeight(60);
+                    button2.UnSelectedImagePath = "ZigeeLogic/1234.png";
+                    button2.TextSize = 15;
+                    button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+                    ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
+                }
+                else
+                {
+                    button2.Width = Application.GetRealWidth(0);
+                    button2.Height = Application.GetRealHeight(0);
+                }
+                ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
+                try
+                {
+
+                    var y = DateTime.Now.Year.ToString();//閭d竴骞�
+                    var m = DateTime.Now.Month.ToString();//閭d竴鏈�
+                    var d = DateTime.Now.ToString("dd");//閭d竴澶�
+                    var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
+                    var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+                    int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+                    int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+                    int days = int.Parse(d) + dayInt;
+                    string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
+                    string text2 = Language.StringByID(MyInternationalizationString.yearSone);
+                    string text3 = Language.StringByID(MyInternationalizationString.monthSone);
+                    string text4 = Language.StringByID(MyInternationalizationString.numberSone);
+                    string text5 = Language.StringByID(MyInternationalizationString.executeSone);
+                    button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+                }
+                catch { }
+
+            }
+            else
+            {
+                fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
+                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
+                modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(92);
+                modeFl.X = Application.GetRealWidth(58);
+                modeFl.Height = Application.GetRealHeight(138);
+                modeFl.Width = Application.GetRealHeight(1022);
+                modeFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+                modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+
+                ///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢
+                button1.Y = Application.GetRealHeight(40);
+                button1.X = Application.GetRealWidth(58);
+                button1.Width = Application.GetRealWidth(600);
+                button1.Height = Application.GetRealHeight(60);
+                button1.Radius = (uint)Application.GetRealHeight(0);
+                button1.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+                button1.TextAlignment = TextAlignment.CenterLeft;
+                button1.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+                // Text = "鏃舵晥鎬у父寮�璁剧疆",
+                button1.TextID = MyInternationalizationString.timeSetSone;
+                button1.TextSize = 15;
+
+
+                ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
+                button2.Width = Application.GetMinRealAverage(104);
+                button2.Height = Application.GetMinRealAverage(104);
+                button2.X = Application.GetRealWidth(861);
+                button2.Y = Application.GetRealHeight(17);
+                button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
+                button2.TextSize = 15;
+                button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+                button2.MouseUpEventHandler = (sender, e) =>
+                {
+
+                    LogicView.TipView.ShowConfrimTip(() =>
+
+                    {///鍐嶆纭
+                        LogicView.TipView.ShowInputTip(true, async (str) =>
+                        {///纭鍙戦�佸懡浠�
+                            try
+                            {
+                                ///xm
+                                var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+                                if (!result)
+                                {
+                                    LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
+                                    return;
+                                }
+                                else
+                                {
+                                    ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+                                    SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+                                    var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+                                    if (!addResult)
+                                    {
+                                        ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
+                                        UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+                                        ///鎻愮ず澶辫触
+                                        LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
+                                        return;
+                                    }
+                                    Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+                                    ModeView();
+                                    //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+                                    UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
+                                }
+                            }
+                            catch
+                            {
+
+                            }
+                        });
+
+                    });
+
+                };
+            }
+
+            listLogicFl.Y = fLayout.Bottom;
+            listLogicFl.X = Application.GetRealWidth(58);
+            listLogicFl.Height = Application.GetRealHeight(Method.H - 184) - fLayout.Height;
+            listLogicFl.Width = Application.GetRealWidth(1022);
+            listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
         }
         /// <summary>
         /// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
         /// </summary>
-        /// <param name="verticalRefresh"></param>
-        private async void Read(VerticalRefreshLayout verticalRefresh, bool yes)
+        /// <param name="yes"></param>
+        private async void Read( bool yes)
         {
             if (yes)
             {
@@ -387,32 +420,31 @@
                 var dd = e.Message;
             }
             //鑷姩鍖�
-            RefreshView(verticalRefresh);
+            RefreshView();
             if (yes)
             {
                 CommonPage.Loading.Hide();
 
             }
         }
+      
+        RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+        int a = 1;
         /// <summary>
         /// 鍔犺浇鑷姩鍖栧垪琛�
         /// </summary>
-        /// <param name="verticalRefresh"></param>
-        RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
-        int a = 1;
-        private void RefreshView(VerticalRefreshLayout verticalRefresh)
+        public void RefreshView()
         {
             verticalRefresh.RemoveAll();
             foreach (var logic in Common.Logic.SoneLogicList)
             {
                 #region  鑷姩鍖栧竷灞�View
-
                 ///鑷姩鍖栫埗鎺т欢
-                var fLayout = new FrameLayout
+                var fLayoutLogic = new FrameLayout
                 {
                     Height = Application.GetRealHeight(184),
                 };
-                verticalRefresh.AddChidren(fLayout);
+                verticalRefresh.AddChidren(fLayoutLogic);
                 ///宸﹀彸鍙粦鍔ㄦ帶浠�
                 var logicRow = new RowLayout
                 {
@@ -421,7 +453,7 @@
                     SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                     Tag = a.ToString(),
                 };
-                fLayout.AddChidren(logicRow);
+                fLayoutLogic.AddChidren(logicRow);
                 //宸︽粦鑿滃崟浜嬩欢
                 logicRow.OpenMenuAction += () =>
                 {
@@ -511,12 +543,12 @@
                 ///绾跨殑鎺т欢
                 var line = new Button
                 {
-                    Y = fLayout.Height - 1,
+                    Y = fLayoutLogic.Height - 1,
                     Height = 1,
                     Width = Application.GetRealWidth(976),
                     BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                 };
-                fLayout.AddChidren(line);
+                fLayoutLogic.AddChidren(line);
                 #endregion
                 ///寮�鍏崇偣鍑讳簨浠�
                 switchBtn.MouseUpEventHandler += (sender1, e1) =>
@@ -558,14 +590,39 @@
                     {
                         Common.Logic.SoneLogicList.Remove(logic);
                         //logicRow.Parent.RemoveFromParent();
-                        fLayout.RemoveFromParent();
+                        fLayoutLogic.RemoveFromParent();
                         Send.DelLogic(logic.LogicId);
                     };
 
                 };
             }
-
-
         }
+
+        /// <summary>
+        /// 瀹氭椂鏇存柊甯稿紑妯″紡(闃叉閫氳繃闂ㄩ攣鍏抽棴娌″強鏃跺埛鏂扮姸鎬�)
+        /// </summary>
+        System.Threading.Thread updateThread;
+        public void UpdateModeIcon()
+        {
+            updateThread = new System.Threading.Thread(() =>
+            {
+                while (this.Parent != null)
+                {
+                    System.Threading.Thread.Sleep(1000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        try
+                        {
+                            ModeView();
+                        }
+                        catch { }
+
+                    });
+                }
+            });
+            updateThread.Start();
+        }
+
+
     }
 }

--
Gitblit v1.8.0