From 4820da229822687e472b9d5abb2a09093a877a3a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 24 九月 2021 13:27:49 +0800
Subject: [PATCH] 更新spk
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 32ef478..5a6a5d3 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -52,123 +52,123 @@
if (fcView.GetChildren(j).Tag == null)
continue;
var cTag = fcView.GetChildren(j).Tag.ToString();
- switch (updataFunction.Spk_Prefix)
+ if (SPK.LightSpkList().Contains(updataFunction.spk) ||
+ SPK.AcSpkList().Contains(updataFunction.spk) ||
+ SPK.FhSpkList().Contains(updataFunction.spk) ||
+ SPK.ElectricalSpkList().Contains(updataFunction.spk) ||
+ SPK.AirFreshSpkList().Contains(updataFunction.spk))
{
- case FunctionCategory.Light:
- case FunctionCategory.AC:
- case FunctionCategory.FloorHeat:
- case FunctionCategory.Electric:
- case FunctionCategory.AirFresh:
- #region 鎸夐挳鐘舵�佹洿鏂�
- if (cTag == updataFunction.sid + "_Switch")
+ #region 鎸夐挳鐘舵�佹洿鏂�
+ if (cTag == updataFunction.sid + "_Switch")
+ {
+ try
{
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
- }
- catch (Exception ex)
- {
- MainPage.Log($"{this.GetType()} error 0 : {ex.Message}");
- }
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
}
- #endregion
- #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
- else if (cTag == updataFunction.sid + "_DimmerBar")
+ catch (Exception ex)
{
- 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).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
- }
- else
- {
- (fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.PromptingColor2;
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"{this.GetType()} error 1 : {ex.Message}");
- }
+ MainPage.Log($"{this.GetType()} error 0 : {ex.Message}");
}
- #endregion
- #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
- else if (cTag == updataFunction.spk + "_laststates_" + updataFunction.sid)
- {
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "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 onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
- if (onoffString == "stop")
+ #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
+ else if (cTag == updataFunction.sid + "_DimmerBar")
+ {
+ try
{
- return;
- }
- var percent = onoffString == "off" ? 0 : 100;
- if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
- {
- string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
- int.TryParse(percentString, out percent);
- }
- if (percent == 0)
- {
- if (cTag == updataFunction.sid + "_off")
+ (fcView.GetChildren(j) as DiyImageSeekBar).Progress = Convert.ToInt32(updataFunction.GetAttrState(FunctionAttributeKey.Brightness));
+ if (updataFunction.trait_on_off.curValue.ToString() == "on")
{
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
+ (fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
}
else
{
- (fcView.GetChildren(j) as Button).IsSelected = false;
+ (fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.PromptingColor2;
}
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 1 : {ex.Message}");
+ }
+ }
+ #endregion
+ #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
+ else if (cTag == updataFunction.spk + "_laststates_" + updataFunction.sid)
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
+ (fcView.GetChildren(j) as Button).Text = updataFunction.lastState;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 2 : {ex.Message}");
+ }
+ }
+ #endregion
+ }
+ else if (SPK.CurtainSpkList().Contains(updataFunction.spk))
+ {
+ #region 绐楀笜鏇存柊
+ var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
+ if (onoffString == "stop")
+ {
+ return;
+ }
+ var percent = onoffString == "off" ? 0 : 100;
+ if (updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
+ {
+ string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
+ int.TryParse(percentString, out percent);
+ }
+ if (percent == 0)
+ {
+ if (cTag == updataFunction.sid + "_off")
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = true;
+ }
+ catch { }
}
else
{
- if (cTag == updataFunction.sid + "_on")
- {
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
- }
- else
- {
- (fcView.GetChildren(j) as Button).IsSelected = false;
- }
+ (fcView.GetChildren(j) as Button).IsSelected = false;
}
- #endregion
- break;
- case FunctionCategory.Music:
- #region 闊充箰鏇存柊
- var uMusic = updataFunction as Music.A31MusicModel;
- if (cTag == updataFunction.spk + "_State_" + updataFunction.sid)
+ }
+ else
+ {
+ if (cTag == updataFunction.sid + "_on")
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
+ (fcView.GetChildren(j) as Button).IsSelected = true;
}
- catch (Exception ex)
- {
- MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
- }
+ catch { }
}
- #endregion
- break;
+ else
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = false;
+ }
+ }
+ #endregion
+ }
+ else if (SPK.MusicSpkList().Contains(updataFunction.spk))
+ {
+ #region 闊充箰鏇存柊
+ var uMusic = updataFunction as Music.A31MusicModel;
+ if (cTag == updataFunction.spk + "_State_" + updataFunction.sid)
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
+ }
+ }
+ #endregion
}
}
}
--
Gitblit v1.8.0