Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

陈嘉乐

2021-03-16 e1ac4ab0e68024e6289e0b11756962d662749b04

 HDL_ON/UI/UI2/UserPage.cs

@@ -86,6 +86,14 @@
        #endregion
        #endregion

        /// <summary>
        /// 当前动画效果
        /// 0:收藏
        /// 1:分类
        /// 2:智能
        /// 3:个人
        /// </summary>
        int CurAnimationEffect = 0;

        public void LoadPage()
        {
@@ -299,9 +307,9 @@
        /// <summary>
        /// 切换到收藏界面
        /// </summary>
        void ChooseCollection()
        void ChooseCollection(bool qiangzhishuaxin = false)
        {
            if (MainPage.CurPageIndex == 0)
            if (CurAnimationEffect == 0 || qiangzhishuaxin)
            {
                return;
            }
@@ -329,10 +337,10 @@
            distance /= total;
            new System.Threading.Thread(() => {
                int index = 0;
                MainPage.CurPageIndex = 0;
                CurAnimationEffect = 0;
                while (index < total+1)
                {
                    if (MainPage.CurPageIndex != 0)
                    if (CurAnimationEffect != 0)
                    {
                        break;
                    }
@@ -383,7 +391,7 @@
        /// </summary>
        void ChooseClassification()
        {
            if (MainPage.CurPageIndex == 1)
            if (CurAnimationEffect == 1)
            {
                return;
            }
@@ -405,15 +413,15 @@
            distance /= total;
            new System.Threading.Thread(() =>
            {
                if (MainPage.CurPageIndex == 1)
                if (CurAnimationEffect == 1)
                {
                    return;
                }
                MainPage.CurPageIndex = 1;
                CurAnimationEffect = 1;
                int index = 0;
                while (index < total+1)
                {
                    if (MainPage.CurPageIndex != 1)
                    if (CurAnimationEffect != 1)
                    {
                        break;
                    }
@@ -474,7 +482,7 @@
        /// </summary>
        void ChooseIntellectualization()
        {
            if (MainPage.CurPageIndex == 2)
            if (CurAnimationEffect == 2)
            {
                return;
            }
@@ -495,15 +503,15 @@
            }
            distance /= total;
            new System.Threading.Thread(() => {
                if (MainPage.CurPageIndex == 2)
                if (CurAnimationEffect == 2)
                {
                    return;
                }
                MainPage.CurPageIndex = 2;
                CurAnimationEffect = 2;
                int index = 0;
                while (index < total+1)
                {
                    if(MainPage.CurPageIndex!=2)
                    if(CurAnimationEffect!=2)
                    {
                        break;
                    }
@@ -571,7 +579,7 @@
                return;
            }
#endif
            if (MainPage.CurPageIndex == 3)
            if (CurAnimationEffect == 3)
            {
                return;
            }
@@ -597,11 +605,11 @@
            }
            distance /= total;
            new System.Threading.Thread(() => {
                MainPage.CurPageIndex = 3;
                CurAnimationEffect = 3;
                int index = 0;
                while (index < total+1)
                {
                    if (MainPage.CurPageIndex != 3)
                    if (CurAnimationEffect != 3)
                    {
                        break;
                    }