From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 194 ++++++++++++++++++++++++++++++++----------------
1 files changed, 128 insertions(+), 66 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 8a2c4e9..32ef478 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -14,55 +14,72 @@
/// 鏇存柊鍔熻兘鐘舵��
/// </summary>
/// <param name="updataFunction"></param>
- public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView)
+ public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
{
- try
+ Application.RunOnMainThread((Action)(() =>
{
- Application.RunOnMainThread(() =>
+ try
{
- if (view == null || scrolView == null)
+ if (view == null || scrolView == null || updataFunction == null)
{
return;
}
- switch (updataFunction.functionCategory)
+ if (!scrolView.ScrollEnabled)
{
- case FunctionType.Light:
- var uLight = updataFunction as Light;
- for (int i = 0; i < scrolView.ChildrenCount; i++)
+ return;
+ }
+ if (room != null)
+ {
+ if (!updataFunction.roomIds.Contains(room.roomId))
+ {
+ return;
+ }
+ }
+ 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 (scrolView.GetChildren(i).Tag != null && viewTag == updataFunction.spk + updataFunction.sid)
+ {
+ //if ( && scrolView.GetChildren(i).Tag.ToString() == updataFunction.sid)
{
- 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.Spk_Prefix)
{
- 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();
- if (cTag == updataFunction.functionType + "_Switch_" + updataFunction.sid)
+ case FunctionCategory.Light:
+ case FunctionCategory.AC:
+ case FunctionCategory.FloorHeat:
+ case FunctionCategory.Electric:
+ case FunctionCategory.AirFresh:
+ #region 鎸夐挳鐘舵�佹洿鏂�
+ if (cTag == updataFunction.sid + "_Switch")
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uLight.on_off == 1;
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
MainPage.Log($"{this.GetType()} error 0 : {ex.Message}");
}
}
- else if (cTag == updataFunction.functionType + "_DimmerBar_" + updataFunction.sid)
+ #endregion
+ #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
+ else if (cTag == updataFunction.sid + "_DimmerBar")
{
try
{
- if (uLight.on_off == 1)
+ (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
@@ -75,49 +92,94 @@
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}");
+ }
+ }
+ break;
+ #endregion
+ case FunctionCategory.Curtain:
+ #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
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = false;
+ }
+ }
+ else
+ {
+ if (cTag == updataFunction.sid + "_on")
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = true;
+ }
+ catch { }
+ }
+ else
+ {
+ (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)
+ {
+ try
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
+ }
+ }
+ #endregion
+ break;
}
}
}
- break;
+ }
}
- });
- }
- catch (Exception ex)
- {
- MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
- }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
+ }
+ }));
}
-
-
-
- //public static void UpdataLightStates(Light uLight)
- //{
- // Application.RunOnMainThread(() =>
- // {
- // if (bodyDiv == null)
- // return;
- // if(uLight.sid == function.sid&& uLight.functionType == function.functionType)
- // {
- // for (int i = 0; i < bodyDiv.ChildrenCount; i++)
- // {
- // var c1 = bodyDiv.GetChildren(i);
- // if (c1.Tag != null && c1.Tag.ToString() == "")
- // {
- // if (c1.Tag.ToString() == function.functionType + "_Switch_" + function.sid)
- // {
- // var btn = c1 as Button;
- // btn.IsSelected = uLight.on_off == 1;
- // }
- // else if (c1.Tag.ToString() == function.functionType + "_DimmerBar_" + function.sid)
- // {
- // var bar = c1 as DiyImageSeekBar;
- // bar.ProgressBarColor = uLight.on_off == 1 ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- // }
- // }
- // }
- // }
- // });
- //}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0