From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
old mode 100644
new mode 100755
index 61768ae..4829203
--- 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);
@@ -111,20 +120,24 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = light.collection
+ IsSelected = light.collect
};
- controlView.AddChidren(btnCollection);
-
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
+
btnSwitchIcon = new Button()
{
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),
- IsSelected = light.state != 0
+ UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
+ SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
+ IsSelected = light.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitchIcon);
@@ -136,14 +149,18 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.state != 0
+ IsSelected = light.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView(light, actionRefresh);
-
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(light);
+ })
+ { IsBackground = true }.Start();
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0