From 1d1cad99a27c9f644c84eb3d376c70bd30a55879 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 三月 2021 18:02:13 +0800
Subject: [PATCH] 2021-3-10-1
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 584052a..b86e4c5 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -16,7 +16,7 @@
/// <param name="updataFunction"></param>
public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
@@ -53,10 +53,12 @@
if (fcView.GetChildren(j).Tag == null)
continue;
var cTag = fcView.GetChildren(j).Tag.ToString();
- switch (updataFunction.functionCategory)
+ switch (updataFunction.Spk_Prefix)
{
case FunctionCategory.Light:
- case FunctionCategory.Thermostat:
+ case FunctionCategory.AC:
+ case FunctionCategory.FloorHeat:
+ case FunctionCategory.Electric:
#region 鎸夐挳鐘舵�佹洿鏂�
if (cTag == updataFunction.sid + "_Switch")
{
@@ -75,14 +77,13 @@
{
try
{
+ (fcView.GetChildren(j) as DiyImageSeekBar).Progress = Convert.ToInt32(updataFunction.GetAttrState(FunctionAttributeKey.Brightness));
if (updataFunction.trait_on_off.curValue.ToString() == "on")
{
- (fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
(fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
}
else
{
- (fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
(fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.PromptingColor2;
}
}
@@ -93,7 +94,7 @@
}
#endregion
#region 鍔熻兘鐘舵�佷俊鎭洿鏂�
- else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
+ else if (cTag == updataFunction.spk + "_laststates_" + updataFunction.sid)
{
try
{
@@ -109,10 +110,14 @@
#endregion
case FunctionCategory.Curtain:
#region 绐楀笜鏇存柊
- var uCurtain = updataFunction as Curtain;
- switch (uCurtain.trait_on_off.curValue.ToString())
+ //var uCurtain = updataFunction as Curtain;
+ var percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
+ if (percentString != null)
{
- case "off":
+ int percent = 0;
+ int.TryParse(percentString, out percent);
+ if (percent == 0)
+ {
if (cTag == updataFunction.sid + "_off")
{
try
@@ -125,8 +130,9 @@
{
(fcView.GetChildren(j) as Button).IsSelected = false;
}
- break;
- case "on":
+ }
+ else
+ {
if (cTag == updataFunction.sid + "_on")
{
try
@@ -139,28 +145,14 @@
{
(fcView.GetChildren(j) as Button).IsSelected = false;
}
- break;
- case "stop":
- if (cTag == updataFunction.sid + "_stop")
- {
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
- }
- else
- {
- (fcView.GetChildren(j) as Button).IsSelected = false;
- }
- break;
+ }
}
#endregion
break;
case FunctionCategory.Music:
#region 闊充箰鏇存柊
var uMusic = updataFunction as Music.A31MusicModel;
- if (cTag == updataFunction.functionType + "_State_" + updataFunction.sid)
+ if (cTag == updataFunction.spk + "_State_" + updataFunction.sid)
{
try
{
@@ -183,7 +175,7 @@
{
MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
}
- });
+ }));
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0