From 301d3f15ba03ff942c029bd4c0b1ff544f7cfede Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 30 十二月 2020 11:19:48 +0800
Subject: [PATCH] 2020-12-30 1.解决RGB灯，色盘ColorPicker部分安卓手机，刷新图片时会变小问题
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 0d7de11..2395fba 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -19,13 +19,16 @@
return;
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
-
+
if (uFunction.trait_on_off.curValue.ToString() == "on")
{
- bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
+ //瑙ｅ喅閮ㄥ垎瀹夊崜鎵嬫満锛屽埛鏂板浘鐗囨椂浼氬彉灏忛棶棰�
+ if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheel.png")
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
+ }
bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
bodyView.btnSwitch.IsSelected = true;
- bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
if (!bodyView.onDimmerBar)
{
bodyView.dimmerBar.Progress = uFunction.brightness;
@@ -34,12 +37,18 @@
//鐘舵�佷竴鏍锋椂,涓嶅啀鍒锋柊瑙嗗浘
else if (uFunction.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
{
- bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
+ //瑙ｅ喅閮ㄥ垎瀹夊崜鎵嬫満锛屽埛鏂板浘鐗囨椂浼氬彉灏忛棶棰�
+ if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
+ }
+ //bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
bodyView.btnSwitch.IsSelected = false;
//鑹茬洏鐨勫渾鐐归殣钘�
bodyView.btnWhiteRound.Visible = false;
}
+ bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
}
}
catch (Exception ex)
@@ -198,7 +207,7 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
light.fadeTime = barFadeTime.Progress;
- light.SaveFunctionData(true);
+ light.UpdataFuncitonInfo();
};
}
/// <summary>
@@ -246,6 +255,7 @@
{
return;
}
+ btnWhiteRound.Visible = true;
btnWhiteRound.Gravity = Gravity.Center;
light.SetRGBcolor(new byte[] { 255, 255, 255 });
--
Gitblit v1.8.0