From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 101 +++++++++++++++++++++++++++++++-------------------
1 files changed, 62 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index d2180e5..d041894 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -14,7 +14,7 @@
/// 鏇存柊鍔熻兘鐘舵��
/// </summary>
/// <param name="updataFunction"></param>
- public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView,Room room=null)
+ public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
{
Application.RunOnMainThread(() =>
{
@@ -57,8 +57,8 @@
{
case FunctionCategory.Light:
case FunctionCategory.Thermostat:
- #region 鎸夐挳鐘舵�佹洿鏂�
- if (cTag == updataFunction.sid + "_Switch")
+ #region 鎸夐挳鐘舵�佹洿鏂�
+ if (cTag == updataFunction.sid + "_Switch")
{
try
{
@@ -69,9 +69,9 @@
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
{
@@ -91,9 +91,9 @@
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
{
@@ -106,37 +106,60 @@
}
}
break;
- #endregion
+ #endregion
case FunctionCategory.Curtain:
- #region 绐楀笜鏇存柊
- var uCurtain = updataFunction as Curtain;
- if (cTag == updataFunction.functionType + "_off_" + updataFunction.sid)
+ #region 绐楀笜鏇存柊
+ var uCurtain = updataFunction as Curtain;
+ switch (uCurtain.trait_on_off.curValue.ToString())
{
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "off";
- }
- catch (Exception ex)
- {
- MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
- }
+ case "off":
+ if (cTag == updataFunction.sid + "_off")
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = true;
+ }
+ catch { }
+ }
+ else
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = false;
+ }
+ break;
+ case "on":
+ if (cTag == updataFunction.sid + "_on")
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = true;
+ }
+ catch { }
+ }
+ else
+ {
+ (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;
}
- else
- {
- try
- {
- (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
@@ -148,8 +171,8 @@
MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
}
}
- #endregion
- break;
+ #endregion
+ break;
}
}
}
@@ -163,4 +186,4 @@
});
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0