From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 046ed07..3bc557a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -104,7 +104,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)
@@ -216,16 +216,16 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- //if (!function.online)
- //{
- // new Tip()
- // {
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- // }.Show(MainPage.BaseView);
- // return;
- //}
+ if (!function.online)
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ Direction = AMPopTipDirection.None,
+ }.Show(MainPage.BaseView);
+ return;
+ }
curDimmerStatus = false;
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -305,6 +305,8 @@
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());
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+
if (btnSwitch.IsSelected)
{
if(function.lastBrightness == 0)
--
Gitblit v1.8.0