From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 9fe1775..401e002 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -9,7 +9,7 @@
{
#region 鎺т欢闆嗗悎
- FrameLayout bodyView;
+ static RelayPage bodyView;
/// <summary>
/// 鎺у埗鐣岄潰鍔犺浇鍖哄煙
/// </summary>
@@ -38,18 +38,43 @@
#region 鍖哄煙鍙橀噺
Light light;
+ Button btnCollection_Out;
+ Button btnFunctionName_Out;
+ Button btnFromFloor_Out;
+ /// <summary>
+ /// 鍒锋柊鏄剧ず淇℃伅
+ /// </summary>
+ Action actionRefresh;
#endregion
public RelayPage(Light func)
{
bodyView = this;
light = func;
- }
- public void LoadPage()
+ }
+ /// <summary>
+ /// 鍔犺浇鐣岄潰
+ /// </summary>
+ /// <param name="btnCollectionIcon">鏀惰棌鎸夐挳</param>
+ /// <param name="btnFunctionName">鍔熻兘鍚嶇О淇℃伅鎸夐挳</param>
+ /// <param name="btnFromFloor">鍔熻兘妤煎眰淇℃伅鎸夐挳</param>
+ public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
{
+ if (btnCollectionIcon == null)
+ {
+ btnCollection_Out = new Button();
+ btnFunctionName_Out = new Button();
+ btnFromFloor_Out = new Button();
+ }
+ else
+ {
+ btnCollection_Out = btnCollectionIcon;
+ btnFunctionName_Out = btnFunctionNameOut;
+ btnFromFloor_Out = btnFromFloorOut;
+ }
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Lights), light);
+ //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Lights), light);
controlView = new FrameLayout()
{
@@ -105,9 +130,9 @@
Y = Application.GetRealHeight(102),
Width = Application.GetRealWidth(168),
Height = Application.GetRealHeight(288),
- UnSelectedImagePath = "FunctionIcon/Light/RelayCloseIcon.png",
- SelectedImagePath = "FunctionIcon/Light/RelayOpenIcon.png",
- IsSelected = light.state != 0
+ UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
+ SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
+ IsSelected = light.trait_on_off.value.ToString() == "on"
};
controlView.AddChidren(btnSwitchIcon);
@@ -119,12 +144,13 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.state != 0
+ IsSelected = light.trait_on_off.value.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
}
}
--
Gitblit v1.8.0