From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index 90cadf6..d82a852 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -354,20 +354,19 @@
new System.Threading.Thread(() => {
while (true)
{
- System.Threading.Thread.Sleep(500);
- System.Threading.Thread.Sleep(500);
+ System.Threading.Thread.Sleep(1000);
if (curDimmerStatus)
{
continue;
}
if (onDimmerBar)
{
- onDimmerBar = false;
continue;
}
else
{
DriverLayer.Control.Ins.SendReadCommand(function);
+ curDimmerStatus = true;
}
}
})
--
Gitblit v1.8.0