From a5ae6e497c9e1398220949e028d44fa15cb274c6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 11 九月 2023 14:17:24 +0800
Subject: [PATCH] 2023年09月11日14:15:05
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index b45f539..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()
{
@@ -104,7 +118,7 @@
//褰撳墠鐐瑰嚮鐨勩�愮偣銆戞槸鍚︽纭�
bool pointIsRight = false;
//鍦嗙殑鍗婂緞(鑰冭檻杈圭晫,闇�瑕佽缃畠鐨勫崐寰勬瘮杈冨皬涓�鐐�)
- int circleR = colorPicker.Width / 2 - Application.GetRealWidth(12);
+ int circleR = colorPicker.Width / 2 - Application.GetRealWidth(2);
colorPicker.ColorChaged += (sender2, e2) => {
if (function.trait_on_off.curValue.ToString() == "off" || pointIsRight == false)
@@ -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(() => {
@@ -216,7 +213,7 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
@@ -226,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) =>
{
@@ -286,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();
};
}
@@ -305,6 +317,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());
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+ }
if (btnSwitch.IsSelected)
{
if(function.lastBrightness == 0)
@@ -330,7 +346,7 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
return;
}
--
Gitblit v1.8.0