From c8dfa6df784741900a4c06918929d3db3c876234 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 七月 2021 10:40:56 +0800
Subject: [PATCH] Merge branch 'hxb-test' into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 6fd4bf0..1bb8d06 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -37,7 +37,8 @@
#endregion
#region 鍖哄煙鍙橀噺
- Light light;
+ Light lightTemp = new Light();
+ Function function;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -47,10 +48,10 @@
Action actionRefresh;
#endregion
- public RelayPage(Light func)
+ public RelayPage(Function func)
{
bodyView = this;
- light = func;
+ function = func;
}
/// <summary>
@@ -74,7 +75,7 @@
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), function);
controlView = new FrameLayout()
{
@@ -95,7 +96,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = light.name,
+ Text = function.name,
};
controlView.AddChidren(btnFunctionName);
@@ -108,7 +109,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = light.GetRoomListName()
+ Text = function.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -120,38 +121,47 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = light.collection
+ IsSelected = function.collect
};
controlView.AddChidren(btnCollection);
-
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
+
btnSwitchIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(102),
Width = Application.GetRealWidth(168),
- Height = Application.GetRealHeight(288),
+ Height = Application.GetRealWidth(288),
UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
- IsSelected = light.trait_on_off.curValue.ToString() == "on"
+ IsSelected = function.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitchIcon);
btnSwitch = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Y = Application.GetRealHeight(466),// + btnSwitchIcon.Bottom,
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.trait_on_off.curValue.ToString() == "on"
+ IsSelected = function.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
-
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(function, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(function);
+ })
+ { IsBackground = true }.Start();
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0