From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 45ef832..1a26758 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -157,10 +157,12 @@
framePickerBack.Y = btnFromFoorAndRoom.Bottom + Application.GetRealHeight(1);
framePickerBack.Width = Application.GetMinRealAverage(216);
framePickerBack.Height = Application.GetMinRealAverage(216);
+ //framePickerBack.BackgroundColor = 0xFFFF0000;
controlView.AddChidren(framePickerBack);
colorPicker = new ColorPicker()
{
+ Gravity = Gravity.Center,
ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
};
framePickerBack.AddChidren(colorPicker);
@@ -176,10 +178,17 @@
//};
//鐧界偣鎺т欢
- this.btnWhiteRound = new Button();
- btnWhiteRound.Width = Application.GetRealWidth(24);
- btnWhiteRound.Height = Application.GetRealWidth(24);
- btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
+ var diameter = Application.GetRealWidth(12);
+ this.btnWhiteRound = new Button()
+ {
+ Width = diameter,
+ Height = diameter,
+ Radius = (uint)Application.GetRealWidth(6),
+ BorderWidth = (uint)Application.GetRealWidth(1),
+ BorderColor = CSS_Color.MainBackgroundColor,
+ Enable = false,
+ };
+ //btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
btnWhiteRound.Visible = false;
framePickerBack.AddChidren(btnWhiteRound);
@@ -349,6 +358,28 @@
DriverLayer.Control.Ins.SendReadCommand(function);
})
{ IsBackground = true }.Start();
+
+ new System.Threading.Thread(() => {
+ while (true)
+ {
+ System.Threading.Thread.Sleep(1000);
+ if (curDimmerStatus)
+ {
+ continue;
+ }
+ if (onDimmerBar)
+ {
+ continue;
+ }
+ else
+ {
+ DriverLayer.Control.Ins.SendReadCommand(function);
+ curDimmerStatus = true;
+ }
+ }
+ })
+ { IsBackground = true }.Start();
+
}
}
}
--
Gitblit v1.8.0