From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:30 +0800
Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 95a00e3..7638d01 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -53,6 +53,7 @@
             //杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
             bool runningDirection = progress > curtainSeekBar.Progress;
             int curBarProgress = curtainSeekBar.Progress;
+            btnProgress.Text = progress + "%";
             new System.Threading.Thread(() =>
             {
                 try
@@ -63,24 +64,24 @@
                         {
                             if (runningDirection)
                             {
-                                if (curtainSeekBar.Progress + 10 > progress)
+                                if (curtainSeekBar.Progress + 5 > progress)
                                 {
                                     curtainSeekBar.Progress = progress;
                                 }
                                 else
                                 {
-                                    curtainSeekBar.Progress = curtainSeekBar.Progress + 10;
+                                    curtainSeekBar.Progress = curtainSeekBar.Progress + 5;
                                 }
                             }
                             else
                             {
-                                if (curtainSeekBar.Progress - 10 < progress)
+                                if (curtainSeekBar.Progress - 5 < progress)
                                 {
                                     curtainSeekBar.Progress = progress;
                                 }
                                 else
                                 {
-                                    curtainSeekBar.Progress = curtainSeekBar.Progress - 10;
+                                    curtainSeekBar.Progress = curtainSeekBar.Progress - 5;
                                 }
                             }
                             curBarProgress = curtainSeekBar.Progress;
@@ -228,8 +229,9 @@
             //    DriverLayer.Control.Ins.SendWriteCommand(function, d);
             //};
 
-            //curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
-            //{
+            curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+            {
+                btnProgress.Text = curtainSeekBar.Progress + "%";
             //    controlBar.Progress = curtainSeekBar.Progress;
             //    new System.Threading.Thread(() =>
             //    {
@@ -243,9 +245,10 @@
             //        }
             //    })
             //    { IsBackground = true }.Start();
-            //};
+            };
             curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
             {
+            btnProgress.Text = curtainSeekBar.Progress + "%";
                 //controlBar.Progress = curtainSeekBar.Progress;
                 new System.Threading.Thread(() =>
                 {

--
Gitblit v1.8.0