From fb49279fd0e36e1ed2bd7332eecee9f963c13649 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 20 十二月 2020 19:33:29 +0800
Subject: [PATCH] 20201220-1
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index e1f0b03..d2180e5 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -16,26 +16,26 @@
/// <param name="updataFunction"></param>
public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView,Room room=null)
{
- try
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
+
+ try
{
- if (view == null || scrolView == null)
+ if (view == null || scrolView == null || updataFunction == null)
{
return;
}
- if(!scrolView.ScrollEnabled)
+ if (!scrolView.ScrollEnabled)
{
return;
}
if (room != null)
{
- if (!updataFunction.roomIdList.Contains(room.sid))
+ if (!updataFunction.roomIds.Contains(room.roomId))
{
return;
}
}
- //if(updataFunction.roomIdList.Contains(Room))
for (int i = 0; i < scrolView.ChildrenCount; i++)
{
if (scrolView.GetChildren(i).Tag == null || scrolView.GetChildren(i).Tag.ToString() == "")
@@ -57,25 +57,25 @@
{
case FunctionCategory.Light:
case FunctionCategory.Thermostat:
- #region 鎸夐挳鐘舵�佹洿鏂�
- if (cTag == updataFunction.sid + "_Switch")
+ #region 鎸夐挳鐘舵�佹洿鏂�
+ if (cTag == updataFunction.sid + "_Switch")
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.value.ToString() == "on";
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
MainPage.Log($"{this.GetType()} error 0 : {ex.Message}");
}
}
- #endregion
- #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
- else if (cTag == updataFunction.sid + "_DimmerBar")
+ #endregion
+ #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
+ else if (cTag == updataFunction.sid + "_DimmerBar")
{
try
{
- if (updataFunction.trait_on_off.value.ToString() == "on")
+ 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;
@@ -91,13 +91,13 @@
MainPage.Log($"{this.GetType()} error 1 : {ex.Message}");
}
}
- #endregion
- #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
- else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
+ #endregion
+ #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
+ else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.value.ToString() == "on";
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
(fcView.GetChildren(j) as Button).Text = updataFunction.lastState;
}
catch (Exception ex)
@@ -108,13 +108,13 @@
break;
#endregion
case FunctionCategory.Curtain:
- #region 绐楀笜鏇存柊
- var uCurtain = updataFunction as Curtain;
+ #region 绐楀笜鏇存柊
+ var uCurtain = updataFunction as Curtain;
if (cTag == updataFunction.functionType + "_off_" + updataFunction.sid)
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.value.ToString() == "off";
+ (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "off";
}
catch (Exception ex)
{
@@ -125,43 +125,42 @@
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.value.ToString() == "on";
+ (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
MainPage.Log($"{this.GetType()} error 4 : {ex.Message}");
}
}
- #endregion
- break;
+ #endregion
+ break;
case FunctionCategory.Music:
- #region 闊充箰鏇存柊
- var uMusic = updataFunction as Music.A31MusicModel;
+ #region 闊充箰鏇存柊
+ var uMusic = updataFunction as Music.A31MusicModel;
if (cTag == updataFunction.functionType + "_State_" + updataFunction.sid)
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play" ;
+ (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
}
catch (Exception ex)
{
MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
}
}
- #endregion
- break;
+ #endregion
+ break;
}
}
}
}
}
- });
- }
- catch (Exception ex)
- {
- MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
- }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
+ }
+ });
}
-
- }
+ }
}
--
Gitblit v1.8.0