From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
index 1cbcd2b..a8a547d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
@@ -300,24 +300,19 @@
return;
if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
{
- try
+ try
{
- if (!bodyView.onCurtainAnimation)
+ var percent = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent));
+ bodyView.curtainSeekBar.Progress = percent;
+ bodyView.btnProgress.Text = percent + "%";
+
+ var e = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Angle));
+ bodyView.angleBar.Progress = e;
+ float angle = e - 90;
+ bodyView.btnAngle.Text = (e - 0) + "掳";
+ foreach (var btn in bodyView.buttons)
{
- var percent = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent));
- bodyView.CurtainAnimation(percent);
- bodyView.btnProgress.Text = percent + "%";
-
- var e = Convert.ToInt32( updateTemp.GetAttrState(FunctionAttributeKey.Angle));
- bodyView.angleBar.Progress = e;
- float angle = e - 90;
- bodyView.btnAngle.Text = (e - 0) + "掳";
- foreach (var btn in bodyView.buttons)
- {
- btn.SetRotation(angle);
- }
-
-
+ btn.SetRotation(angle);
}
}
catch { }
--
Gitblit v1.8.0