From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 0162525..422b5de 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -134,7 +134,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = light.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
colorPicker = new ColorPicker()
{
@@ -147,7 +152,7 @@
controlView.AddChidren(colorPicker);
if(light.trait_on_off.curValue.ToString() == "off")
{
- colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
+ colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
}
#region 浜害璋冭妭
@@ -168,7 +173,7 @@
{
X = Application.GetRealWidth(35),
Y = btnBrightnessText.Bottom,
- Width = Application.GetRealWidth(30),
+ Width = Application.GetRealWidth(22),
Height = Application.GetRealHeight(21),
Text = "0%",
TextAlignment = TextAlignment.CenterLeft,
@@ -179,7 +184,7 @@
dimmerBar = new DiyImageSeekBar()
{
- X = Application.GetRealWidth(35 +22),
+ X = btnMinValuesText.Right,
Y = Application.GetRealHeight(312),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
@@ -199,7 +204,7 @@
{
X = dimmerBar.Right,
Y = btnBrightnessText.Bottom,
- Width = Application.GetRealWidth(45),
+ Width = Application.GetRealWidth(35),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
@@ -295,11 +300,6 @@
LoadEventList();
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