From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 120 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 84 insertions(+), 36 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 5f8c0f7..2071bab
--- 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,30 @@
/// k寮�鍏虫寜閽�
/// </summary>
Button btnSwitch;
-
+ /// <summary>
+ /// 鎭㈠榛樿棰滆壊
+ /// </summary>
+ Button btnRestoredPoint;
+ /// <summary>
+ /// 璋冨厜杩涘害鏉�
+ /// </summary>
+ DiyImageSeekBar dimmerBar;
+ /// <summary>
+ /// 娓愬彉鏃堕棿杩涘害鏉�
+ /// </summary>
+ DiyImageSeekBar barFadeTime;
+ /// <summary>
+ /// 鑹茬洏閲岄潰閭ｄ釜浼氭粦鍔ㄧ殑鐞�
+ /// </summary>
+ Button btnWhiteRound;
#endregion
#region 鍖哄煙鍙橀噺
- Function light;
+ Light light;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
+ bool onDimmerBar = false;
/// <summary>
/// 鍒锋柊鏄剧ず淇℃伅
/// </summary>
@@ -50,7 +66,7 @@
public RGBPage(Function func)
{
bodyView = this;
- light = func;
+ light = func as Light;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -107,7 +123,9 @@
Radius = (uint)Application.GetMinRealAverage(8),
BorderColor = CSS_Color.PromptingColor2,
BorderWidth = 1,
+ BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor())
};
+
controlView.AddChidren(btnCurColor);
btnCollection = new Button()
@@ -116,20 +134,42 @@
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.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()
@@ -149,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,
@@ -158,28 +198,29 @@
};
controlView.AddChidren(btnMinValuesText);
- var dimmerControlBar = new DiyImageSeekBar()
+ dimmerBar = new DiyImageSeekBar()
{
- X = btnMinValuesText.Right,
+ X = Application.GetRealWidth(35 +22),
Y = Application.GetRealHeight(312),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
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.curValue.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),
+ Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
@@ -216,7 +257,7 @@
};
controlView.AddChidren(btnGradualChangeMinValuesText);
- var barGradualChange = new DiyImageSeekBar()
+ barFadeTime = new DiyImageSeekBar()
{
X = btnGradualChangeMinValuesText.Right,
Y = Application.GetRealHeight(412 - 21),
@@ -231,13 +272,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 +291,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 +304,23 @@
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.curValue.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);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(light);
+ })
+ { IsBackground = true }.Start();
}
}
}
--
Gitblit v1.8.0