From 6c0c799c1f5da2d215ec8d9df9b92b3d1948dc14 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 18:03:33 +0800
Subject: [PATCH] 交付住宅，RGB
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 3ec775a..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 鍖哄煙鍙橀噺
@@ -141,20 +145,32 @@
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()
{
--
Gitblit v1.8.0