From 5c25f9546d0954befb202910540a5ac59af1adfe Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 04 一月 2021 14:07:27 +0800
Subject: [PATCH] 20210103:增加安卓后退按键

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

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 3f7269f..836d78b 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -107,6 +107,8 @@
                         Tag = function.sid + "_Switch",
                     };
                     bodyDiv.AddChidren(btnSwitch);
+                    //鍔犺浇寮�鍏虫寜閽簨浠�
+                    LoadEvent_SwitchFunction(btnSwitch,function.attributes.Find((obj)=> obj.key == FunctionAttributeKey.FadeTime ));
                 }
                 else
                 {
@@ -122,9 +124,9 @@
                         Tag = function.sid + "_Switch",
                     };
                     bodyDiv.AddChidren(btnSwitch);
+                    //鍔犺浇寮�鍏虫寜閽簨浠�
+                    LoadEvent_SwitchFunction(btnSwitch);
                 }
-                //鍔犺浇寮�鍏虫寜閽簨浠�
-                LoadEvent_SwitchFunction(btnSwitch);
 
                 switch (function.functionCategory)
                 {
@@ -395,6 +397,10 @@
         /// </summary>
         void LoadLastStatesButton()
         {
+            if(function.spk == SPK.LightSwitch)
+            {
+                return;
+            }
             var btnLastStates = new Button()
             {
                 X = Application.GetRealWidth(10 + 32 + 8),

--
Gitblit v1.8.0