From 002a3f2e9d2f9579c01f88af12bd8a320003569f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 三月 2020 08:57:19 +0800
Subject: [PATCH] 20200331
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 8a2c4e9..47e5eb8 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -24,43 +24,46 @@
{
return;
}
- switch (updataFunction.functionCategory)
+ for (int i = 0; i < scrolView.ChildrenCount; i++)
{
- case FunctionType.Light:
- var uLight = updataFunction as Light;
- for (int i = 0; i < scrolView.ChildrenCount; i++)
+ if (scrolView.GetChildren(i).Tag == null || scrolView.GetChildren(i).Tag.ToString() == "")
+ {
+ continue;
+ }
+ var viewTag = scrolView.GetChildren(i).Tag.ToString();
+ if (viewTag == updataFunction.functionCategory.ToString() + "-" + updataFunction.functionType + "-" + updataFunction.sid)
+ {
+ if (scrolView.GetChildren(i).GetType().Name == "FunctionControlZone")
{
- if (scrolView.GetChildren(i).Tag == null || scrolView.GetChildren(i).Tag.ToString() == "")
+ var fcView = scrolView.GetChildren(i) as FrameLayout;
+ for (int j = 0; j < fcView.ChildrenCount; j++)
{
- continue;
- }
- var viewTag = scrolView.GetChildren(i).Tag.ToString();
- if (viewTag == updataFunction.functionCategory.ToString() + "-" + updataFunction.functionType + "-" + updataFunction.sid)
- {
- if (scrolView.GetChildren(i).GetType().Name == "FunctionControlZone")
+ if (fcView.GetChildren(j).Tag == null)
+ continue;
+ var cTag = fcView.GetChildren(j).Tag.ToString();
+ switch (updataFunction.functionCategory)
{
- var fcView = scrolView.GetChildren(i) as FrameLayout;
- for (int j = 0; j < fcView.ChildrenCount; j++)
- {
- if (fcView.GetChildren(j).Tag == null)
- continue;
- var cTag = fcView.GetChildren(j).Tag.ToString();
+ case FunctionCategory.Light:
+ case FunctionCategory.AC:
+ #region 鎸夐挳鐘舵�佹洿鏂�
if (cTag == updataFunction.functionType + "_Switch_" + updataFunction.sid)
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uLight.on_off == 1;
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.on_off == "on";
}
catch (Exception ex)
{
MainPage.Log($"{this.GetType()} error 0 : {ex.Message}");
}
}
+ #endregion
+ #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
else if (cTag == updataFunction.functionType + "_DimmerBar_" + updataFunction.sid)
{
try
{
- if (uLight.on_off == 1)
+ if (updataFunction.on_off == "on")
{
(fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
(fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
@@ -75,11 +78,53 @@
MainPage.Log($"{this.GetType()} error 1 : {ex.Message}");
}
}
- }
+ #endregion
+ #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
+ else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.on_off == "on";
+ (fcView.GetChildren(j) as Button).Text = updataFunction.lastState;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 2 : {ex.Message}");
+ }
+ }
+ break;
+ #endregion
+ case FunctionCategory.Curtain:
+ #region 绐楀笜鏇存柊
+ var uCurtain = updataFunction as Curtain;
+ if (cTag == updataFunction.functionType + "_off_" + updataFunction.sid)
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = uCurtain.on_off == "off";
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
+ }
+ }
+ else
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = uCurtain.on_off == "on";
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 4 : {ex.Message}");
+ }
+ }
+ #endregion
+ break;
}
}
}
- break;
+ }
}
});
}
--
Gitblit v1.8.0