From f5a49299caaf1fdca7503ae682da13c6fda887c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 20:55:55 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 0878e07..4055b10 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -110,10 +110,6 @@
};
controlView.AddChidren(btnFromFoorAndRoom);
- if(light.redColor==0&&light.greenColor == 0&& light.blueColor == 0)
- {
- }
-
btnCurColor = new Button()
{
X = Application.GetRealWidth(16),
@@ -123,13 +119,9 @@
Radius = (uint)Application.GetMinRealAverage(8),
BorderColor = CSS_Color.PromptingColor2,
BorderWidth = 1,
- BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor)
+ BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor())
};
- if (light.redColor == 0 && light.greenColor == 0 && light.blueColor == 0)
- {
- btnCurColor.BackgroundColor = 0x00000000;
- }
controlView.AddChidren(btnCurColor);
btnCollection = new Button()
@@ -142,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()
{
--
Gitblit v1.8.0