From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 1f41dff..6b8f8af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -61,9 +61,18 @@
/// <param name="btnFromFloor">鍔熻兘妤煎眰淇℃伅鎸夐挳</param>
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
{
- btnCollection_Out = btnCollectionIcon;
- btnFunctionName_Out = btnFunctionNameOut;
- btnFromFloor_Out = 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);
@@ -119,11 +128,10 @@
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(102),
- Width = Application.GetRealWidth(168-40),
+ Width = Application.GetRealWidth(168),
Height = Application.GetRealHeight(288),
- BackgroundColor = CSS_Color.PromptingColor2,
- SelectedBackgroundColor= CSS_Color.AuxiliaryColor1,
- Radius = (uint)Application.GetRealWidth(40),
+ UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
+ SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
IsSelected = light.on_off == "on"
};
controlView.AddChidren(btnSwitchIcon);
--
Gitblit v1.8.0