From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index 83d85b4..203fa6d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -8,7 +8,7 @@
{
#region 鎺т欢闆嗗悎
- FrameLayout bodyView;
+ static MotorCurtainPage bodyView;
/// <summary>
/// 鍔熻兘鍚嶇О鎸夐挳
/// </summary>
@@ -21,6 +21,22 @@
/// 鏀惰棌鎸夐挳
/// </summary>
Button btnCollection;
+ /// <summary>
+ /// 绐楀笜鍔ㄦ�佹帶浠�
+ /// </summary>
+ CurtainSeekBarOn curtainSeekBar;
+ /// <summary>
+ /// 绐楀笜杩涘害鍑忓皯鎸夐挳
+ /// </summary>
+ Button btnMinusSignIcon;
+ /// <summary>
+ /// 绐楀笜杩涘害澧炲姞鎸夐挳
+ /// </summary>
+ Button btnPlusSgnIcon;
+ /// <summary>
+ /// 绐楀笜婊戝姩鎺у埗
+ /// </summary>
+ DiyImageSeekBar controlBar;
/// <summary>
/// 绐楀笜鍏抽棴鎸夐挳
/// </summary>
@@ -36,7 +52,7 @@
#endregion
#region 鍖哄煙鍙橀噺
- Function function;
+ Curtain curtain;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -45,10 +61,10 @@
/// </summary>
Action actionRefresh;
#endregion
- public MotorCurtainPage(Function func)
+ public MotorCurtainPage(Curtain func)
{
bodyView = this;
- function = func;
+ curtain = func;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -78,7 +94,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = function.name,
+ Text = curtain.name,
};
controlView.AddChidren(btnFunctionName);
@@ -91,7 +107,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = function.GetRoomListName()
+ Text = curtain.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -103,32 +119,41 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = function.collection
+ IsSelected = curtain.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
- CurtainSeekBar curtainSeekBar = new CurtainSeekBar()
+ curtainSeekBar = new CurtainSeekBarOn()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(130),
Width = Application.GetRealWidth(250),
Height = Application.GetRealWidth(177),
-
+ Progress = curtain.percent,
+ ProgressTextColor =0x00000000,
};
controlView.AddChidren(curtainSeekBar);
-
- var btnMinusSignIcon = new Button()
+ btnMinusSignIcon = new Button()
{
- X = Application.GetRealWidth(42),
Y = Application.GetRealHeight(406),
- Width = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(62),
Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "Public/MinusSignIcon.png",
+ TextAlignment = TextAlignment.CenterRight,
+ TextID = StringId.PullOpen,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(btnMinusSignIcon);
- var controlBar = new DiyImageSeekBar()
+ controlBar = new DiyImageSeekBar()
{
X = btnMinusSignIcon.Right,
Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
@@ -139,19 +164,27 @@
ThumbImageHeight = Application.GetRealHeight(54),
ProgressBarColor = CSS_Color.MainColor,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
- ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ ProgressTextSize = 0x00000000,
MaxValue = 100,
Progress = 30,
+ SeekBarPadding = Application.GetRealWidth(20),
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(controlBar);
- var btnPlusSgnIcon = new Button()
+ btnPlusSgnIcon = new Button()
{
- X = controlBar.Right,
+ X = Application.GetRealWidth(266),
Y = Application.GetRealHeight(406),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "Public/PlusSignIcon.png",
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(24),
+ TextID = StringId.Shut,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(btnPlusSgnIcon);
@@ -189,7 +222,12 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(function,actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain,actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(curtain);
+ })
+ { IsBackground = true }.Start();
}
}
--
Gitblit v1.8.0