From f6fd8acd7c53c44187e70b4709443318a628f4b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 六月 2020 13:12:33 +0800
Subject: [PATCH] 2020-06-016
---
HDL_ON/UI/UI2/UserPage.cs | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index ecaf192..0d5291a 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -297,13 +297,11 @@
homePage.LoadPage();
}
-
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
void ChooseCollection()
{
- CurAnimationEffect = 0;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -312,6 +310,7 @@
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
+ //绉诲姩璺濈
var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
int sleepTime = 300;
@@ -328,7 +327,13 @@
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- while (index < total+1) {
+ if(CurAnimationEffect == 0)
+ {
+ return;
+ }
+ CurAnimationEffect = 0;
+ while (index < total+1)
+ {
if (CurAnimationEffect != 0)
{
break;
@@ -374,7 +379,6 @@
/// </summary>
void ChooseClassification()
{
- CurAnimationEffect = 1;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -394,6 +398,11 @@
distance /= total;
new System.Threading.Thread(() =>
{
+ if (CurAnimationEffect == 1)
+ {
+ return;
+ }
+ CurAnimationEffect = 1;
int index = 0;
while (index < total+1)
{
@@ -452,7 +461,6 @@
/// </summary>
void ChooseIntellectualization()
{
- CurAnimationEffect = 2;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -471,6 +479,11 @@
}
distance /= total;
new System.Threading.Thread(() => {
+ if (CurAnimationEffect == 2)
+ {
+ return;
+ }
+ CurAnimationEffect = 2;
int index = 0;
while (index < total+1)
{
@@ -525,7 +538,6 @@
/// </summary>
void ChoosePersonalCenter()
{
- CurAnimationEffect = 3;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -549,6 +561,11 @@
}
distance /= total;
new System.Threading.Thread(() => {
+ if (CurAnimationEffect == 3)
+ {
+ return;
+ }
+ CurAnimationEffect = 3;
int index = 0;
while (index < total+1)
{
--
Gitblit v1.8.0