From 2f3a162c3960bedc86081af9823b1683db27bb63 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 29 三月 2021 09:10:43 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index c8b1509..96c0b3b 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -132,7 +132,6 @@
switch (function.Spk_Prefix)
{
case FunctionCategory.Curtain:
-
CurtainFragment();
break;
case FunctionCategory.Sensor:
@@ -332,7 +331,7 @@
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
MaxValue = 100,
- Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.BatteryState)),
+ Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness)),
Tag = function.sid + "_DimmerBar",
SeekBarPadding = Application.GetRealWidth(20),
};
--
Gitblit v1.8.0