From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 0e8f778..89f04ba 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -214,9 +214,12 @@
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIds.Contains(room.roomId))
+ if (m.functionMusic.roomIds.Contains(room.roomId))
{
- Music.SendMethod.Pause(m);
+ m.functionMusic.SetAttrState("on_off", "off");
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ dic.Add("on_off", "off");
+ Music.SendMethod.Current.SendControlCommand(m.functionMusic, dic);
}
}
})
@@ -228,6 +231,10 @@
};
foreach (var f in room.GetRoomFunctions(false))
{
+ //if(f.spk == SPK.OtherCommon)
+ //{
+ // continue;
+ //}
if (f.trait_on_off.curValue.ToString() == "on")
{
btn.Visible = true;
@@ -382,12 +389,30 @@
System.Threading.Thread.Sleep(sleepTime);
}
break;
+ case ShowFunction.MechanicalArm:
+ foreach (var f in FunctionList.List.GetMechanicalArmList())
+ {
+ f.trait_on_off.curValue = onoff;
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(f, d);
+ System.Threading.Thread.Sleep(sleepTime);
+ }
+ break;
}
}
else
{
switch (functionCategory)
{
+ case ShowFunction.FreshAir:
+ List<Function> faList = new List<Function>();
+ foreach (var f in FunctionList.List.GetAirFreshList())
+ {
+ faList.Add(f);
+ }
+ Control.Ins.SwtichFunctions(onoff == "on", faList);
+ break;
case ShowFunction.AC:
List<Function> acList = new List<Function>();
foreach(var f in FunctionList.List.GetAcList())
@@ -420,6 +445,14 @@
}
Control.Ins.SwtichFunctions(onoff == "on", eleList);
break;
+ case ShowFunction.MechanicalArm:
+ List<Function> meArmList = new List<Function>();
+ foreach (var f in FunctionList.List.GetMechanicalArmList())
+ {
+ meArmList.Add(f);
+ }
+ Control.Ins.SwtichFunctions(onoff == "on", meArmList);
+ break;
}
@@ -427,7 +460,7 @@
}
catch (Exception ex)
{
- MainPage.Log($"{functionCategory}鍏ㄥ紑鍏ㄥ叧澶辫触:{ex.Message}");
+ MainPage.Log("Error", $"{functionCategory}鍏ㄥ紑鍏ㄥ叧澶辫触:{ex.Message}");
}
finally
{
--
Gitblit v1.8.0