From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index d54d93e..124ed5f 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)
@@ -88,7 +102,7 @@
/// </summary>
void LoadColorChangeEvent()
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
@@ -168,7 +182,6 @@
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;
}
@@ -200,7 +213,7 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
@@ -210,14 +223,26 @@
}.Show(MainPage.BaseView);
return;
}
- curDimmerStatus = false;
+ if(dimmerBar.Progress==0|| dimmerBar.Progress == 100)
+ {
+ if (dimmerBar.Progress == 0)
+ {
+ //瑙ｅ喅閮ㄥ垎瀹夊崜鎵嬫満锛屽埛鏂板浘鐗囨椂浼氬彉灏忛棶棰�
+ if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
+ }
+ }
+ return;
+ }
+ onDimmerBar = curDimmerStatus = false;
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
Control.Ins.SendWriteCommand(function, d);
};
- if (function.online)
+ if (function.isOnline())
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -270,6 +295,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();
};
}
@@ -318,7 +346,7 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
return;
}
--
Gitblit v1.8.0