From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch

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

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index fc552fb..78690ae 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -125,15 +125,18 @@
                 {
                     //娉ㄥ唽鎺ㄩ�両D
                     RegisteredPush();
+                    //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+                    HDLCommon.Current.CheckIfNeedForceUpdate();
                 }
-                //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
-                HDLCommon.Current.CheckIfNeedForceUpdate();
-
 #if __Android__
                 //寮�鍚畾浣嶆湇鍔�
                 try
                 {
-                    Shared.Application.StartGPSLocationService();
+                    if (DB_ResidenceData.Instance.CheckGPS_IsFirst)
+                    {
+                        DB_ResidenceData.Instance.CheckGPS_IsFirst = false;
+                        Shared.Application.StartGPSLocationService();
+                    }
                 }catch(Exception ex)
                 {
                     MainPage.Log("寮�鍚畾浣嶆湇鍔″紓甯�:" + ex.Message);
@@ -486,9 +489,10 @@
                 {
                     btnNavigationSelectionIcon.SetRotation(0f);
                     ContextView.RemoveAll();
-                    var classificaitionView = new ClassificationPage();
+                    var classificaitionView = new ClassificationPage(); 
                     ContextView.AddChidren(classificaitionView);
                     classificaitionView.LoadPage();
+                    
                 });
             })
             { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();

--
Gitblit v1.8.0