From e28d283bd27db2c40ff435c517db54e2010e8ae6 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 14:31:56 +0800
Subject: [PATCH] 2019.12.24

---
 ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
index efb483a..754d2f4 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
@@ -23,7 +23,7 @@
         /// <summary>
         /// ZoneBtn
         /// </summary>
-        private Button ZoneBtn;
+        private Button StatuBtn;
         /// <summary>
         /// ClickBtn
         /// </summary>
@@ -42,7 +42,7 @@
                 v_Selected = value;
                 try
                 {
-                    SetStatu(v_Selected);
+                    SetOnLineStatu(v_Selected);
                 }
                 catch
                 {
@@ -66,7 +66,7 @@
             Y = Application.GetRealHeight(y);
             Width = Application.GetRealWidth(1022);
             Height = Application.GetRealHeight(127);
-            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+            //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
         }
 
         /// <summary>
@@ -105,7 +105,7 @@
             {
                 X = Application.GetRealWidth(181),
                 Y = Application.GetRealHeight(14),
-                Width = Application.GetRealWidth(400),
+                Width = Application.GetRealWidth(600),
                 Height = Application.GetRealHeight(58),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
@@ -114,7 +114,7 @@
             };
             AddChidren(NameBtn);
 
-            ZoneBtn = new Button
+            StatuBtn = new Button
             {
                 X = Application.GetRealWidth(181),
                 Y = Application.GetRealHeight(72),
@@ -123,7 +123,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
             };
-            AddChidren(ZoneBtn);
+            AddChidren(StatuBtn);
 
             SwitchBtn = new Button()
             {
@@ -176,18 +176,27 @@
         /// SetZoneText
         /// </summary>
         /// <param name="title"></param>
-        public void SetZoneText(string title)
+        public void SetStatuText(string title)
         {
-            ZoneBtn.Text = title;
+            StatuBtn.Text = title;
         }
-
         /// <summary>
         /// SetStatu
         /// </summary>
         /// <param name="statu"></param>
         public void SetStatu(bool statu)
         {
-            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = SwitchBtn.IsSelected = statu;
+            SwitchBtn.IsSelected = statu;
+            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
+        }
+
+        /// <summary>
+        /// SetStatu
+        /// </summary>
+        /// <param name="statu"></param>
+        public void SetOnLineStatu(bool statu)
+        {
+            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected =  statu;
         }
 
         /// <summary>
@@ -196,7 +205,7 @@
         /// <param name="statu"></param>
         public void HideSwitchBtn(bool statu)
         {
-            SwitchBtn.Visible = statu;
+            SwitchBtn.Visible = !statu;
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0