From d41f1d4a478c1afcc43f3a5abb0ba76e376bc7c1 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 09 三月 2021 15:23:25 +0800 Subject: [PATCH] 2 --- HDL_ON/UI/UI2/UserPage.cs | 38 +++++++++++++++----------------------- 1 files changed, 15 insertions(+), 23 deletions(-) diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs index 51a7e42..4397173 100644 --- a/HDL_ON/UI/UI2/UserPage.cs +++ b/HDL_ON/UI/UI2/UserPage.cs @@ -86,14 +86,6 @@ #endregion #endregion - /// <summary> - /// 褰撳墠鍔ㄧ敾鏁堟灉 - /// 0:鏀惰棌 - /// 1:鍒嗙被 - /// 2:鏅鸿兘 - /// 3:涓汉 - /// </summary> - int CurAnimationEffect = 0; public void LoadPage() { @@ -307,9 +299,9 @@ /// <summary> /// 鍒囨崲鍒版敹钘忕晫闈� /// </summary> - void ChooseCollection(bool qiangzhishuaxin = false) + void ChooseCollection() { - if (CurAnimationEffect == 0 || qiangzhishuaxin) + if (MainPage.CurPageIndex == 0) { return; } @@ -337,10 +329,10 @@ distance /= total; new System.Threading.Thread(() => { int index = 0; - CurAnimationEffect = 0; + MainPage.CurPageIndex = 0; while (index < total+1) { - if (CurAnimationEffect != 0) + if (MainPage.CurPageIndex != 0) { break; } @@ -391,7 +383,7 @@ /// </summary> void ChooseClassification() { - if (CurAnimationEffect == 1) + if (MainPage.CurPageIndex == 1) { return; } @@ -413,15 +405,15 @@ distance /= total; new System.Threading.Thread(() => { - if (CurAnimationEffect == 1) + if (MainPage.CurPageIndex == 1) { return; } - CurAnimationEffect = 1; + MainPage.CurPageIndex = 1; int index = 0; while (index < total+1) { - if (CurAnimationEffect != 1) + if (MainPage.CurPageIndex != 1) { break; } @@ -482,7 +474,7 @@ /// </summary> void ChooseIntellectualization() { - if (CurAnimationEffect == 2) + if (MainPage.CurPageIndex == 2) { return; } @@ -503,15 +495,15 @@ } distance /= total; new System.Threading.Thread(() => { - if (CurAnimationEffect == 2) + if (MainPage.CurPageIndex == 2) { return; } - CurAnimationEffect = 2; + MainPage.CurPageIndex = 2; int index = 0; while (index < total+1) { - if(CurAnimationEffect!=2) + if(MainPage.CurPageIndex!=2) { break; } @@ -579,7 +571,7 @@ return; } #endif - if (CurAnimationEffect == 3) + if (MainPage.CurPageIndex == 3) { return; } @@ -605,11 +597,11 @@ } distance /= total; new System.Threading.Thread(() => { - CurAnimationEffect = 3; + MainPage.CurPageIndex = 3; int index = 0; while (index < total+1) { - if (CurAnimationEffect != 3) + if (MainPage.CurPageIndex != 3) { break; } -- Gitblit v1.8.0