From 223875b14fa1f87be66620c9903e5183f9b19c43 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 17:01:08 +0800
Subject: [PATCH] 2021-08-27 1.更新Android库，修改裁剪图片方案，支持大图裁剪
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 899c0aa..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>
@@ -139,7 +144,7 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
//{
@@ -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