From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

---
 HDL_ON/UI/UI2/UserPage.cs |   75 +++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 61db3e3..2da462c 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/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)
+                {
+                    //娉ㄥ唽鎺ㄩ�両D
+                    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;
                     }
@@ -375,7 +374,7 @@
                 {
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
-            }) { IsBackground = true }.Start();
+            }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
             #endregion
             ContextView.RemoveAll();
             var homePage = new HomePage();
@@ -387,7 +386,7 @@
         /// </summary>
         void ChooseClassification()
         {
-            if (CurAnimationEffect == 1)
+            if (MainPage.CurPageIndex == 1)
             {
                 return;
             }
@@ -409,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;
                     }
@@ -464,7 +463,7 @@
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
             })
-            { IsBackground = true }.Start();
+            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
             #endregion
             ContextView.RemoveAll();
             var classificaitionView = new ClassificationPage();
@@ -478,7 +477,7 @@
         /// </summary>
         void ChooseIntellectualization()
         {
-            if (CurAnimationEffect == 2)
+            if (MainPage.CurPageIndex == 2)
             {
                 return;
             }
@@ -499,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;
                     }
@@ -554,7 +553,7 @@
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
             })
-            { IsBackground = true }.Start();
+            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
             #endregion
             ContextView.RemoveAll();
             var intelligenceView = new IntelligencePage();
@@ -567,15 +566,9 @@
         /// <summary>
         /// 鍒囨崲鍒颁釜浜轰腑蹇冪晫闈�
         /// </summary>
-        void ChoosePersonalCenter()
+        public void ChoosePersonalCenter()
         {
-#if DEBUG
-            if(MainPage.NoLoginMode)
-            {
-                return;
-            }
-#endif
-            if (CurAnimationEffect == 3)
+            if (MainPage.CurPageIndex == 3)
             {
                 return;
             }
@@ -601,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;
                     }
@@ -644,7 +637,7 @@
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
             })
-            { IsBackground = true }.Start();
+            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
             #endregion
 
             ContextView.RemoveAll();
@@ -652,5 +645,13 @@
             ContextView.AddChidren(personalCenterPage);
             personalCenterPage.LoadView();
         }
+
+        /// <summary>
+        /// 娉ㄥ唽鎺ㄩ��
+        /// </summary>
+        void RegisteredPush()
+        {
+            new HttpServerRequest().RegisteredPush();
+        }
     }
 }

--
Gitblit v1.8.0