From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 5f8c0f7..01adff3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -8,7 +8,7 @@
public partial class RGBPage : FrameLayout
{
#region 鎺т欢闆嗗悎
- FrameLayout bodyView;
+ static RGBPage bodyView;
/// <summary>
/// 棰滆壊閫夋嫨鍖哄煙
/// </summary>
@@ -33,14 +33,26 @@
/// k寮�鍏虫寜閽�
/// </summary>
Button btnSwitch;
-
+ /// <summary>
+ /// 鎭㈠榛樿棰滆壊
+ /// </summary>
+ Button btnRestoredPoint;
+ /// <summary>
+ /// 璋冨厜杩涘害鏉�
+ /// </summary>
+ DiyImageSeekBar dimmerBar;
+ /// <summary>
+ /// 娓愬彉鏃堕棿杩涘害鏉�
+ /// </summary>
+ DiyImageSeekBar barFadeTime;
#endregion
#region 鍖哄煙鍙橀噺
- Function light;
+ Light light;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
+ bool onDimmerBar = false;
/// <summary>
/// 鍒锋柊鏄剧ず淇℃伅
/// </summary>
@@ -50,7 +62,7 @@
public RGBPage(Function func)
{
bodyView = this;
- light = func;
+ light = func as Light;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -98,6 +110,10 @@
};
controlView.AddChidren(btnFromFoorAndRoom);
+ if(light.redColor==0&&light.greenColor == 0&& light.blueColor == 0)
+ {
+ }
+
btnCurColor = new Button()
{
X = Application.GetRealWidth(16),
@@ -107,7 +123,13 @@
Radius = (uint)Application.GetMinRealAverage(8),
BorderColor = CSS_Color.PromptingColor2,
BorderWidth = 1,
+ BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor)
};
+
+ if (light.redColor == 0 && light.greenColor == 0 && light.blueColor == 0)
+ {
+ btnCurColor.BackgroundColor = 0x00000000;
+ }
controlView.AddChidren(btnCurColor);
btnCollection = new Button()
@@ -116,8 +138,9 @@
Y = Application.GetRealHeight(14),
Width = Application.GetMinRealAverage(40),
Height = Application.GetMinRealAverage(40),
- UnSelectedImagePath = "Collection/CollectionIcon.png",
- SelectedImagePath = "Collection/CollectionWhiteIcon.png",
+ SelectedImagePath = "Collection/CollectionIcon.png",
+ UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
+ IsSelected = light.collection
};
controlView.AddChidren(btnCollection);
@@ -158,7 +181,7 @@
};
controlView.AddChidren(btnMinValuesText);
- var dimmerControlBar = new DiyImageSeekBar()
+ dimmerBar = new DiyImageSeekBar()
{
X = btnMinValuesText.Right,
Y = Application.GetRealHeight(312),
@@ -167,17 +190,18 @@
SeekBarViewHeight = Application.GetRealHeight(8),
ThumbImagePath = "Public/ThumbImage.png",
ThumbImageHeight = Application.GetRealHeight(54),
- ProgressBarColor = CSS_Color.AuxiliaryColor1,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ ProgressBarColor = light.trait_on_off.value.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
MaxValue = 100,
- Progress = 30,
+ Progress = light.brightness,
+ SeekBarPadding = Application.GetRealWidth(20),
};
- controlView.AddChidren(dimmerControlBar);
+ controlView.AddChidren(dimmerBar);
var btnMaxValuesText = new Button()
{
- X = dimmerControlBar.Right,
+ X = dimmerBar.Right,
Y = btnBrightnessText.Bottom,
Width = Application.GetRealWidth(35),
Height = Application.GetRealHeight(21),
@@ -216,7 +240,7 @@
};
controlView.AddChidren(btnGradualChangeMinValuesText);
- var barGradualChange = new DiyImageSeekBar()
+ barFadeTime = new DiyImageSeekBar()
{
X = btnGradualChangeMinValuesText.Right,
Y = Application.GetRealHeight(412 - 21),
@@ -231,13 +255,14 @@
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
ProgressBarUnitSring = "s",
MaxValue = 10,
- Progress = 0,
+ Progress = light.fadeTime,
+ SeekBarPadding = Application.GetRealWidth(20),
};
- controlView.AddChidren(barGradualChange);
+ controlView.AddChidren(barFadeTime);
var btnGradualChangeMaxValuesText = new Button()
{
- X = barGradualChange.Right,
+ X = barFadeTime.Right,
Y = btnGradualChangeText.Bottom+ Application.GetRealHeight(10),
Width = Application.GetRealWidth(35),
Height = Application.GetRealHeight(21),
@@ -249,12 +274,12 @@
controlView.AddChidren(btnGradualChangeMaxValuesText);
#endregion
- Button btnRestoredPoint = new Button()
+ btnRestoredPoint = new Button()
{
- X = Application.GetRealWidth(86),
- Y = Application.GetRealHeight(448),
- Width = Application.GetMinRealAverage(76),
- Height = Application.GetMinRealAverage(76),
+ X = Application.GetRealWidth(104),
+ Y = Application.GetRealHeight(462),
+ Width = Application.GetMinRealAverage(40),
+ Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/Restored_Shadow.png",
SelectedImagePath = "Public/Restored_Shadow.png",
};
@@ -262,17 +287,18 @@
btnSwitch = new Button()
{
- X = btnRestoredPoint.Right + Application.GetRealWidth(4),
- Y = Application.GetRealHeight(448),
- Width = Application.GetMinRealAverage(76),
- Height = Application.GetMinRealAverage(76),
- UnSelectedImagePath = "Public/PowerClose_Shadow.png",
- SelectedImagePath = "Public/PowerOpen_Shadow.png",
+ X = btnRestoredPoint.Right + Application.GetRealWidth(40),
+ Y = Application.GetRealHeight(462),
+ Width = Application.GetMinRealAverage(40),
+ Height = Application.GetMinRealAverage(40),
+ UnSelectedImagePath = "Public/PowerClose.png",
+ SelectedImagePath = "Public/PowerOpen.png",
+ IsSelected = light.trait_on_off.value.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);
}
}
}
--
Gitblit v1.8.0