From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6

---
 HDL_ON/UI/UI2/UserPage.cs |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 4cc9c29..1a387c7 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -2,6 +2,7 @@
 using HDL_ON.Entity;
 using Shared;
 using HDL_ON.UI.CSS;
+using HDL_ON.DAL.Server;
 
 namespace HDL_ON.UI
 {
@@ -128,8 +129,11 @@
                 ContextView.AddChidren(homePage);
                 homePage.LoadPage();
 
-                //鍒锋柊鍔熻兘鐘舵��
-                DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
+                //娉ㄥ唽鎺ㄩ�両D
+                RegisteredPush();
+                //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+                HDLCommon.Current.CheckIfNeedForceUpdate();
+
             }
             catch (Exception ex)
             {
@@ -303,9 +307,9 @@
         /// <summary>
         /// 鍒囨崲鍒版敹钘忕晫闈�
         /// </summary>
-        void ChooseCollection()
+        void ChooseCollection()//bool qiangzhishuaxin = false)
         {
-            if (CurAnimationEffect == 0)
+            if (CurAnimationEffect == 0 )//&& !qiangzhishuaxin)
             {
                 return;
             }
@@ -358,6 +362,7 @@
                             btnClassificationText.IsSelected = false;
                             btnIntellectualizationText.IsSelected = false;
                             btnPersonalCenterText.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
                         }
                         if (index == (total/2))
                         {
@@ -374,7 +379,7 @@
                 {
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
-            }) { IsBackground = true }.Start();
+            }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
             #endregion
             ContextView.RemoveAll();
             var homePage = new HomePage();
@@ -438,6 +443,7 @@
                             btnCollectionText.IsSelected = false;
                             btnIntellectualizationText.IsSelected = false;
                             btnPersonalCenterText.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
                         }
                         if (index == (total / 2 ))
                         {
@@ -462,7 +468,7 @@
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
             })
-            { IsBackground = true }.Start();
+            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
             #endregion
             ContextView.RemoveAll();
             var classificaitionView = new ClassificationPage();
@@ -527,6 +533,7 @@
                             btnCollectionIcon.IsSelected = false;
                             btnClassificationIcon.IsSelected = false;
                             btnPersonalCenterIcon.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
                         }
                         if (index == (total / 2 ))
                         {
@@ -551,9 +558,14 @@
                     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>
@@ -562,7 +574,7 @@
         void ChoosePersonalCenter()
         {
 #if DEBUG
-            if(MainPage.LocalMode)
+            if(MainPage.NoLoginMode)
             {
                 return;
             }
@@ -619,6 +631,7 @@
                             btnCollectionIcon.IsSelected = false;
                             btnClassificationIcon.IsSelected = false;
                             btnIntellectualizationIcon.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
                         }
                         if (index == (total / 2 ))
                         {
@@ -635,7 +648,7 @@
                     btnNavigationSelectionIcon.SetRotation(0f);
                 });
             })
-            { IsBackground = true }.Start();
+            { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
             #endregion
 
             ContextView.RemoveAll();
@@ -643,5 +656,13 @@
             ContextView.AddChidren(personalCenterPage);
             personalCenterPage.LoadView();
         }
+
+        /// <summary>
+        /// 娉ㄥ唽鎺ㄩ��
+        /// </summary>
+        void RegisteredPush()
+        {
+            new HttpServerRequest().RegisteredPush();
+        }
     }
 }

--
Gitblit v1.8.0