From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPage.cs | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPage.cs
index f446425..2cf2c04 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPage.cs
@@ -213,7 +213,7 @@
switch (function.functionType)
{
case FunctionType.AC:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
break;
case FunctionType.FloorHeating:
btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
@@ -225,6 +225,31 @@
break;
case FunctionCategory.Light:
btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
+ break;
+ case FunctionCategory.SwitchDevice:
+ switch (function.functionType)
+ {
+ case FunctionType.Socket:
+ btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
+ break;
+ }
+ break;
+ case FunctionCategory.Electrical:
+ switch (function.functionType)
+ {
+ case FunctionType.Fan:
+ btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
+ break;
+ case FunctionType.TV:
+ btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
+ break;
+ }
+ break;
+ case FunctionCategory.Scene:
+ btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
+ break;
+ case FunctionCategory.Music:
+ btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
break;
}
@@ -267,7 +292,6 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
};
functionRow.AddChidren(btnFunctionFloorName);
-
}
Button btnChooseIcon = new Button()
@@ -276,8 +300,8 @@
X = Application.GetRealWidth(335),
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
- SelectedImagePath = "Public/SelectionIcon.png",
- UnSelectedImagePath = "Public/UnSelectionIcon.png",
+ UnSelectedImagePath = "Public/ChooseIcon.png",
+ SelectedImagePath = "Public/ChooseOnIcon.png",
IsSelected = function.roomIdList.Contains(room.sid)
};
functionRow.AddChidren(btnChooseIcon);
@@ -293,7 +317,6 @@
{
functionListView.Height = Application.GetRealHeight(518 - 40 - 62);
}
-
}
/// <summary>
--
Gitblit v1.8.0