From a7d20263f28aa009ef8e064a7f9700d7cd642492 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 10:06:47 +0800
Subject: [PATCH] 2020-06-10-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 2bf6de6..09580af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -9,7 +9,7 @@
{
#region 鎺т欢闆嗗悎
- FrameLayout bodyView;
+ static RollingShutterPage bodyView;
/// <summary>
/// 鍔熻兘鍚嶇О鎸夐挳
/// </summary>
@@ -22,6 +22,22 @@
/// 鏀惰棌鎸夐挳
/// </summary>
Button btnCollection;
+ /// <summary>
+ /// 绐楀笜鍔ㄦ�佹帶浠�
+ /// </summary>
+ CurtainSeekBar curtainSeekBar;
+ /// <summary>
+ /// 绐楀笜杩涘害鍑忓皯鎸夐挳
+ /// </summary>
+ Button btnMinusSignIcon;
+ /// <summary>
+ /// 绐楀笜杩涘害澧炲姞鎸夐挳
+ /// </summary>
+ Button btnPlusSgnIcon;
+ /// <summary>
+ /// 绐楀笜婊戝姩鎺у埗
+ /// </summary>
+ DiyImageSeekBar controlBar;
/// <summary>
/// 绐楀笜鍏抽棴鎸夐挳
/// </summary>
@@ -37,7 +53,7 @@
#endregion
#region 鍖哄煙鍙橀噺
- Function function;
+ Curtain curtain;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -46,10 +62,10 @@
/// </summary>
Action actionRefresh;
#endregion
- public RollingShutterPage(Function func)
+ public RollingShutterPage(Curtain func)
{
bodyView = this;
- function = func;
+ curtain = func;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -79,7 +95,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = function.name,
+ Text = curtain.name,
};
controlView.AddChidren(btnFunctionName);
@@ -92,7 +108,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = function.GetRoomListName()
+ Text = curtain.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -104,11 +120,11 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = function.collection
+ IsSelected = curtain.collection
};
controlView.AddChidren(btnCollection);
- CurtainSeekBar curtainSeekBar = new CurtainSeekBar()
+ curtainSeekBar = new CurtainSeekBar()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(130),
@@ -117,7 +133,7 @@
};
controlView.AddChidren(curtainSeekBar);
- var btnMinusSignIcon = new Button()
+ btnMinusSignIcon = new Button()
{
X = Application.GetRealWidth(42),
Y = Application.GetRealHeight(406),
@@ -127,7 +143,7 @@
};
controlView.AddChidren(btnMinusSignIcon);
- var controlBar = new DiyImageSeekBar()
+ controlBar = new DiyImageSeekBar()
{
X = btnMinusSignIcon.Right,
Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
@@ -144,7 +160,7 @@
};
controlView.AddChidren(controlBar);
- var btnPlusSgnIcon = new Button()
+ btnPlusSgnIcon = new Button()
{
X = controlBar.Right,
Y = Application.GetRealHeight(406),
@@ -188,7 +204,7 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(function, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(curtain, actionRefresh);
}
}
--
Gitblit v1.8.0