From 675df74cdd4103ffdcbfa0a6ccfc105fd61af15a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 十月 2021 15:44:18 +0800
Subject: [PATCH] 2021-10-29 1.更新乐橙 AndroidSDK
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index a119c53..7c9b864 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -25,6 +25,12 @@
/// 绐楀笜鍔ㄦ�佹帶浠�
/// </summary>
CurtainSeekBarOn curtainSeekBar;
+ /// <summary>
+ /// 杩涘害鍊�
+ /// </summary>
+ Button btnProgress;
+
+
///// <summary>
///// 绐楀笜杩涘害鍑忓皯鎸夐挳
///// </summary>
@@ -52,7 +58,8 @@
#endregion
#region 鍖哄煙鍙橀噺
- Curtain curtain;
+ Curtain curtainTemp = new Curtain();
+ Function function;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -66,10 +73,10 @@
/// </summary>
bool onControl = false;
- public MotorCurtainPage(Curtain func)
+ public MotorCurtainPage(Function func)
{
bodyView = this;
- curtain = func;
+ function = func;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -99,7 +106,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = curtain.name,
+ Text = function.name,
};
controlView.AddChidren(btnFunctionName);
@@ -112,7 +119,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = curtain.GetRoomListName()
+ Text = function.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -124,14 +131,25 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = curtain.collect
+ IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
+
+
+ btnProgress = new Button() {
+ Y = Application.GetRealHeight(80),
+ Height = Application.GetRealHeight(50),
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ Text = curtainTemp.GetPercent(function).ToString() + "%",
+ };
+ controlView.AddChidren(btnProgress);
+
curtainSeekBar = new CurtainSeekBarOn()
{
@@ -139,9 +157,9 @@
Y = Application.GetRealHeight(130),
Width = Application.GetRealWidth(250),
Height = Application.GetRealWidth(177),
- Progress = curtain.percent,
+ Progress = curtainTemp.GetPercent(function),
ProgressTextColor =0x00000000,
- IsInvertedProgress = true,
+ //IsInvertedProgress = true,
};
controlView.AddChidren(curtainSeekBar);
@@ -228,10 +246,10 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain,actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(function,actionRefresh);
new System.Threading.Thread(() =>
{
- DriverLayer.Control.Ins.SendReadCommand(curtain);
+ DriverLayer.Control.Ins.SendReadCommand(function);
})
{ IsBackground = true }.Start();
}
--
Gitblit v1.8.0