From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index 90cadf6..887adeb 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;
}
}
})
@@ -486,13 +485,13 @@
btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";
};
- //浼氬 3000k
+ //浼氬 4500k
var btnMeet = new Button();
btnMeet.X = btnMeetIcon.Right + Application.GetRealWidth(12);
btnMeet.Y = btnMeetIcon.Y;
btnMeet.Width = Application.GetRealWidth(100);
btnMeet.Height = Application.GetRealWidth(24);
- btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 3000K";
+ btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 4500K";
btnMeet.TextSize = CSS_FontSize.TextFontSize;
btnMeet.TextColor = CSS_Color.FirstLevelTitleColor;
btnMeet.SelectedTextColor = CSS_Color.MainColor;
@@ -500,7 +499,7 @@
frameWhite.AddChidren(btnMeet);
btnMeet.MouseUpEventHandler += (sender, e) =>
{
- barColorTemplatrue.Progress = 30;
+ barColorTemplatrue.Progress = 45;
function.SetAttrState(FunctionAttributeKey.CCT, barColorTemplatrue.Progress * 100);
barColorTemplatrue.SetCustomText((barColorTemplatrue.Progress * 100) + "K");
frameBack.Close();
@@ -564,7 +563,7 @@
btnCozy.IsSelected = true;
btnCozyIcon.IsSelected = true;
}
- if (function.GetAttrState(FunctionAttributeKey.CCT) == "3000")
+ if (function.GetAttrState(FunctionAttributeKey.CCT) == "4500")
{
btnMeet.IsSelected = true;
btnMeetIcon.IsSelected = true;
--
Gitblit v1.8.0