From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs |  499 +++++++++++--------------------------------------------
 1 files changed, 100 insertions(+), 399 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
index 1489f2e..9c1f7c0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -39,14 +39,15 @@
 
             var titleName = new Button
             {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(160),
-                Width = Application.GetRealWidth(300),
+                Width = Application.GetRealWidth(600),
                 Height = Application.GetRealHeight(69),
                 Y = Application.GetRealHeight(92),
                 TextID = MyInternationalizationString.devicestate,
+                IsBold = true,
             };
             topRowLayout.AddChidren(titleName);
 
@@ -89,6 +90,7 @@
                 Y = Application.GetRealHeight(92),
                 // TextID = MyInternationalizationString.customroom,
                 Text = Config.Instance.Home.GetCurrentFloorName,
+                TextSize = 14,
             };
             topRowLayout.AddChidren(foolrname);
             var dropdown = new Button
@@ -119,15 +121,7 @@
             };
             this.AddChidren(roomhorizontalScrol);
 
-            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
-            {
-                Width = Application.GetRealWidth(1080 - 58 - 200),
-                Height = Application.GetRealHeight(280),
-                Y = roomhorizontalScrol.Bottom,
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                X = Application.GetRealWidth(58 + 200),
-            };
-            this.AddChidren(devicetypehorizontalScrol1);
+           
             ///璁惧绫诲瀷婊戝姩鎺т欢
             var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
             {
@@ -136,18 +130,20 @@
                 Y = roomhorizontalScrol.Bottom,
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                 X = Application.GetRealWidth(58),
-                Radius = (uint)Application.GetRealHeight(50),
+                //Radius = (uint)Application.GetRealHeight(50),
 
             };
             this.AddChidren(devicetypehorizontalScrol);
+            devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
 
             middle = new VerticalScrolViewLayout();
             middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
-            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
+            middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
             middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
             middle.X = Application.GetRealWidth(58);
-            middle.Radius = (uint)Application.GetRealHeight(50);
+           // middle.Radius = (uint)Application.GetRealHeight(50);
             this.AddChidren(middle);
+            middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
 
             ///鐩墠鏀寔鐨勮澶�
             var deviceTypeList = new List<DeviceType> {
@@ -158,7 +154,7 @@
             };
 
             ///妤煎眰鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> foorlclick=(sender,e) =>
+            EventHandler<MouseEventArgs> foorlclick = (sender, e) =>
             {
 
                 var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -167,37 +163,75 @@
                 {
                     flMain.RemoveFromParent();
                 };
+                var foolrbjicon = new FrameLayout
+                {
+
+                    Width = Application.GetRealWidth(450),
+                    Height = Application.GetRealHeight(780),
+                    X = Application.GetRealWidth(1080 - 468 - 35),
+                    Y = Application.GetRealHeight(184),
+                    BackgroundImagePath = "Item/SelectFloor_Right.png",
+                };
+                flMain.AddChidren(foolrbjicon);
+
+                var btnfoolrtext = new Button
+                {
+                    Width = Application.GetRealWidth(450),
+                    Height = Application.GetRealHeight(150),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    X = Application.GetRealWidth(80),
+                    TextID = MyInternationalizationString.selecfoolr,
+                    TextSize = 14,
+                };
+                foolrbjicon.AddChidren(btnfoolrtext);
+
                 var foolrbj = new VerticalScrolViewLayout
                 {
 
-                    Width = Application.GetRealWidth(400),
-                    Height = Application.GetRealHeight(600),
-                    X = Application.GetRealWidth(1080 - 400 - 60),
-                    Y = Application.GetRealHeight(184 + 50),
-                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                    Radius = (uint)Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(450),
+                    Height = foolrbjicon.Height - btnfoolrtext.Height,
+                    X = Application.GetRealWidth(80),
+                    Y = btnfoolrtext.Bottom,
                 };
-                flMain.AddChidren(foolrbj);
-                ///榛樿璋冭瘯
+                foolrbjicon.AddChidren(foolrbj);
+
                 foreach (var foolr in Config.Instance.Home.FloorDics)
                 {
-                    var foolrRowLayout = new FrameLayout
+                    var foolrRowLayout = new RowLayout
                     {
                         Height = Application.GetRealHeight(150),
+                        LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                     };
                     foolrbj.AddChidren(foolrRowLayout);
+
+                    var btnfoolricon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        UnSelectedImagePath = "Floor/Floor.png",
+                        Gravity = Gravity.CenterVertical,
+                    };
+                    foolrRowLayout.AddChidren(btnfoolricon);
+
 
                     var btnfoolrname = new Button
                     {
                         Width = Application.GetRealWidth(250),
-                        Height = Application.GetRealHeight(160),
+                        Height = Application.GetRealHeight(150),
                         Text = foolr.Value,
-                        TextAlignment = TextAlignment.Center,
-                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                         Tag = foolr.Key,
+                        X = btnfoolricon.Right + Application.GetRealWidth(12),
+                        TextSize = 14,
                     };
                     foolrRowLayout.AddChidren(btnfoolrname);
-
+                    if (foolrname.Text == foolr.Value)
+                    {
+                        btnfoolricon.UnSelectedImagePath = "Floor/FloorSelected.png";
+                        btnfoolrname.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+                    }
 
                     EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                     {
@@ -306,6 +340,18 @@
                         }
                         list.Add(device);
                     }
+                    if (list.Count == 0)
+                    {
+                        devicetypehorizontalScrol.Height = 0;
+                   
+                        middle.Height = 0;
+                    }
+                    else
+                    {
+                        devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+                        
+                        middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
+                    }
                     AllDeviceTypeView(list, devicetypehorizontalScrol);
 
                 }
@@ -335,6 +381,18 @@
                             continue;
                         }
                         list.Add(device);
+                    }
+                    if (list.Count == 0)
+                    {
+                        devicetypehorizontalScrol.Height = 0;
+                       
+                        middle.Height = 0;
+                    }
+                    else
+                    {
+                        devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+                      
+                        middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
                     }
                     AllDeviceTypeView(list, devicetypehorizontalScrol);
 
@@ -573,6 +631,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 14,
                 };
                 deviceRow.AddChidren(devicename);
                 switch (common.CommonDevice.Type)
@@ -657,14 +716,6 @@
 
             };
 
-            var devicefra1 = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080),
-                Height = Application.GetRealHeight(100),
-                Y = Application.GetRealHeight(1920 - 100),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            flMain.AddChidren(devicefra1);
 
             var devicefra = new FrameLayout
             {
@@ -676,6 +727,7 @@
                 Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(devicefra);
+            devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
 
             #region  -------鍙栨秷   瀹屾垚
             var timetype = new RowLayout
@@ -692,6 +744,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -705,9 +758,9 @@
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
                 Height = Application.GetRealHeight(140),
-                Width = Application.GetRealWidth(320),
+                Width = Application.GetRealWidth(420),
                 TextAlignment = TextAlignment.Center,
-                X = Btncancel.Right + Application.GetRealWidth(100),
+                X = Btncancel.Right + Application.GetRealWidth(50),
                 TextSize = 16,
                 Text = common.DeviceEpointName,
             };
@@ -719,7 +772,8 @@
                 Height = Application.GetRealHeight(140),
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
-                X = Btntitle.Right + Application.GetRealWidth(100),
+                X = Btntitle.Right + Application.GetRealWidth(50),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -745,254 +799,6 @@
             }
             switch (common.Type)
             {
-                ///鐏厜
-                case DeviceType.OnOffOutput:
-                    {
-                        dictionary(deviceConditionsInfo, "Cluster_ID", "6");
-                        dictionary(deviceConditionsInfo, "AttriButeId", "0");
-                        dictionary(deviceConditionsInfo, "Range", "1");
-                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
-
-                        #region  鐏厜View
-
-
-
-                        var openframelayout = new FrameLayout
-                        {
-                            Height = Application.GetRealHeight(160),
-                            Y = timetype.Bottom + Application.GetRealHeight(20),
-                        };
-                        devicefra.AddChidren(openframelayout);
-
-                        var openrowlayout = new RowLayout
-                        {
-                            Y = Application.GetRealHeight(30),
-                            Width = Application.GetRealWidth(920),
-                            Height = Application.GetRealHeight(130),
-                            X = Application.GetRealWidth(80),
-                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
-                        };
-                        openframelayout.AddChidren(openrowlayout);
-
-                        var btnopen = new Button
-                        {
-                            Width = Application.GetRealWidth(600),
-                            TextID = MyInternationalizationString.open,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
-                        };
-                        openrowlayout.AddChidren(btnopen);
-
-                        var openBtnSelected = new SelectedButton();
-                        openrowlayout.AddChidren(openBtnSelected);
-
-
-                        var closeframelayout = new FrameLayout
-                        {
-                            Height = Application.GetRealHeight(160),
-                            Y = openframelayout.Bottom,
-                        };
-                        devicefra.AddChidren(closeframelayout);
-                        var closerowlayout = new RowLayout
-                        {
-                            Y = Application.GetRealHeight(30),
-                            Width = Application.GetRealWidth(920),
-                            Height = Application.GetRealHeight(130),
-                            X = Application.GetRealWidth(80),
-                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
-                        };
-                        closeframelayout.AddChidren(closerowlayout);
-
-                        var btnclose = new Button
-                        {
-                            //Text = "鍏�",
-                            TextID = MyInternationalizationString.close,
-                            Width = Application.GetRealWidth(600),
-                            TextAlignment = TextAlignment.CenterLeft,
-                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
-                        };
-                        closerowlayout.AddChidren(btnclose);
-
-                        var closeBtnSelected = new SelectedButton();
-                        closerowlayout.AddChidren(closeBtnSelected);
-                        #endregion
-
-                        ///鐐瑰嚮纭浜嬩欢
-                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
-                        {
-                            openBtnSelected.Visible = true;
-                            closeBtnSelected.Visible = false;
-                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
-                            SelectedDeviceStatuscondition = "OnOffOutput";
-                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");//榛樿鍊�
-
-
-                        };
-                        openrowlayout.MouseUpEventHandler += openclick;
-                        btnopen.MouseUpEventHandler += openclick;
-                        openBtnSelected.MouseUpEventHandler += openclick;
-                        openframelayout.MouseUpEventHandler += openclick;
-                        ///鐐瑰嚮鍙栨秷浜嬩欢
-                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
-                        {
-                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
-                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-                            openBtnSelected.Visible = false;
-                            closeBtnSelected.Visible = true;
-                            SelectedDeviceStatuscondition = "OnOffOutput";
-                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//榛樿鍊�
-
-                        };
-                        closerowlayout.MouseUpEventHandler += closeclick;
-                        btnclose.MouseUpEventHandler += closeclick;
-                        closeBtnSelected.MouseUpEventHandler += closeclick;
-                        closeframelayout.MouseUpEventHandler += closeclick;
-                        if (edit && devices != null)
-                        {
-                            if (devices["AttriButeId"] == "0")
-                            {
-                                if (devices["AttriButeData1"] == "1")
-                                {
-                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
-                                    openBtnSelected.Visible = true;
-                                    closeBtnSelected.Visible = false;
-                                }
-                                else
-                                {
-                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
-                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-                                    openBtnSelected.Visible = false;
-                                    closeBtnSelected.Visible = true;
-
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case DeviceType.WindowCoveringDevice:
-                    {
-
-                        dictionary(deviceConditionsInfo, "Cluster_ID", "258");
-                        dictionary(deviceConditionsInfo, "AttriButeId", "8");
-                        dictionary(deviceConditionsInfo, "Range", "0");
-                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
-
-                        #region 绐楀笜View
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
-                        devicefra.Height = Application.GetRealHeight(720);
-                        var windowCoveringfra = new FrameLayout
-                        {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 2 + 30),
-                        };
-                        devicefra.AddChidren(windowCoveringfra);
-
-                        var openrowlayout = new RowLayout
-                        {
-                            Height = Application.GetRealHeight(180),
-                        };
-                        windowCoveringfra.AddChidren(openrowlayout);
-
-                        var btnopen = new Button
-                        {
-                            //Text = "寮�",
-                            TextID = MyInternationalizationString.open,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(50),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            //SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                        };
-                        openrowlayout.AddChidren(btnopen);
-
-                        var openBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
-                        openrowlayout.AddChidren(openBtnSelected);
-
-                        var closerowlayout = new RowLayout
-                        {
-                            Y = openrowlayout.Bottom,
-                            Height = Application.GetRealHeight(180),
-                        };
-                        windowCoveringfra.AddChidren(closerowlayout);
-
-                        var btnclose = new Button
-                        {
-                            //Text = "鍏�",
-                            TextID = MyInternationalizationString.close,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(50),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                        };
-                        closerowlayout.AddChidren(btnclose);
-
-                        var closeBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
-                        closerowlayout.AddChidren(closeBtnSelected);
-                        #endregion
-
-                        ///鐐瑰嚮纭浜嬩欢
-                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
-                        {
-                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
-                            openBtnSelected.Visible = true;
-                            closeBtnSelected.Visible = false;
-                            dictionary(deviceConditionsInfo, "AttriButeData1", "95");//榛樿鍊�
-
-                        };
-                        openrowlayout.MouseUpEventHandler += openclick;
-                        btnopen.MouseUpEventHandler += openclick;
-                        openBtnSelected.MouseUpEventHandler += openclick;
-                        ///鐐瑰嚮鍙栨秷浜嬩欢
-                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
-                        {
-                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
-                            openBtnSelected.Visible = false;
-                            closeBtnSelected.Visible = true;
-                            dictionary(deviceConditionsInfo, "AttriButeData1", "5");//榛樿鍊�
-
-                        };
-                        closerowlayout.MouseUpEventHandler += closeclick;
-                        btnclose.MouseUpEventHandler += closeclick;
-                        closeBtnSelected.MouseUpEventHandler += closeclick;
-
-                        if (edit && devices != null)
-                        {
-                            if (devices["AttriButeId"] == "8")
-                            {
-                                if (int.Parse(devices["AttriButeData1"]) > 5)
-                                {
-                                    openBtnSelected.Visible = true;
-                                    closeBtnSelected.Visible = false;
-                                }
-                                else
-                                {
-                                    openBtnSelected.Visible = false;
-                                    closeBtnSelected.Visible = true;
-                                }
-                            }
-                        }
-                    }
-                    break;
                 case DeviceType.IASZone:
                     {
 
@@ -1031,6 +837,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1061,6 +868,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1104,12 +912,12 @@
                             dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                             if (iASZonedevice.IasDeviceType == 13)
                             {
-                                SelectedDeviceStatuscondition = "no";
+                                SelectedDeviceStatuscondition = "";
                                 btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                 btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                 openBtnSelected.Visible = false;
                                 closeBtnSelected.Visible = true;
-                                var ignoreTime = new IgnoreTime();
+                                var ignoreTime = new TemplateIgnore();
                                 UserView.HomePage.Instance.AddChidren(ignoreTime);
                                 UserView.HomePage.Instance.PageIndex += 1;
                                 ignoreTime.Show(common, btnclose.Text, edit, timevalue);
@@ -1186,12 +994,12 @@
                                     timeoutrowlayout.AddChidren(timeoutBtnSelected);
                                     EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
                                     {
-                                        SelectedDeviceStatuscondition = "no";
+                                        SelectedDeviceStatuscondition = "";
                                         btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                         btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = false;
-                                        var ignoreTime = new IgnoreTime();
+                                        var ignoreTime = new TemplateIgnore();
                                         UserView.HomePage.Instance.AddChidren(ignoreTime);
                                         UserView.HomePage.Instance.PageIndex += 1;
                                         ignoreTime.Show(common, btntimeout.Text, edit, timevalue);
@@ -1205,7 +1013,6 @@
                                     #endregion
                                 }
                                 break;
-
                             case 40:
                                 {
                                     devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
@@ -1245,7 +1052,6 @@
                                     openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
-
                             case 277:
                                 {
                                     devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
@@ -1298,111 +1104,6 @@
 
                     }
                     break;
-                case DeviceType.OnOffSwitch:
-                    {
-
-                        dictionary(deviceConditionsInfo, "Cluster_ID", "1282");
-                        dictionary(deviceConditionsInfo, "AttriButeId", "1283");
-                        dictionary(deviceConditionsInfo, "Range", "0");//鎸夐敭鐗规畩
-                        dictionary(deviceConditionsInfo, "AttriButeData1", "0");
-                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
-
-                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
-                        devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
-                        var OnOffOutputfra = new FrameLayout
-                        {
-                            Height = Application.GetRealHeight(160),
-                            Y = timetype.Bottom + Application.GetRealHeight(20),
-                        };
-                        devicefra.AddChidren(OnOffOutputfra);
-
-                        var buttonRow = new RowLayout
-                        {
-                            Y = Application.GetRealHeight(30),
-                            Width = Application.GetRealWidth(920),
-                            Height = Application.GetRealHeight(130),
-                            X = Application.GetRealWidth(80),
-                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
-                        };
-                        OnOffOutputfra.AddChidren(buttonRow);
-
-                        var button = new Button
-                        {
-                            Width = Application.GetRealWidth(600),
-                            TextAlignment = TextAlignment.CenterLeft,
-                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
-                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
-                            //SelectedBackgroundColor = 0xfffe5e00,
-                        };
-                        buttonRow.AddChidren(button);
-
-                        var buttonSelected = new SelectedButton();
-                        buttonRow.AddChidren(buttonSelected);
-                        EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
-                        {
-                            buttonSelected.Visible = true;
-                            SelectedDeviceStatuscondition = "OnOffSwitch";
-                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-
-                        };
-                        buttonRow.MouseUpEventHandler += buttonclick;
-                        button.MouseUpEventHandler += buttonclick;
-                        buttonSelected.MouseUpEventHandler += buttonclick;
-                        OnOffOutputfra.MouseUpEventHandler += buttonclick;
-
-                        if (edit && devices != null)
-                        {
-                            buttonSelected.Visible = true;
-                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-                        }
-
-                    }
-                    break;
-                case DeviceType.DoorLock:
-                    {
-                        #region  ------
-                        var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
-                        //var list = Send.ReadDoorLockIfon(common.DeviceAddr);
-                        var pra = new UserCenter.MemberListInfoPra();
-                        string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
-                        var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
-                        Send.UserList.Clear();
-                        for (int i = 0; i < listInfo.Count; i++)
-                        {
-                            var membership = new Send.MembershipIfon();
-                            var membershipifon = listInfo[i];
-                            for (int j = 0; j < doorlockifonlist.Count; j++)
-                            {
-                                ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
-                                if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
-                                {
-                                    membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
-                                    membership.MembershipName = membershipifon.UserName;
-                                    membership.MembershipId = membershipifon.SubAccountDistributedMark;
-
-                                }
-
-                            }
-                            if (membership.UserIdMode.Count != 0)
-                            {
-                                ///杩囨护鎺夐噸澶嶆暟鎹紱
-                                var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
-                                if (str == null)
-                                {
-                                    Send.UserList.Add(membership);
-                                }
-                            }
-
-                        }
-                        #endregion
-
-                        var memberList = new MemberList();
-                        UserView.HomePage.Instance.AddChidren(memberList);
-                        UserView.HomePage.Instance.PageIndex += 1;
-                        MemberList.action += () => { flMain.RemoveFromParent(); };
-                        memberList.Show(common);
-                    }
-                    break;
 
             }
 
@@ -1419,7 +1120,7 @@
                     {
                         var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                                Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
-                                               Language.StringByID(MyInternationalizationString.complete));
+                                               Language.StringByID(MyInternationalizationString.confrim));
                         alert.Show();
                         return;
                     }

--
Gitblit v1.8.0