Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL_ON/UI/UI2/UserPage.cs

@@ -2,12 +2,12 @@
using HDL_ON.Entity;
using Shared;
using HDL_ON.UI.CSS;
using HDL_ON.DAL.Server;

namespace HDL_ON.UI
{
    public partial class UserPage : FrameLayout
    {

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

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

        public void LoadPage()
        {
@@ -128,8 +121,14 @@
                ContextView.AddChidren(homePage);
                homePage.LoadPage();

                //刷新功能状态
                DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
                if (!MainPage.NoLoginMode)
                {
                    //注册推送ID
                    RegisteredPush();
                }
                //2020-12-07 增加版本检测更新方法
                HDLCommon.Current.CheckIfNeedForceUpdate();

            }
            catch (Exception ex)
            {
@@ -303,9 +302,9 @@
        /// <summary>
        /// 切换到收藏界面
        /// </summary>
        void ChooseCollection()
        public void ChooseCollection()
        {
            if (CurAnimationEffect == 0)
            if (MainPage.CurPageIndex == 0)
            {
                return;
            }
@@ -333,10 +332,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;
                    }
@@ -358,6 +357,7 @@
                            btnClassificationText.IsSelected = false;
                            btnIntellectualizationText.IsSelected = false;
                            btnPersonalCenterText.IsSelected = false;
                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
                        }
                        if (index == (total/2))
                        {
@@ -374,7 +374,7 @@
                {
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            }) { IsBackground = true }.Start();
            }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
            #endregion
            ContextView.RemoveAll();
            var homePage = new HomePage();
@@ -386,7 +386,7 @@
        /// </summary>
        void ChooseClassification()
        {
            if (CurAnimationEffect == 1)
            if (MainPage.CurPageIndex == 1)
            {
                return;
            }
@@ -408,15 +408,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;
                    }
@@ -438,6 +438,7 @@
                            btnCollectionText.IsSelected = false;
                            btnIntellectualizationText.IsSelected = false;
                            btnPersonalCenterText.IsSelected = false;
                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
                        }
                        if (index == (total / 2 ))
                        {
@@ -462,7 +463,7 @@
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            })
            { IsBackground = true }.Start();
            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
            #endregion
            ContextView.RemoveAll();
            var classificaitionView = new ClassificationPage();
@@ -476,7 +477,7 @@
        /// </summary>
        void ChooseIntellectualization()
        {
            if (CurAnimationEffect == 2)
            if (MainPage.CurPageIndex == 2)
            {
                return;
            }
@@ -497,15 +498,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;
                    }
@@ -527,6 +528,7 @@
                            btnCollectionIcon.IsSelected = false;
                            btnClassificationIcon.IsSelected = false;
                            btnPersonalCenterIcon.IsSelected = false;
                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
                        }
                        if (index == (total / 2 ))
                        {
@@ -551,23 +553,22 @@
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            })
            { IsBackground = true }.Start();
            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
            #endregion
            ContextView.RemoveAll();
            var intelligenceView = new IntelligencePage();
            ContextView.AddChidren(intelligenceView);
            intelligenceView.LoadPage();

            
        }

        /// <summary>
        /// 切换到个人中心界面
        /// </summary>
        void ChoosePersonalCenter()
        public void ChoosePersonalCenter()
        {
#if DEBUG
            if(MainPage.LocalMode)
            {
                return;
            }
#endif
            if (CurAnimationEffect == 3)
            if (MainPage.CurPageIndex == 3)
            {
                return;
            }
@@ -593,11 +594,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;
                    }
@@ -619,6 +620,7 @@
                            btnCollectionIcon.IsSelected = false;
                            btnClassificationIcon.IsSelected = false;
                            btnIntellectualizationIcon.IsSelected = false;
                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
                        }
                        if (index == (total / 2 ))
                        {
@@ -635,7 +637,7 @@
                    btnNavigationSelectionIcon.SetRotation(0f);
                });
            })
            { IsBackground = true }.Start();
            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
            #endregion

            ContextView.RemoveAll();
@@ -643,5 +645,13 @@
            ContextView.AddChidren(personalCenterPage);
            personalCenterPage.LoadView();
        }

        /// <summary>
        /// 注册推送
        /// </summary>
        void RegisteredPush()
        {
            new HttpServerRequest().RegisteredPush();
        }
    }
}