From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 3bc557a..2654e0b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -58,6 +58,20 @@
{
bodyView.btnCurColor.BorderColor = 0x00000000;
}
+ try
+ {
+ var colorfulState = updateTemp.GetAttribute(FunctionAttributeKey.Colorful);
+ if (colorfulState != null)
+ {
+ if(bodyView.btnColorfulSwitch!= null)
+ {
+ bodyView.btnColorfulSwitch.IsSelected = colorfulState.curValue.ToString() == "on";
+ }
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鏇存柊RGB 鐐僵寮�鍏崇姸鎬佸紓甯�:{ex.Message}");
+ }
}
}
catch (Exception ex)
@@ -148,24 +162,7 @@
{
//褰撻紶鏍囩偣涓嬩簨浠跺鐞�
colorPicker.MouseDownEventHandler(sender, e);
- //if (function.trait_on_off.curValue.ToString() == "off")
- //{
- // return;
- //}
- //pointIsRight = this.CheckPoint(circleR, colorPicker.Width / 2, colorPicker.Height / 2, (int)e.X, (int)e.Y);
- //if (pointIsRight == false)
- //{
- // //鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
- // return;
- //}
- ////鏄剧ず鐧界偣
- //btnWhiteRound.X = (int)e.X - btnWhiteRound.Width / 2;
- //btnWhiteRound.Y = (int)e.Y - btnWhiteRound.Height / 2;
- //if (btnWhiteRound.Visible == false)
- //{
- // btnWhiteRound.Visible = true;
- //}
- //btnCurColor.BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function));
+
};
var colorChangeEvent = new System.Threading.Thread(() => {
@@ -185,6 +182,7 @@
lightTemp.SetRGBcolor(lastColor, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
+ d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
Control.Ins.SendWriteCommand(function, d,false,0);
break;
}
@@ -286,6 +284,9 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
@@ -305,8 +306,10 @@
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
- d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
-
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+ }
if (btnSwitch.IsSelected)
{
if(function.lastBrightness == 0)
--
Gitblit v1.8.0