From 16277f0b999eb1b2c6bbcf710be04cadaf2a07fa Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 12 三月 2021 15:20:21 +0800
Subject: [PATCH] 2021-03-12-2
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 918f406..265043e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -325,14 +325,15 @@
btnChangeFunction = new Button()
{
- Width = Application.GetRealWidth(114),
+ X = Application.GetRealWidth(10),
+ Width = Application.GetRealWidth(114-10),
TextID = StringId.Functions,
SelectedTextColor = CSS_Color.MainColor,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.HeadlineFontSize,
TextAlignment = TextAlignment.Center,
IsSelected = true,
- IsBold = true
+ IsBold = true,
};
changeView.AddChidren(btnChangeFunction);
@@ -349,7 +350,7 @@
btnChangeScene = new Button()
{
X = btnLine.Right,
- Width = Application.GetRealWidth(114),
+ Width = Application.GetRealWidth(114-10),
TextID = StringId.Scenes,
SelectedTextColor = CSS_Color.MainColor,
TextColor = CSS_Color.PromptingColor1,
@@ -458,7 +459,6 @@
/// </summary>
void LoadDeviceFunctionControlZone()
{
-
#region ContextView
deviceFunctionView.RemoveAll();
functionViews.Clear();
@@ -739,8 +739,8 @@
}
LoadEvent_FunctionCollection(btnCollection, function);
-
- if (function.Spk_Prefix == FunctionCategory.Curtain)
+ if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
+ function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
@@ -768,7 +768,7 @@
};
view.AddChidren(btnCurtainOpen);
- LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
+ LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
}
else if (function.spk == SPK.ElectricTV)
@@ -784,10 +784,10 @@
UnSelectedImagePath = "Public/PowerClose.png",
};
view.AddChidren(btnPower);
- LoadEvent_ControlTV(function as TV, btnPower);
+ LoadEvent_ControlTV(function, btnPower);
}
- else if (function.Spk_Prefix == FunctionCategory.Music)
+ else if (function.spk == SPK.MusicStandard)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
@@ -830,6 +830,39 @@
};
}
+ else if (function.spk == SPK.ClothesHanger)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerBlueIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Electrical/Curtain/ClothesHangerBlueIcon.png";
+ Button btnUp;
+ btnUp = new Button()
+ {
+ X = Application.GetRealWidth(84+3),
+ Y = Application.GetRealWidth(89),
+ Width = Application.GetRealWidth(38),
+ Height = Application.GetRealWidth(38),
+ UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon2.png",
+ SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon2On.png",
+ };
+ view.AddChidren(btnUp);
+
+ Button btnDown;
+ btnDown = new Button()
+ {
+ X = btnUp.Right + Application.GetRealWidth(3),
+ Y = Application.GetRealWidth(89),
+ Width = Application.GetRealWidth(38),
+ Height = Application.GetRealWidth(38),
+ UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon2.png",
+ SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon2On.png",
+ };
+ view.AddChidren(btnDown);
+
+
+ LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
+
+ }
+
else
{
Button btnSwitch;
@@ -846,11 +879,12 @@
switch (function.Spk_Prefix)
{
+ //todo 澧炲姞璁惧锛屼富椤垫敹钘忓浘鏍�
case FunctionCategory.Light:
#region 鐏厜 Light
btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
- UpdataFunctionStates(function as Light);
+ UpdataFunctionStates(function);
#endregion
break;
case FunctionCategory.AC:
@@ -876,6 +910,22 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
break;
+ case SPK.ElectricTuyaAirCleaner:
+ btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIcon.png";
+ btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIconOn.png";
+ break;
+ case SPK.ElectricTuyaFan:
+ btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/FanIcon.png";
+ btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/FanIconOn.png";
+ break;
+ case SPK.ElectricTuyaWaterValve:
+ btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIcon.png";
+ btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIconOn.png";
+ break;
+ case SPK.ElectricTuyaWeepRobot:
+ btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIcon.png";
+ btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIconOn.png";
+ break;
}
break;
}
@@ -897,6 +947,7 @@
function.CollectFunction();
};
+
var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
view.MouseUpEventHandler = skipControlPageEvent;
btnName.MouseUpEventHandler = skipControlPageEvent;
--
Gitblit v1.8.0