From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
old mode 100644
new mode 100755
index 943346f..2071bab
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -45,6 +45,10 @@
/// 娓愬彉鏃堕棿杩涘害鏉�
/// </summary>
DiyImageSeekBar barFadeTime;
+ /// <summary>
+ /// 鑹茬洏閲岄潰閭ｄ釜浼氭粦鍔ㄧ殑鐞�
+ /// </summary>
+ Button btnWhiteRound;
#endregion
#region 鍖哄煙鍙橀噺
@@ -110,10 +114,6 @@
};
controlView.AddChidren(btnFromFoorAndRoom);
- if(light.redColor==0&&light.greenColor == 0&& light.blueColor == 0)
- {
- }
-
btnCurColor = new Button()
{
X = Application.GetRealWidth(16),
@@ -123,13 +123,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()
@@ -140,19 +136,40 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = light.collection
+ IsSelected = light.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
+
+ //鑹茬洏鐨勬甯冩帶浠�(闄愬埗閭ｄ釜鐧借壊婊戝姩鐞冧娇鐢�)
+ var framePickerBack = new FrameLayout();
+ framePickerBack.Gravity = Gravity.CenterHorizontal;
+ framePickerBack.Y = btnFromFoorAndRoom.Bottom + Application.GetRealHeight(1);
+ framePickerBack.Width = Application.GetMinRealAverage(216);
+ framePickerBack.Height = Application.GetMinRealAverage(216);
+ controlView.AddChidren(framePickerBack);
colorPicker = new ColorPicker()
{
- Gravity = Gravity.CenterHorizontal,
- Y = btnFromFoorAndRoom.Bottom + Application.GetRealHeight(1),
- Width = Application.GetMinRealAverage(216),
- Height = Application.GetMinRealAverage(216),
ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
};
- controlView.AddChidren(colorPicker);
+ framePickerBack.AddChidren(colorPicker);
+ if(light.trait_on_off.curValue.ToString() == "off")
+ {
+ colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
+ }
+
+ //鐧界偣鎺т欢
+ this.btnWhiteRound = new Button();
+ btnWhiteRound.Width = Application.GetRealWidth(24);
+ btnWhiteRound.Height = Application.GetRealWidth(24);
+ btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
+ btnWhiteRound.Visible = false;
+ framePickerBack.AddChidren(btnWhiteRound);
#region 浜害璋冭妭
var btnBrightnessText = new Button()
@@ -172,7 +189,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 +200,7 @@
dimmerBar = new DiyImageSeekBar()
{
- X = btnMinValuesText.Right,
+ X = Application.GetRealWidth(35 +22),
Y = Application.GetRealHeight(312),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
@@ -203,7 +220,7 @@
{
X = dimmerBar.Right,
Y = btnBrightnessText.Bottom,
- Width = Application.GetRealWidth(35),
+ Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
@@ -299,6 +316,11 @@
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