diff --git a/Assets/Mapbox/Unity/Map/AbstractMap.cs b/Assets/Mapbox/Unity/Map/AbstractMap.cs index a1cf4d1f..b8c88bff 100644 --- a/Assets/Mapbox/Unity/Map/AbstractMap.cs +++ b/Assets/Mapbox/Unity/Map/AbstractMap.cs @@ -1137,7 +1137,7 @@ namespace Mapbox.Unity.Map public virtual void SetCenterLatitudeLongitude(Vector2d centerLatitudeLongitude) { - _options.locationOptions.latitudeLongitude = string.Format("{0}, {1}", centerLatitudeLongitude.x, centerLatitudeLongitude.y); + _options.locationOptions.latitudeLongitude = string.Format("{0}, {1}", centerLatitudeLongitude.x.ToString(CultureInfo.InvariantCulture), centerLatitudeLongitude.y.ToString(CultureInfo.InvariantCulture)); _centerLatitudeLongitude = centerLatitudeLongitude; } diff --git a/Assets/Scenes/Ride/Scripts/Model/TargetData.cs b/Assets/Scenes/Ride/Scripts/Model/TargetData.cs index 7f5fc5d1..af2c69d4 100644 --- a/Assets/Scenes/Ride/Scripts/Model/TargetData.cs +++ b/Assets/Scenes/Ride/Scripts/Model/TargetData.cs @@ -53,19 +53,19 @@ namespace Assets.Scenes.Ride.Scripts.Model { string[] split = data.Split(','); var target = new TargetData(); - target.Ticks = int.Parse(split[0]); - target._Power = double.Parse(split[1]); - target._Speed = double.Parse(split[2]); - target._Distance = double.Parse(split[3]); - target._Cadence = double.Parse(split[4]); + target.Ticks = Convert.ToInt32(split[0], CultureInfo.InvariantCulture); //int.Parse(split[0]); + target._Power = Convert.ToDouble(split[1], CultureInfo.InvariantCulture); + target._Speed = Convert.ToDouble(split[2], CultureInfo.InvariantCulture);// double.Parse(split[2]); + target._Distance = Convert.ToDouble(split[3], CultureInfo.InvariantCulture); //double.Parse(split[3]); + target._Cadence = Convert.ToDouble(split[4], CultureInfo.InvariantCulture); //double.Parse(split[4]); if (!string.IsNullOrWhiteSpace(split[5]) && split[5] != "null") { - target._HeartRate = int.Parse(split[5]); + target._HeartRate = Convert.ToInt32(split[5], CultureInfo.InvariantCulture); //int.Parse(split[5]); } if (split.Length > 6) { - target._Lat = double.Parse(split[6]); - target._Lon = double.Parse(split[7]); + target._Lat = Convert.ToDouble(split[6], CultureInfo.InvariantCulture); //double.Parse(split[6]); + target._Lon = Convert.ToDouble(split[7], CultureInfo.InvariantCulture); //double.Parse(split[7]); //target._Bearing = double.Parse(split[8]); } return target; diff --git a/Assets/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scenes/Ride/Scripts/PlayerController.cs index 08f0424f..109c9f8a 100644 --- a/Assets/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scenes/Ride/Scripts/PlayerController.cs @@ -56,7 +56,7 @@ namespace Assets.Scenes.Ride.Scripts bicycleWeight = App.CurrentUser.BicycleWeight; //#if UNITY_EDITOR System.Random rd = new System.Random(); - //power = 1000; //rd.Next(150, 300);//测试功率 + power = 1000; //rd.Next(150, 300);//测试功率 //#endif mainController.TrackResistance(currentSlope * App.rideSetting.sensitivity / 100); } diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index 1bddc2eb..958dc1ea 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -3,6 +3,7 @@ using Assets.Scenes.Ride.Scripts.Model; using Assets.Scripts.Apis.Models; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -91,7 +92,7 @@ namespace Assets.Scripts.Apis public async Task>> GetNearRouteAsync(float lat, float lng, float zoom, string bounds) { - var res = await GetAsync>>($"/Map/GetNearRoute?lat={ lat }&lng={ lng }&zoom={zoom}&bounds={ bounds }"); + var res = await GetAsync>>($"/Map/GetNearRoute?lat={ lat.ToString(CultureInfo.InvariantCulture) }&lng={ lng.ToString(CultureInfo.InvariantCulture) }&zoom={zoom.ToString(CultureInfo.InvariantCulture)}&bounds={ bounds }"); //var result = System.Text.Encoding.UTF8.GetString(res); return res; @@ -142,7 +143,7 @@ namespace Assets.Scripts.Apis public async Task> GetEarthData(double lat, double lon) { //CultureInfo.InvariantCulture - var result = await GetAsync>($"Map/GetEarthData?lat={ lat }&lon={ lon }"); + var result = await GetAsync>($"Map/GetEarthData?lat={ lat.ToString(CultureInfo.InvariantCulture) }&lon={ lon.ToString(CultureInfo.InvariantCulture) }"); return result; } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index b22a285c..f6cc6593 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -66,10 +66,10 @@ public static class App static App() { - CultureInfo currentCulture = (CultureInfo)Thread.CurrentThread.CurrentCulture.Clone(); - currentCulture.NumberFormat.NumberDecimalSeparator = "."; - Thread.CurrentThread.CurrentCulture = currentCulture; - System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalization.CultureInfo.InvariantCulture; + //CultureInfo currentCulture = (CultureInfo)Thread.CurrentThread.CurrentCulture.Clone(); + //currentCulture.NumberFormat.NumberDecimalSeparator = "."; + //Thread.CurrentThread.CurrentCulture = currentCulture; + //System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalization.CultureInfo.InvariantCulture; #if !UNITY_EDITOR // Host = "http://pf.juze.pro/"; // UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs index b9ccc4c2..b38d1daa 100644 --- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs +++ b/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) diff --git a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs index 57c04780..e8f48b64 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs +++ b/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); } diff --git a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs index 8223f349..7e355e24 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs +++ b/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.InvariantCulture); //int.Parse(mFTP.Text); + user.Height = Convert.ToInt32(mHeight.Text, CultureInfo.InvariantCulture); //int.Parse(mHeight.Text); + user.Weight = Convert.ToDouble(mWeight.Text, CultureInfo.InvariantCulture); //double.Parse(mWeight.Text); + user.MaxHeartRate = Convert.ToInt32(mMHR.Text, CultureInfo.InvariantCulture); //int.Parse(mMHR.Text); + user.BicycleWeight = Convert.ToDouble(mBW.Text, CultureInfo.InvariantCulture); //double.Parse(mBW.Text); + user.WheelDiameter = Convert.ToInt32(mWD.Text, CultureInfo.InvariantCulture); //int.Parse(mWD.Text); user.Unit = mUnitDropdown.SelectedIndex; user.Contact = mName.Text; user.ContactPhone = mPhone.Text;