From a251442d9fc088b3d8cf74d20b959f0f6103b095 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 九月 2020 17:42:10 +0800
Subject: [PATCH] 20200914

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index 5e69429..dca2d52 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -24,7 +24,7 @@
         /// <summary>
         /// 绐楀笜鍔ㄦ�佹帶浠�
         /// </summary>
-        CurtainSeekBar curtainSeekBar;
+        CurtainSeekBarOn curtainSeekBar;
         /// <summary>
         /// 绐楀笜杩涘害鍑忓皯鎸夐挳
         /// </summary>
@@ -123,13 +123,13 @@
             };
             controlView.AddChidren(btnCollection);
 
-            curtainSeekBar = new CurtainSeekBar()
+            curtainSeekBar = new CurtainSeekBarOn()
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(130),
                 Width = Application.GetRealWidth(250),
                 Height = Application.GetRealWidth(177),
-                Progress = curtain.openLevel
+                Progress = curtain.percent
             };
             controlView.AddChidren(curtainSeekBar);
 
@@ -158,6 +158,7 @@
                 ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 MaxValue = 100,
                 Progress = 30,
+                SeekBarPadding = Application.GetRealWidth(20),
             };
             controlView.AddChidren(controlBar);
 
@@ -205,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