From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 108 ++++++++++++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 9366529..265043e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -877,62 +877,58 @@
};
view.AddChidren(btnSwitch);
-
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
-
- //switch (function.Spk_Prefix)
- //{
- // //todo 澧炲姞璁惧锛屼富椤垫敹钘忓浘鏍�
- // case FunctionCategory.Light:
- // #region 鐏厜 Light
- // btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
- // btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
- // UpdataFunctionStates(function);
- // #endregion
- // break;
- // case FunctionCategory.AC:
- // #region 绌鸿皟 AC
- // btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
- // btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
- // #endregion
- // break;
- // case FunctionCategory.FloorHeat:
- // #region 鍦扮儹
- // btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
- // btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
- // #endregion
- // break;
- // case FunctionCategory.Electric:
- // switch (function.spk)
- // {
- // case SPK.ElectricSocket:
- // btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
- // btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
- // break;
- // case SPK.ElectricFan:
- // 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;
- //}
+ switch (function.Spk_Prefix)
+ {
+ //todo 澧炲姞璁惧锛屼富椤垫敹钘忓浘鏍�
+ case FunctionCategory.Light:
+ #region 鐏厜 Light
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
+ UpdataFunctionStates(function);
+ #endregion
+ break;
+ case FunctionCategory.AC:
+ #region 绌鸿皟 AC
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
+ #endregion
+ break;
+ case FunctionCategory.FloorHeat:
+ #region 鍦扮儹
+ btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
+ #endregion
+ break;
+ case FunctionCategory.Electric:
+ switch (function.spk)
+ {
+ case SPK.ElectricSocket:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
+ break;
+ case SPK.ElectricFan:
+ 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;
+ }
LoadEvent_SwitchFunction(function, btnSwitch);
}
//鍙栨秷鏀惰棌浜嬩欢
--
Gitblit v1.8.0