From 62d6c4bf6c30da21ccd8245199234c5004117d56 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:32:15 +0800
Subject: [PATCH] V1.7.1发布版本
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 8835c07..987ec8e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1058,7 +1058,7 @@
if (//SPK.CurtainSpkList().Contains(function.spk))
function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
function.spk == SPK.CurtainDream ||
- function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
+ function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
@@ -1143,7 +1143,7 @@
btnPower.IsSelected = true;
status = "on";
}
- function.SetAttrState("on_off", status);
+ function.SetAttrState("on_off", status);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("on_off", status);
Music.SendMethod.Current.SendControlCommand(function, dic);
@@ -1157,7 +1157,7 @@
Button btnUp;
btnUp = new Button()
{
- X = Application.GetRealWidth(84+3),
+ X = Application.GetRealWidth(84 + 3),
Y = Application.GetRealWidth(89),
Width = Application.GetRealWidth(38),
Height = Application.GetRealWidth(38),
@@ -1182,7 +1182,7 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
}
-
+
else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
//btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
@@ -1207,8 +1207,13 @@
}
else if (function.spk == SPK.VideoDoorLock)
{
- btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
+ btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
//btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ }
+ else if (function.spk == SPK.GroupControl)
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
}
else
{
@@ -1223,16 +1228,8 @@
SelectedImagePath = "Public/SwitchOn.png",
};
view.AddChidren(btnSwitch);
- if (function.spk == SPK.GroupControl)
- {
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
- }
- else
- {
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
- }
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
LoadEvent_SwitchFunction(function, btnSwitch);
}
//鍙栨秷鏀惰棌浜嬩欢
--
Gitblit v1.8.0