From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 3d80e11..531d926 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -85,7 +85,9 @@
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
if(fadeTime!= null)
{
- d.Add(FunctionAttributeKey.FadeTime, fadeTime.curValue.ToString());
+ int result = 0;
+ int.TryParse(fadeTime.curValue.ToString(), out result);
+ d.Add(FunctionAttributeKey.FadeTime, result.ToString());
}
Control.Ins.SendWriteCommand(function, d);
})
@@ -104,7 +106,7 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- if (function.functionCategory == FunctionCategory.Light)
+ if (function.Spk_Prefix == FunctionCategory.Light)
{
var light = function as Light;
light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
@@ -123,7 +125,7 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
+ if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
var light = function as Light;
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
--
Gitblit v1.8.0