From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index b910d3e..bcbc5c1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -58,6 +58,11 @@
Button btnFromFloor_Out;
bool onDimmerBar = false;
Function function;
+
+ /// <summary>
+ /// 鏈�鍚庢墦寮�鐨勯鑹�
+ /// </summary>
+ byte[] lastColor = new byte[3] { 255, 255, 255 };
/// <summary>
/// 鍒锋柊鏄剧ず淇℃伅
/// </summary>
@@ -163,12 +168,12 @@
{
colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
}
- colorPicker.MouseDownEventHandler = (sender, e) => {
- MainPage.BasePageView.ScrollEnabled = false;
- };
- colorPicker.MouseUpEventHandler = (sender, e) => {
- MainPage.BasePageView.ScrollEnabled = true;
- };
+ //colorPicker.MouseDownEventHandler = (sender, e) => {
+ // MainPage.BasePageView.ScrollEnabled = false;
+ //};
+ //colorPicker.MouseUpEventHandler = (sender, e) => {
+ // MainPage.BasePageView.ScrollEnabled = true;
+ //};
//鐧界偣鎺т欢
this.btnWhiteRound = new Button();
--
Gitblit v1.8.0