From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index e204a1e..7ea7a00 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>
@@ -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);
@@ -124,7 +133,7 @@
BackgroundColor = CSS_Color.PromptingColor2,
SelectedBackgroundColor= CSS_Color.AuxiliaryColor1,
Radius = (uint)Application.GetRealWidth(40),
- IsSelected = light.on_off != 0
+ IsSelected = light.on_off == "on"
};
controlView.AddChidren(btnSwitchIcon);
@@ -136,7 +145,7 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.on_off != 0
+ IsSelected = light.on_off == "on"
};
controlView.AddChidren(btnSwitch);
--
Gitblit v1.8.0