From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 023c828..046ed07 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -88,16 +88,16 @@
/// </summary>
void LoadColorChangeEvent()
{
- //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;
+ }
DateTime colorChangeTime = DateTime.MinValue;
//bool send = false;
@@ -233,7 +233,7 @@
Control.Ins.SendWriteCommand(function, d);
};
- //if (function.online)
+ if (function.online)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -330,10 +330,10 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- //if (!function.online)
- //{
- // return;
- //}
+ if (!function.online)
+ {
+ return;
+ }
if(function.trait_on_off.curValue.ToString() == "off")
{
return;
--
Gitblit v1.8.0