From 673a93f4ed742a10a879a67b616e6646b03ef0fb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 九月 2020 17:14:27 +0800
Subject: [PATCH] 202009151
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 09580af..893a5ca 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 绐楀笜鍔ㄦ�佹帶浠�
/// </summary>
- CurtainSeekBar curtainSeekBar;
+ CurtainRollSeekBarOn curtainSeekBar;
/// <summary>
/// 绐楀笜杩涘害鍑忓皯鎸夐挳
/// </summary>
@@ -124,12 +124,13 @@
};
controlView.AddChidren(btnCollection);
- curtainSeekBar = new CurtainSeekBar()
+ curtainSeekBar = new CurtainRollSeekBarOn()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(130),
- Width = Application.GetRealWidth(250),
- Height = Application.GetRealWidth(177),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealWidth(210),
+ Progress = curtain.percent
};
controlView.AddChidren(curtainSeekBar);
@@ -147,7 +148,7 @@
{
X = btnMinusSignIcon.Right,
Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
- Width = Application.GetRealWidth(180),
+ Width = Application.GetRealWidth(190),
Height = Application.GetRealHeight(54),
SeekBarViewHeight = Application.GetRealHeight(8),
ThumbImagePath = "Public/ThumbImage.png",
@@ -156,13 +157,14 @@
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
MaxValue = 100,
- Progress = 30,
+ SeekBarPadding = Application.GetRealWidth(20),
+ Progress = curtain.percent
};
controlView.AddChidren(controlBar);
btnPlusSgnIcon = new Button()
{
- X = controlBar.Right,
+ X = controlBar.Right + Application.GetRealWidth(10),
Y = Application.GetRealHeight(406),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
@@ -204,7 +206,7 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(curtain, actionRefresh);
+ new TopViewDiv(bodyView, curtain.name).LoadTopView(curtain, actionRefresh);
}
}
--
Gitblit v1.8.0