From f6c4e9886b924d8f5271e8b58378d7a07269dcb8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 05 十一月 2021 10:28:57 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index a1a2aa8..5554a63 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -26,10 +26,14 @@
//bodyView.btnCurtainClose.IsSelected = percent == 0;
try
{
- if (!bodyView.onCurtainAnimation)
- {
- bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
- }
+ var progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent));
+ bodyView.curtainSeekBar.Progress = progress;
+ bodyView.btnProgress.Text = progress + "%";
+
+ //if (!bodyView.onCurtainAnimation)
+ //{
+ // bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
+ //}
}
catch { }
}
@@ -61,24 +65,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;
--
Gitblit v1.8.0