From 22b933ef2df51491ee31f3bd4b637efb6a63bef9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:18:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index f4e0269..0878e07 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -140,7 +140,7 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = light.collection
+ IsSelected = light.collect
};
controlView.AddChidren(btnCollection);
@@ -153,6 +153,10 @@
ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
};
controlView.AddChidren(colorPicker);
+ if(light.trait_on_off.curValue.ToString() == "off")
+ {
+ colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
+ }
#region 浜害璋冭妭
var btnBrightnessText = new Button()
@@ -172,7 +176,7 @@
{
X = Application.GetRealWidth(35),
Y = btnBrightnessText.Bottom,
- Width = Application.GetRealWidth(22),
+ Width = Application.GetRealWidth(30),
Height = Application.GetRealHeight(21),
Text = "0%",
TextAlignment = TextAlignment.CenterLeft,
@@ -183,7 +187,7 @@
dimmerBar = new DiyImageSeekBar()
{
- X = btnMinValuesText.Right,
+ X = Application.GetRealWidth(35 +22),
Y = Application.GetRealHeight(312),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
@@ -192,7 +196,7 @@
ThumbImageHeight = Application.GetRealHeight(54),
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- ProgressBarColor = light.trait_on_off.value.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
+ ProgressBarColor = light.trait_on_off.curValue.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
MaxValue = 100,
Progress = light.brightness,
SeekBarPadding = Application.GetRealWidth(20),
@@ -203,7 +207,7 @@
{
X = dimmerBar.Right,
Y = btnBrightnessText.Bottom,
- Width = Application.GetRealWidth(35),
+ Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
@@ -293,12 +297,17 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.trait_on_off.value.ToString() == "on"
+ IsSelected = light.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView(light, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(light);
+ })
+ { IsBackground = true }.Start();
}
}
}
--
Gitblit v1.8.0