From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 23de300..6473187 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -60,20 +60,20 @@
}
LoadDiv();
- if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Music || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
+ if (function.Spk_Prefix == FunctionCategory.Curtain || function.Spk_Prefix == FunctionCategory.Music)//绐楀笜娌℃湁寮�鍏虫寜閽�
{
- switch (function.functionCategory)
+ switch (function.Spk_Prefix)
{
case FunctionCategory.Curtain:
- switch(function.functionType)
+ switch (function.spk)
{
- case FunctionType.Curtain:
+ case SPK.CurtainSwitch:
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
break;
- case FunctionType.MotorCurtain:
+ case SPK.CurtainTrietex:
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
break;
- case FunctionType.RollingShutter:
+ case SPK.CurtainRoller:
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
break;
}
@@ -93,7 +93,7 @@
/// 寮�鍏虫寜閽�
/// </summary>
Button btnSwitch;
- if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
+ if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
btnSwitch = new Button()
{
@@ -108,7 +108,7 @@
};
bodyDiv.AddChidren(btnSwitch);
//鍔犺浇寮�鍏虫寜閽簨浠�
- LoadEvent_SwitchFunction(btnSwitch,function.attributes.Find((obj)=> obj.key == FunctionAttributeKey.FadeTime ));
+ LoadEvent_SwitchFunction(btnSwitch, function.attributes.Find((obj) => obj.key == FunctionAttributeKey.FadeTime));
}
else
{
@@ -128,16 +128,21 @@
LoadEvent_SwitchFunction(btnSwitch);
}
- switch (function.functionCategory)
+ switch (function.Spk_Prefix)
{
- case FunctionCategory.Thermostat:
- switch (function.functionType)
+ case FunctionCategory.AC:
+ switch (function.spk)
{
- case FunctionType.AC:
+ case SPK.AcStandard:
btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
LoadLastStatesButton();
break;
- case FunctionType.FloorHeating:
+ }
+ break;
+ case FunctionCategory.FloorHeat:
+ switch (function.spk)
+ {
+ case SPK.FloorHeatStandard:
btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
LoadLastStatesButton();
break;
@@ -148,22 +153,16 @@
btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
LoadLightControl();
break;
- case FunctionCategory.SwitchDevice:
- switch (function.functionType)
+ case FunctionCategory.Electric:
+ switch (function.spk)
{
- case FunctionType.Socket:
+ case SPK.ElectricSocket:
btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
break;
- }
- btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
- break;
- case FunctionCategory.Electrical:
- switch (function.functionType)
- {
- case FunctionType.Fan:
+ case SPK.ElectricFan:
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
break;
- case FunctionType.TV:
+ case SPK.ElectricTV:
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
break;
}
@@ -173,10 +172,7 @@
#endregion
}
- if (function.functionCategory != FunctionCategory.Scene)
- {
- LoadEvent_DivSkipEvent();
- }
+ LoadEvent_DivSkipEvent();
LoadEvent_FunctionCollection();
}
@@ -243,10 +239,10 @@
/// </summary>
void LoadLightControl()
{
- switch (function.functionType)
+ switch (function.spk)
{
- case FunctionType.Dimmer:
- case FunctionType.RGB:
+ case SPK.LightDimming:
+ case SPK.LightRGB:
#region Dimmer
var btnDimmerMinValues = new Button()
{
@@ -373,7 +369,7 @@
UnSelectedImagePath = "MusicIcon/pause.png",
SelectedImagePath = "MusicIcon/play.png",
IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
- Tag = function.functionType + "_State_" + function.sid
+ Tag = function.spk + "_State_" + function.sid
};
bodyDiv.AddChidren(btnPlay);
@@ -397,6 +393,10 @@
/// </summary>
void LoadLastStatesButton()
{
+ if(function.spk == SPK.LightSwitch)
+ {
+ return;
+ }
var btnLastStates = new Button()
{
X = Application.GetRealWidth(10 + 32 + 8),
@@ -408,7 +408,7 @@
SelectedTextColor = CSS_Color.PromptingColor1,
TextColor = 0x00000000,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- Tag = function.functionType + "_laststates_" + function.sid,
+ Tag = function.spk + "_laststates_" + function.sid,
IsSelected = function.trait_on_off.curValue.ToString() == "on"
};
bodyDiv.AddChidren(btnLastStates);
--
Gitblit v1.8.0