Merge remote-tracking branch 'origin/dev_lishuo' into dev

Assets/Scripts/UI/Prefab/Panel/BigMapController.cs

@@ -16,6 +16,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using Mapbox.Examples;
 using DG.Tweening;
+using System.Globalization;
 
 public class BigMapController : PFUIPanel
 {
@@ -241,7 +242,7 @@ public class BigMapController : PFUIPanel
         //Screen.width
         //map.WorldToGeoPosition(start)        
 
-        var bounds = $"{ start.y },{ start.x };{ end.y },{ end.x }";
+        var bounds = $"{ start.y.ToString(CultureInfo.InvariantCulture) },{ start.x.ToString(CultureInfo.InvariantCulture) };{ end.y.ToString(CultureInfo.InvariantCulture) },{ end.x.ToString(CultureInfo.InvariantCulture) }";
         var res = await mapApi.GetNearRouteAsync((float)mapManager.CenterLatitudeLongitude.x, (float)mapManager.CenterLatitudeLongitude.y, 
             mapManager.Zoom, bounds);
         if(res.result == false)

Assets/Scripts/UI/Prefab/Panel/EarthController.cs

@@ -243,8 +243,8 @@ public class EarthController : PFUIPanel
     {
         //Debug.Log("click");
 
-        Vector2 latLon = Conversion.GetLatLonFromSpherePoint(sphereLocation);
-        Debug.Log("Clicked on Latitude: " + latLon.x + ", Longitude: " + latLon.y);
+        //Vector2 latLon = Conversion.GetLatLonFromSpherePoint(sphereLocation);
+        //Debug.Log("Clicked on Latitude: " + latLon.x + ", Longitude: " + latLon.y);
 
     }
 

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -7,6 +7,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using UnityEngine;
@@ -308,12 +309,12 @@ public class EditUserController : PFUIPanel
             Utils.showToast(gameObject, "Please fill in the information");//请填写相关信息
             return;
         }
-        user.FTP = int.Parse(mFTP.Text);
-        user.Height = int.Parse(mHeight.Text);
-        user.Weight = double.Parse(mWeight.Text);
-        user.MaxHeartRate = int.Parse(mMHR.Text);
-        user.BicycleWeight = double.Parse(mBW.Text);
-        user.WheelDiameter = int.Parse(mWD.Text);
+        user.FTP = Convert.ToInt32(mFTP.Text, CultureInfo.InstalledUICulture); //int.Parse(mFTP.Text);
+        user.Height = Convert.ToInt32(mHeight.Text, CultureInfo.InstalledUICulture); //int.Parse(mHeight.Text);
+        user.Weight = Convert.ToDouble(mWeight.Text, CultureInfo.InstalledUICulture); //double.Parse(mWeight.Text);
+        user.MaxHeartRate = Convert.ToInt32(mMHR.Text, CultureInfo.InstalledUICulture); //int.Parse(mMHR.Text);
+        user.BicycleWeight = Convert.ToDouble(mBW.Text, CultureInfo.InstalledUICulture); //double.Parse(mBW.Text);
+        user.WheelDiameter = Convert.ToInt32(mWD.Text, CultureInfo.InstalledUICulture); //int.Parse(mWD.Text);
         user.Unit = mUnitDropdown.SelectedIndex;
         user.Contact = mName.Text;
         user.ContactPhone = mPhone.Text;