From ac8660d2dd439e8074c1760cbe6cc9465a452193 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 17:50:17 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 3aff8a7..ad7b605 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -81,7 +81,7 @@
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
var d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.FadeTime, e.ToString());
- Control.Ins.SendWriteCommand(function, d);
+ //Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
@@ -92,7 +92,7 @@
/// </summary>
void LoadEvet_ChangeColorTemplatrue()
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
@@ -148,7 +148,7 @@
{
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
@@ -226,7 +226,7 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
--
Gitblit v1.8.0