From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 72 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index d3b6c6a..bb83402 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -49,6 +50,11 @@
/// 鑹茬洏閲岄潰閭ｄ釜浼氭粦鍔ㄧ殑鐞�
/// </summary>
Button btnWhiteRound;
+ /// <summary>
+ /// 鐐僵寮�鍏虫寜閽�
+ /// </summary>
+ Button btnColorfulSwitch;
+
#endregion
#region 鍖哄煙鍙橀噺
@@ -228,7 +234,7 @@
dimmerBar = new DiyImageSeekBar()
{
X = Application.GetRealWidth(35 + 22),
- Y = Application.GetRealHeight(312 - magriHeight),
+ Y = Application.GetRealHeight(316 - magriHeight),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
SeekBarViewHeight = Application.GetRealHeight(8),
@@ -291,7 +297,7 @@
barFadeTime = new DiyImageSeekBar()
{
- X = btnGradualChangeMinValuesText.Right,
+ X = Application.GetRealWidth(35 + 22),
Y = Application.GetRealHeight(412 - 21-magriHeight),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
@@ -329,7 +335,7 @@
};
controlView.AddChidren(btnGradualChangeMaxValuesText);
#endregion
- heightMore = 70;
+ //heightMore += 70;
}
@@ -337,10 +343,11 @@
{
#region 鐐僵鍔熻兘
+
var btnGradualChangeText = new Button()
{
X = Application.GetRealWidth(35),
- Y = Application.GetRealHeight(375+ heightMore- magriHeight),
+ Y = Application.GetRealHeight(heightMore + magriHeight),
Width = Application.GetRealWidth(224),
Height = Application.GetRealHeight(21),
TextAlignment = TextAlignment.CenterLeft,
@@ -350,7 +357,7 @@
};
controlView.AddChidren(btnGradualChangeText);
- var btnGradualChangeMinValuesText = new Button()
+ var btnEditColorful = new Button()
{
X = Application.GetRealWidth(35),
Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
@@ -358,8 +365,8 @@
Height = Application.GetRealHeight(21),
UnSelectedImagePath = "Public/Edit.png",
};
- controlView.AddChidren(btnGradualChangeMinValuesText);
- btnGradualChangeMinValuesText.MouseUpEventHandler = (sender, e) => {
+ controlView.AddChidren(btnEditColorful);
+ btnEditColorful.MouseUpEventHandler = (sender, e) => {
var rgbView = new ColorfulInfoPage(function);
MainPage.BasePageView.AddChidren(rgbView);
rgbView.LoadPage();
@@ -368,23 +375,54 @@
var barColorful = new FrameLayout()
{
- X = btnGradualChangeMinValuesText.Right + Application.GetRealWidth(15),
- Y = Application.GetRealHeight(412 + heightMore-magriHeight),
+ X = btnEditColorful.Right + Application.GetRealWidth(15),
+ Y = Application.GetRealHeight(37 + heightMore + magriHeight),
Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(10),
- BackgroundImagePath = "FunctionIcon/Light/ColorWheel.png",
+ Height = Application.GetRealHeight(8),
+ BackgroundImagePath = "FunctionIcon/Light/ColorfulBar.png",
};
controlView.AddChidren(barColorful);
- var btnGradualChangeMaxValuesText = new Button()
+ btnColorfulSwitch = new Button()
{
- X = barFadeTime.Right,
+ X = barColorful.Right + Application.GetRealWidth(8),
Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
- Width = Application.GetRealWidth(35),
- Height = Application.GetRealHeight(21),
- UnSelectedImagePath = "Public/Switch.png"
+ Width = Application.GetRealWidth(38),
+ Height = Application.GetRealHeight(24),
+ UnSelectedImagePath = "Public/Switch.png",
+ SelectedImagePath = "Public/SwitchOn.png",
};
- controlView.AddChidren(btnGradualChangeMaxValuesText);
+ controlView.AddChidren(btnColorfulSwitch);
+
+ btnColorfulSwitch.MouseUpEventHandler = (sender, e) => {
+ btnColorfulSwitch.IsSelected = !btnColorfulSwitch.IsSelected;
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var controlColorfulState = btnColorfulSwitch.IsSelected ? "on" : "off";
+ function.SetAttrState(FunctionAttributeKey.Colorful, controlColorfulState);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Colorful, controlColorfulState);
+ if (controlColorfulState == "on")
+ {
+ var color = function.GetAttrState(FunctionAttributeKey.ColorfulBegin).Split(",");
+ var sendColorString = color[0] + "," + color[1] + "," + color[2];
+ d.Add(FunctionAttributeKey.ColorfulBegin, sendColorString);
+ color = function.GetAttrState(FunctionAttributeKey.ColorfulEnd).Split(",");
+ sendColorString = color[0] + "," + color[1] + "," + color[2];
+ d.Add(FunctionAttributeKey.ColorfulEnd, sendColorString);
+ d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
+ }
+ Control.Ins.SendWriteCommand(function, d);
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鎺у埗鐐僵寮�鍏冲紓甯�:{ex.Message}");
+ }
+ })
+ { IsBackground = true }.Start();
+ };
+
#endregion
--
Gitblit v1.8.0