From 5ec581e5d37b108fc9d59e89afd8e94e21b32080 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 17 十月 2023 17:33:36 +0800
Subject: [PATCH] 2023年10月17日17:33:33

---
 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index 7dab158..9846580 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -20,7 +20,7 @@
                         return;
                     bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updateTemp.trait_on_off.curValue.ToString() == "on";
                     bodyView.barGradualChange.ProgressBarColor = updateTemp.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.MainColor : CSS.CSS_Color.PromptingColor2;
-                    bodyView.barGradualChange.Progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.OpenLevel));
+                    bodyView.barGradualChange.Progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.fan_speed_percent));
                 }
                 catch (Exception ex)
                 {
@@ -62,7 +62,7 @@
         {
             btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
             {
-                if (!function.online)
+                if (!function.isOnline())
                 {
                     new Tip()
                     {
@@ -86,7 +86,7 @@
             };
             btnSwitch.MouseUpEventHandler += (sender, e) =>
             {
-                if (!function.online)
+                if (!function.isOnline())
                 {
                     new Tip()
                     {
@@ -108,16 +108,15 @@
                 { IsBackground = true }.Start();
             };
 
-            if (!function.online)
+            if (function.isOnline())
             {
-                barGradualChange.OnProgressChangedEvent = (sender, e) =>
+                barGradualChange.OnStopTrackingTouchEvent = (sender, e) =>
                 {
-                    function.SetAttrState(FunctionAttributeKey.OpenLevel, e.ToString());
+                    function.SetAttrState(FunctionAttributeKey.fan_speed_percent, e.ToString());
                     new System.Threading.Thread(() =>
                     {
-                        function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                         System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                        d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+                        d.Add("fan_speed_percent", e.ToString());
                         Control.Ins.SendWriteCommand(function, d);
                     })
                     { IsBackground = true }.Start();

--
Gitblit v1.8.0