From c3e1b733fc45bd9f0b88bfb560cfa87a270b079b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 九月 2020 17:33:58 +0800
Subject: [PATCH] 20200909

---
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index dae34db..ede9214 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -9,7 +9,7 @@
     public partial class FunctionControlZone : FrameLayout
     {
         #region 鍖哄煙鎺т欢
-        FrameLayout bodyDiv;
+        static FrameLayout bodyDiv;
         /// <summary>
         /// 鍔熻兘/鍦烘櫙icon
         /// </summary>
@@ -38,6 +38,7 @@
         public FunctionControlZone(Function func)
         {
             bodyDiv = this;
+            bodyDiv.Tag = func.sid;
             function = func;
         }
 
@@ -109,7 +110,7 @@
                         UnSelectedImagePath = "Public/PowerClose.png",
                         SelectedImagePath = "Public/PowerOpen.png",
                         IsSelected = function.trait_on_off.value.ToString() == "on",
-                        Tag = function.functionType + "_Switch_" + function.sid,
+                        Tag = function.sid + "_Switch",
                     };
                     bodyDiv.AddChidren(btnSwitch);
                 }
@@ -124,7 +125,7 @@
                         UnSelectedImagePath = "Public/PowerClose.png",
                         SelectedImagePath = "Public/PowerOpen.png",
                         IsSelected = function.trait_on_off.value.ToString() == "on",
-                        Tag = function.functionType + "_Switch_" + function.sid,
+                        Tag = function.sid + "_Switch",
                     };
                     bodyDiv.AddChidren(btnSwitch);
                 }
@@ -270,10 +271,12 @@
                         ThumbImageHeight = Application.GetRealHeight(54),
                         ProgressBarColor = function.trait_on_off.value.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.PromptingColor2,
                         ProgressTextColor = CSS_Color.FirstLevelTitleColor,
-                        ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        ProgressTextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                         MaxValue = 100,
                         Progress = (function as Light).brightness,
-                        Tag = function.functionType + "_DimmerBar_" + function.sid
+                        Tag = function.sid + "_DimmerBar",
+                        SeekBarPadding = Application.GetRealWidth(20),
+                        
                     };
                     bodyDiv.AddChidren(dimmerControlBar);
 

--
Gitblit v1.8.0