. (58182249) · Commits · 聂雨荷 / hololens2

Assets/Script/CityManager.cs

+25 −8

Original line number	Diff line number	Diff line
		@@ -66,13 +66,12 @@ public class CityManager : MonoBehaviour
		}



		IEnumerator StartGPS()
		{
		if (!Input.location.isEnabledByUser)
		{
		User.GetInstance().Latitude = 22.54845664f;
		User.GetInstance().Longitude = 114.06455184f;
		User.GetInstance().Latitude = 22.6044f;
		User.GetInstance().Longitude = 114.9943f;
		StartCoroutine(nameof(GetLocationDetails));
		yield break;
		}
		@@ -121,13 +120,31 @@ public class CityManager : MonoBehaviour
		{
		while (true)
		{
		if (User.GetInstance().Longitude != float.Parse(Input.location.lastData.longitude.ToString()) \|\|
		User.GetInstance().Latitude != float.Parse(Input.location.lastData.latitude.ToString()))
		string locUrl =
		"https://api.map.baidu.com/geoconv/v1/?from=1&to=5&ak=UexT0eqWG8q7X6YF1DQmSw3K3mH5dSw8&coords=";
		locUrl += Input.location.lastData.longitude.ToString() +
		"," + Input.location.lastData.latitude.ToString();
		HttpRequest locRequest = new HttpRequest();
		StartCoroutine(locRequest.Get(locUrl));
		while (!locRequest.isComplete)
		{
		yield return new WaitForSeconds(1);
		}

		if (int.Parse(locRequest.value["status"].ToString()) == 0)
		{
		;
		if (Math.Abs(User.GetInstance().Longitude - float.Parse(locRequest.value["result"]["x"].ToString())) >
		0.0001 \|\|
		Math.Abs(User.GetInstance().Latitude - float.Parse(locRequest.value["result"]["y"].ToString())) >
		0.0001)
		{
		User.GetInstance().Longitude = float.Parse(Input.location.lastData.longitude.ToString());
		User.GetInstance().Latitude = float.Parse(Input.location.lastData.latitude.ToString());
		User.GetInstance().Longitude = float.Parse(locRequest.value["result"]["x"].ToString());
		User.GetInstance().Latitude = float.Parse(locRequest.value["result"]["y"].ToString());
		StartCoroutine(nameof(GetLocationDetails));
		}
		}


		yield return new WaitForSeconds(5);
		}

Assets/Script/Config.cs

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		return "https://api.map.baidu.com";
		}

		private static string backEnd = "http://10.20.48.171:10924/";
		private static string backEnd = "http://118.195.201.75:10922/";
		public static string BackEnd => backEnd;
		public static string BaiduKey => baidu;
		private static string baidu = "UexT0eqWG8q7X6YF1DQmSw3K3mH5dSw8";

Assets/Script/PhotoManager.cs

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ using UnityEngine.Windows.WebCam;
		public class PhotoManager : MonoBehaviour
		{
		private PhotoCapture photoCaptureObject;
		private const string UploadAddress = "http://10.20.48.171:10921/image/upload";
		private const string UploadAddress = "http://118.195.201.75:10921/image/upload";
		private bool captureIsActive;

		public void StartCapture()

ProjectSettings/ProjectSettings.asset

+4 −3

Original line number	Diff line number	Diff line
		@@ -627,7 +627,7 @@ PlayerSettings:
		metroSplashScreenUseBackgroundColor: 0
		platformCapabilities:
		WindowsStoreApps:
		EnterpriseAuthentication: True
		CodeGeneration: True
		OfflineMapsManagement: True
		Location: True
		HumanInterfaceDevice: True
		@@ -663,9 +663,10 @@ PlayerSettings:
		Contacts: True
		InternetClient: True
		Proximity: True
		CodeGeneration: True
		BackgroundMediaPlayback: True
		metroTargetDeviceFamilies: {}
		EnterpriseAuthentication: True
		metroTargetDeviceFamilies:
		Holographic: True
		metroFTAName:
		metroFTAFileTypes: []
		metroProtocolName:

Assets/Script/GeographyManager.cs

+1 −1

File changed.

Contains only whitespace changes.

Admin message