From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 237 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 153 insertions(+), 84 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index 63f7030..a2014d0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -37,7 +37,7 @@
/// <summary>
/// 娓愬彉鏃堕棿淇敼
/// </summary>
- DiyImageSeekBar barFadeTime;
+ //DiyImageSeekBar barFadeTime;
/// <summary>
/// 鑹叉俯鐨勬粦鍔ㄦ帶浠�
/// </summary>
@@ -141,9 +141,9 @@
dimmerBar = new WaveSeekBarOn()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(74 + 16),
- Width = Application.GetRealWidth(142 - 40),
- Height = Application.GetRealHeight(222 - 16 - 16),
+ Y = Application.GetRealHeight(108),
+ Width = Application.GetRealWidth(142 - 16 -16),
+ Height = Application.GetRealHeight(222),
BorderColor = 0x00000000,
CornerRadius = Application.GetRealWidth(20),
BorderWidth = 0,
@@ -163,7 +163,7 @@
btnBrightnessText = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40),
+ Y = ((100 - light.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80),
Width = Application.GetRealWidth(56),
Height = Application.GetRealWidth(46),
UnSelectedImagePath = "FunctionIcon/Light/BrightnessBg.png",
@@ -177,7 +177,7 @@
//鑹叉俯
var btnTempClolor = new Button();
btnTempClolor.X = Application.GetRealWidth(35);
- btnTempClolor.Y = Application.GetRealHeight(306);
+ btnTempClolor.Y = Application.GetRealHeight(306 +60);
btnTempClolor.Width = Application.GetRealWidth(224);
btnTempClolor.Height = Application.GetRealHeight(21);
btnTempClolor.TextAlignment = TextAlignment.CenterLeft;
@@ -218,6 +218,9 @@
barColorTemplatrue.Y = btnTempClolorMin.Y - (barColorTemplatrue.Height - btnTempClolorMin.Height) / 2;
//鏄剧ず涓婃柟鐨凾xt
barColorTemplatrue.ShowCustomTextView(Application.GetRealWidth(50), CSS_FontSize.PromptFontSize_FirstLevel, CSS_Color.FirstLevelTitleColor);
+ var cct = 27;
+ int.TryParse(light.Attr_CCT.curValue.ToString(), out cct);
+ barColorTemplatrue.Progress = cct;
//璁剧疆鍒濆鍊�
barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
@@ -239,71 +242,71 @@
#endregion
#region 娓愬彉鏃堕棿璋冭妭
- var btnGradualChangeText = new Button()
- {
- X = Application.GetRealWidth(35),
- Y = Application.GetRealHeight(385),
- Width = Application.GetRealWidth(224),
- Height = Application.GetRealHeight(21),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.SpeedOfChange,
- };
- controlView.AddChidren(btnGradualChangeText);
+ //var btnGradualChangeText = new Button()
+ //{
+ // X = Application.GetRealWidth(35),
+ // Y = Application.GetRealHeight(385),
+ // Width = Application.GetRealWidth(224),
+ // Height = Application.GetRealHeight(21),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextID = StringId.SpeedOfChange,
+ //};
+ //controlView.AddChidren(btnGradualChangeText);
- var btnGradualChangeMinValuesText = new Button()
- {
- X = Application.GetRealWidth(35),
- Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
- Width = Application.GetRealWidth(22),
- Height = Application.GetRealHeight(21),
- Text = "0s",
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- };
- controlView.AddChidren(btnGradualChangeMinValuesText);
+ //var btnGradualChangeMinValuesText = new Button()
+ //{
+ // X = Application.GetRealWidth(35),
+ // Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
+ // Width = Application.GetRealWidth(22),
+ // Height = Application.GetRealHeight(21),
+ // Text = "0s",
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ //};
+ //controlView.AddChidren(btnGradualChangeMinValuesText);
- barFadeTime = new DiyImageSeekBar()
- {
- X = btnGradualChangeMinValuesText.Right,
- Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8),
- Width = Application.GetRealWidth(210),
- Height = Application.GetRealHeight(54),
- SeekBarViewHeight = Application.GetRealHeight(8),
- ThumbImagePath = "Public/ThumbImage.png",
- ThumbImageHeight = Application.GetRealHeight(54),
- ProgressBarColor = CSS_Color.MainColor,
- ProgressTextColor = CSS_Color.FirstLevelTitleColor,
- ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- ProgressBarUnitSring = "s",
- MaxValue = 10,
- Progress = light.fadeTime,
- SeekBarPadding = Application.GetRealWidth(20),
- };
- controlView.AddChidren(barFadeTime);
+ //barFadeTime = new DiyImageSeekBar()
+ //{
+ // X = btnGradualChangeMinValuesText.Right,
+ // Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8),
+ // Width = Application.GetRealWidth(210),
+ // Height = Application.GetRealHeight(54),
+ // SeekBarViewHeight = Application.GetRealHeight(8),
+ // ThumbImagePath = "Public/ThumbImage.png",
+ // ThumbImageHeight = Application.GetRealHeight(54),
+ // ProgressBarColor = CSS_Color.MainColor,
+ // ProgressTextColor = CSS_Color.FirstLevelTitleColor,
+ // ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // ProgressBarUnitSring = "s",
+ // MaxValue = 10,
+ // Progress = light.fadeTime,
+ // SeekBarPadding = Application.GetRealWidth(20),
+ //};
+ //controlView.AddChidren(barFadeTime);
- var btnGradualChangeMaxValuesText = new Button()
- {
- X = barFadeTime.Right,
- Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
- Width = Application.GetRealWidth(35),
- Height = Application.GetRealHeight(21),
- Text = "10s",
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- };
- controlView.AddChidren(btnGradualChangeMaxValuesText);
+ //var btnGradualChangeMaxValuesText = new Button()
+ //{
+ // X = barFadeTime.Right,
+ // Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
+ // Width = Application.GetRealWidth(35),
+ // Height = Application.GetRealHeight(21),
+ // Text = "10s",
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ //};
+ //controlView.AddChidren(btnGradualChangeMaxValuesText);
#endregion
btnSwitch = new Button()
{
- X = Application.GetRealWidth(184),
- Y = Application.GetRealHeight(462),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
+ X = Application.GetRealWidth(180),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
IsSelected = light.trait_on_off.curValue.ToString() == "on",
@@ -312,11 +315,11 @@
//鑹叉俯鐨勫揩鎹锋柟寮忓浘鏍�
btnShortcut = new Button();
- btnShortcut.X = Application.GetRealWidth(104);
+ btnShortcut.X = Application.GetRealWidth(116);
btnShortcut.Y = btnSwitch.Y;
- btnShortcut.Width = Application.GetRealWidth(40);
- btnShortcut.Height = Application.GetRealWidth(40);
- btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/ColorTemperatrueQuick.png";
+ btnShortcut.Width = Application.GetRealWidth(32);
+ btnShortcut.Height = Application.GetRealWidth(32);
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";
controlView.AddChidren(btnShortcut);
btnShortcut.MouseUpEventHandler += (sender, e) =>
{
@@ -341,6 +344,13 @@
{
//鏁翠釜鐏拌壊鐣岄潰
var frameBack = new Dialog();
+
+ var dialogBody = new FrameLayout();
+ frameBack.AddChidren(dialogBody);
+ dialogBody.MouseUpEventHandler = (sender, e) => {
+ frameBack.Close();
+ };
+
frameBack.Show();
//鐧借壊鐨勮儗鏅�(鐢ㄥ浘鐗囨暣鐨�)
@@ -378,12 +388,18 @@
btnCozyIcon.Width = Application.GetRealWidth(24);
btnCozyIcon.Height = Application.GetRealWidth(24);
btnCozyIcon.UnSelectedImagePath = "FunctionIcon/Light/CozyIcon.png";
+ btnCozyIcon.SelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";
frameWhite.AddChidren(btnCozyIcon);
btnCozyIcon.MouseUpEventHandler += (sender, e) =>
- {
+ {
barColorTemplatrue.Progress = 27;
- barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
- frameBack.Close();
+ light.Attr_CCT.curValue = barColorTemplatrue.Progress * 100;
+ barColorTemplatrue.SetCustomText(light.Attr_CCT.curValue + "K");
+ frameBack.Close();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";
};
//娓╅Θ 2700k
var btnCozy = new Button();
@@ -394,13 +410,21 @@
btnCozy.Text = Language.StringByID(StringId.Cozy) + " 2700K";
btnCozy.TextSize = CSS_FontSize.TextFontSize;
btnCozy.TextColor = CSS_Color.FirstLevelTitleColor;
+ btnCozy.SelectedTextColor = CSS_Color.MainColor;
btnCozy.TextAlignment = TextAlignment.CenterLeft;
frameWhite.AddChidren(btnCozy);
btnCozy.MouseUpEventHandler += (sender, e) =>
{
barColorTemplatrue.Progress = 27;
+ light.Attr_CCT.curValue = barColorTemplatrue.Progress * 100;
+ barColorTemplatrue.SetCustomText(light.Attr_CCT.curValue + "K");
+ frameBack.Close();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d); barColorTemplatrue.Progress = 27;
barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
frameBack.Close();
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";
};
//浼氬鍥炬爣
@@ -410,12 +434,18 @@
btnMeetIcon.Width = Application.GetRealWidth(24);
btnMeetIcon.Height = Application.GetRealWidth(24);
btnMeetIcon.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIcon.png";
+ btnMeetIcon.SelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";
frameWhite.AddChidren(btnMeetIcon);
btnMeetIcon.MouseUpEventHandler += (sender, e) =>
- {
+ {
barColorTemplatrue.Progress = 30;
- barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
- frameBack.Close();
+ light.Attr_CCT.curValue = barColorTemplatrue.Progress * 100;
+ barColorTemplatrue.SetCustomText(light.Attr_CCT.curValue + "K");
+ frameBack.Close();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";
};
//浼氬 3000k
@@ -427,13 +457,19 @@
btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 3000K";
btnMeet.TextSize = CSS_FontSize.TextFontSize;
btnMeet.TextColor = CSS_Color.FirstLevelTitleColor;
+ btnMeet.SelectedTextColor = CSS_Color.MainColor;
btnMeet.TextAlignment = TextAlignment.CenterLeft;
frameWhite.AddChidren(btnMeet);
btnMeet.MouseUpEventHandler += (sender, e) =>
{
barColorTemplatrue.Progress = 30;
- barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
- frameBack.Close();
+ light.Attr_CCT.curValue = barColorTemplatrue.Progress * 100;
+ barColorTemplatrue.SetCustomText(light.Attr_CCT.curValue + "K");
+ frameBack.Close();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";
};
//闃呰鍥炬爣
@@ -443,12 +479,18 @@
btnReadIcon.Width = Application.GetRealWidth(24);
btnReadIcon.Height = Application.GetRealWidth(24);
btnReadIcon.UnSelectedImagePath = "FunctionIcon/Light/ReadIcon.png";
+ btnReadIcon.SelectedImagePath = "FunctionIcon/Light/ReadIconOn.png";
frameWhite.AddChidren(btnReadIcon);
btnReadIcon.MouseUpEventHandler += (sender, e) =>
- {
+ {
barColorTemplatrue.Progress = 65;
- barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
- frameBack.Close();
+ light.Attr_CCT.curValue = barColorTemplatrue.Progress * 100;
+ barColorTemplatrue.SetCustomText(light.Attr_CCT.curValue + "K");
+ frameBack.Close();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/ReadIconOn.png";
};
//闃呰 6500k
var btnRead = new Button();
@@ -458,15 +500,42 @@
btnRead.Height = Application.GetRealWidth(24);
btnRead.Text = Language.StringByID(StringId.Reading) + " 6500K";
btnRead.TextSize = CSS_FontSize.TextFontSize;
- btnRead.TextColor = CSS_Color.MainColor;
+ btnRead.TextColor = CSS_Color.FirstLevelTitleColor;
+ btnRead.SelectedTextColor = CSS_Color.MainColor;
btnRead.TextAlignment = TextAlignment.CenterLeft;
frameWhite.AddChidren(btnRead);
btnRead.MouseUpEventHandler += (sender, e) =>
- {
+ {
barColorTemplatrue.Progress = 65;
- barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");
- frameBack.Close();
- };
+ light.Attr_CCT.curValue = barColorTemplatrue.Progress * 100;
+ barColorTemplatrue.SetCustomText(light.Attr_CCT.curValue + "K");
+ frameBack.Close();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
+ btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/ReadIconOn.png";
+ };
+ btnCozy.IsSelected = false;
+ btnCozyIcon.IsSelected = false;
+ btnMeet.IsSelected = false;
+ btnMeetIcon.IsSelected = false;
+ btnRead.IsSelected = false;
+ btnReadIcon.IsSelected = false;
+ if (light.Attr_CCT.curValue.ToString() == "2700")
+ {
+ btnCozy.IsSelected = true;
+ btnCozyIcon.IsSelected = true;
+ }
+ if (light.Attr_CCT.curValue.ToString() == "3000")
+ {
+ btnMeet.IsSelected = true;
+ btnMeetIcon.IsSelected = true;
+ }
+ if (light.Attr_CCT.curValue.ToString() == "6500")
+ {
+ btnRead.IsSelected = true;
+ btnReadIcon.IsSelected = true;
+ }
}
/// <summary>
--
Gitblit v1.8.0