From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 09580af..10640b5 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.openLevel
             };
             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,13 @@
                 ProgressTextColor = CSS_Color.FirstLevelTitleColor,
                 ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 MaxValue = 100,
-                Progress = 30,
+                Progress = curtain.openLevel
             };
             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),

--
Gitblit v1.8.0