Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

 HDL_ON/UI/UI2/UserPage.cs

@@ -133,9 +133,12 @@
                    if (DB_ResidenceData.Instance.CheckGPS_IsFirst)
                    {
                        DB_ResidenceData.Instance.CheckGPS_IsFirst = false;
                        Shared.Application.StartGPSLocationService();
                       (Shared.Application.Activity as BaseActivity).CheckLocationPermission();
                    }
                }catch(Exception ex)
                        Shared.Application.StartGPSLocationService();

                }
                catch (Exception ex)
                {
                    MainPage.Log("开启定位服务异常:" + ex.Message);
                }