Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/UI2/UserPage.cs

@@ -8,7 +8,6 @@
{
    public partial class UserPage : FrameLayout
    {

        #region 控件列表
        /// <summary>
        /// 当前区域
@@ -18,6 +17,7 @@
        /// 内容区域
        /// </summary>
        FrameLayout ContextView;
        //VerticalRefreshLayout ContextView;
        /// <summary>
        /// 导航栏区域
        /// </summary>
@@ -86,14 +86,6 @@
        #endregion
        #endregion

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

        public void LoadPage()
        {
@@ -131,6 +123,8 @@

                //注册推送ID
                RegisteredPush();
                //2020-12-07 增加版本检测更新方法
                HDLCommon.Current.CheckIfNeedForceUpdate();

            }
            catch (Exception ex)
@@ -307,7 +301,7 @@
        /// </summary>
        void ChooseCollection()
        {
            if (CurAnimationEffect == 0)
            if (MainPage.CurPageIndex == 0)
            {
                return;
            }
@@ -335,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;
                    }
@@ -377,7 +371,7 @@
                {
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            }) { IsBackground = true }.Start();
            }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
            #endregion
            ContextView.RemoveAll();
            var homePage = new HomePage();
@@ -389,7 +383,7 @@
        /// </summary>
        void ChooseClassification()
        {
            if (CurAnimationEffect == 1)
            if (MainPage.CurPageIndex == 1)
            {
                return;
            }
@@ -411,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;
                    }
@@ -466,7 +460,7 @@
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            })
            { IsBackground = true }.Start();
            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
            #endregion
            ContextView.RemoveAll();
            var classificaitionView = new ClassificationPage();
@@ -480,7 +474,7 @@
        /// </summary>
        void ChooseIntellectualization()
        {
            if (CurAnimationEffect == 2)
            if (MainPage.CurPageIndex == 2)
            {
                return;
            }
@@ -501,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;
                    }
@@ -556,7 +550,7 @@
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            })
            { IsBackground = true }.Start();
            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
            #endregion
            ContextView.RemoveAll();
            var intelligenceView = new IntelligencePage();
@@ -569,7 +563,7 @@
        /// <summary>
        /// 切换到个人中心界面
        /// </summary>
        void ChoosePersonalCenter()
        public void ChoosePersonalCenter()
        {
#if DEBUG
            if(MainPage.NoLoginMode)
@@ -577,7 +571,7 @@
                return;
            }
#endif
            if (CurAnimationEffect == 3)
            if (MainPage.CurPageIndex == 3)
            {
                return;
            }
@@ -603,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;
                    }
@@ -646,7 +640,7 @@
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            })
            { IsBackground = true }.Start();
            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
            #endregion

            ContextView.RemoveAll();