From 0a8ec482a5ad10bf3cd7010c89630b42ecaca741 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:19:31 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
old mode 100755
new mode 100644
index 46a6942..a23fda1
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
@@ -78,6 +78,8 @@
seekBarContr.MinValue = 1;
seekBarContr.MaxValue = 15;
FrameWhiteCentet1.AddChidren(seekBarContr);
+ seekBarContr.Progress = this.fanData.SpeedLevel;
+ this.btnNowGear.Text = this.fanData.SpeedLevel + Language.StringByID(StringId.Gear);
//寮�鍏冲浘鏍�
this.btnSwitch = new IconViewControl(40);
@@ -94,14 +96,10 @@
//鍒锋柊鐣岄潰鐘舵��
this.RefreshFormStatu(false);
-
- int oldProgressValue = fanData.SpeedLevel;
- int nowProgressValue = fanData.SpeedLevel;
//妗�
var strView = Language.StringByID(StringId.Gear);
seekBarContr.ProgressChangedEvent += (div, value) =>
{
- nowProgressValue = value;
this.btnNowGear.Text = value + strView;
//婊戝姩涓�
if (div == 0) { this.fanData.IsProgressing = true; }
@@ -110,28 +108,10 @@
{
this.fanData.IsProgressing = false;
this.fanData.ProgressEndTime = DateTime.Now;
+ //鍙戦�侀閫熷懡浠�
+ this.SendSpeedComand(value);
}
};
-
- HdlThreadLogic.Current.RunThread(() =>
- {
- while (this.Parent != null)
- {
- if (nowProgressValue != oldProgressValue)
- {
- //鍙戦�侀閫熷懡浠�
- this.SendSpeedComand(nowProgressValue);
- oldProgressValue = nowProgressValue;
- }
- System.Threading.Thread.Sleep(1000);
- }
- //鐣岄潰鍏抽棴鏃�
- if (nowProgressValue != oldProgressValue)
- {
- //鍙戦�侀閫熷懡浠�
- this.SendSpeedComand(nowProgressValue);
- }
- });
}
#endregion
@@ -229,14 +209,14 @@
/// </summary>
private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
{
- foreach (var data in i_LocalDevice.attributes)
+ foreach (var data in i_LocalDevice.status)
{
//寮�鍏�
- if (data.key == "on_off") { this.fanData.Open = data.realValue == "on"; }
+ if (data.key == "on_off") { this.fanData.Open = data.value == "on"; }
//椋庨�熸。浣�
else if (data.key == "fan_speed_percent")
{
- var value = data.realValue;
+ var value = data.value;
if (value != string.Empty)
{
this.fanData.SpeedLevel = Convert.ToInt32(value);
--
Gitblit v1.8.0