From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2

---
 HDL_ON/UI/UI2/UserPage.cs |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 2ccc7fb..4397173 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/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 @@
 
                 //娉ㄥ唽鎺ㄩ�両D
                 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();
@@ -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();

--
Gitblit v1.8.0