Commit 5ff730c3 authored by zwebrain's avatar zwebrain
Browse files

.

parent e1612fc2
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ public class CityManager : MonoBehaviour
    {
        if (!Input.location.isEnabledByUser)
        {
            User.GetInstance().Latitude = 22.6044f;
            User.GetInstance().Longitude = 114.9943f;
            User.GetInstance().Latitude = 22.64f;
            User.GetInstance().Longitude = 114.942f;
            StartCoroutine(nameof(GetLocationDetails));
            yield break;
        }
@@ -124,6 +124,7 @@ public class CityManager : MonoBehaviour
                "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();
            Debug.Log(locUrl);
            HttpRequest locRequest = new HttpRequest();
            StartCoroutine(locRequest.Get(locUrl));
            while (!locRequest.isComplete)
@@ -133,7 +134,6 @@ public class CityManager : MonoBehaviour

            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())) >
+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://118.195.201.75:10922/";
    private static string backEnd = "http://10.26.115.67:10922/";
    public static string BackEnd => backEnd;
    public static string BaiduKey => baidu;
    private static string baidu = "UexT0eqWG8q7X6YF1DQmSw3K3mH5dSw8";
+14 −2
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ using Script;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI;
using UnityEngine.UIElements;
using XCharts;
using Image = UnityEngine.UI.Image;

public class GeographyManager : MonoBehaviour
{
@@ -144,7 +146,17 @@ public class GeographyManager : MonoBehaviour

    IEnumerator GetCovid19ProvinceStatistic()
    {
        string url = Config.BackEnd + "covid19/province/" + User.GetInstance().Province;
        string url = "";
        if (User.GetInstance().Province.Length == 0)
        {
            url = Config.BackEnd + "covid19/province/" + "广东省";
        }
        else
        {
            url = Config.BackEnd + "covid19/province/" + User.GetInstance().Province;
        }


        Debug.Log(url);
        HttpRequest request = new HttpRequest();
        StartCoroutine(request.Get(url));
@@ -233,7 +245,7 @@ public class GeographyManager : MonoBehaviour
            // 静态图
            string imageUrl = Config.GetBaiduUrl() + "/staticimage/v2?";
            imageUrl += "ak=" + Config.BaiduKey + "&";
            imageUrl += "copyright=1&zoom=14&scale=2&";
            imageUrl += "copyright=1&zoom=12&scale=2&";
            imageUrl += "width=200&height=200&";
            imageUrl += "center=" + User.GetInstance().Longitude + "," + User.GetInstance().Latitude;
            imageUrl += "&markers=" + User.GetInstance().Longitude + "," + User.GetInstance().Latitude;
+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://118.195.201.75:10921/image/upload";
    private const string UploadAddress = "http://10.26.115.67:10921/image/upload";
    private bool captureIsActive;

    public void StartCapture()
+3 −2
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ PlayerSettings:
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 9118675918475686074, guid: a1778138968d3e8498567472f4330129, type: 2}
  - {fileID: -8760679359998906221, guid: 0a61dd4b1707b3c44aff4e602403b2bc, type: 2}
  - {fileID: 0}
@@ -627,7 +628,7 @@ PlayerSettings:
  metroSplashScreenUseBackgroundColor: 0
  platformCapabilities:
    WindowsStoreApps:
      CodeGeneration: True
      EnterpriseAuthentication: True
      OfflineMapsManagement: True
      Location: True
      HumanInterfaceDevice: True
@@ -663,8 +664,8 @@ PlayerSettings:
      Contacts: True
      InternetClient: True
      Proximity: True
      CodeGeneration: True
      BackgroundMediaPlayback: True
      EnterpriseAuthentication: True
  metroTargetDeviceFamilies:
    Holographic: True
  metroFTAName: