整合2.0/2.1 -----1

Assets/2.0.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6195d8dac8a16f54db06b5358a55bfa1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55dae1801af3af447b9fbb9b55e64a26
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/UserInfo.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UserInfo: Singleton<UserInfo>
+{
+    public string Token;
+}

Assets/2.0/User/UserInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b66c6f4bad220bd42bda4594730f6c66
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/UserManager.cs

@@ -0,0 +1,16 @@
+using SC.XR.Unity;
+
+public class UserManager : SingletonMono<UserManager>
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/2.0/User/UserManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 692ff209d007add47b61481d8fc7669c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Blue/Controller/SetPos/MinMapPos.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 public class MinMapPos : MonoBehaviour
 {
     [SerializeField] private GameObject MinMapCanvas;
-    void Awake()
+    void Start()
     {
         MinMapCanvas = GameObject.Find("MinMapCanvas");
         if (MinMapCanvas != null)

Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -29,7 +29,21 @@ public class UpOrDownloadService : IUpOrDownloadService
 
     void IUpOrDownloadService.GetScenePosRot(string Url)
     {
-        RootSystem.Instance.StartCoroutine(GetScenePosRotRequest(Url));
+        RootSystem.Instance.StartCoroutine(HttpTool.Instance.SendHttp(Url,"",(message)=> {
+            JObject jobject = JObject.Parse(message);
+            if (jobject["code"].ToString() == "200")
+            {
+                message = jobject["data"].ToString();
+                if (!string.IsNullOrWhiteSpace(message))
+                {
+                    List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(message);
+                    PosRot = ScenePosRotInfoList;
+                    URL = Url;
+                    this.TriggerEvent(new GetScenePosRotEvent() { PosRot = PosRot });
+                }
+            }
+
+        },false));
     }
 
     void IUpOrDownloadService.UploadScenePosRot(string Url, string JsonString)
@@ -37,45 +51,9 @@ public class UpOrDownloadService : IUpOrDownloadService
         RootSystem.Instance.StartCoroutine(RequestUpload(Url,JsonString));
     }
 
-    private IEnumerator GetScenePosRotRequest(string Url)
-    {
-        using (UnityWebRequest webRequest = UnityWebRequest.Get(Url))
-        {
-            webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
-
-            //??header
-            foreach (var v in HttpTool.Instance.RequestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-            }
-            yield return webRequest.SendWebRequest();
-
-            if (webRequest.result== UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
-                Debug.LogError("UnityWebRequest Error");
-            else
-            {
-                if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
-                {
-                    string message = webRequest.downloadHandler.text;
-                    JObject jobject = JObject.Parse(message);
-                    if (jobject["code"].ToString() == "200")
-                    {
-                        message = jobject["data"].ToString();
-                        if (!string.IsNullOrWhiteSpace(message))
-                        {
-                            List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(message);
-                            PosRot = ScenePosRotInfoList;
-                            URL = Url;
-                            this.TriggerEvent(new GetScenePosRotEvent() { PosRot = PosRot });
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     public IEnumerator RequestUpload(string Url, string jsonString)
     {
+        Debug.Log("Start Queue RequestUpload " + Url);
         using (UnityWebRequest webRequest = new UnityWebRequest(Url, "POST"))
         {
             JsonData data = JsonMapper.ToObject(jsonString);
@@ -87,7 +65,7 @@ public class UpOrDownloadService : IUpOrDownloadService
             webRequest.downloadHandler = new DownloadHandlerBuffer();
 
             webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
-            webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
+            webRequest.SetRequestHeader("authorization", UserInfo.Instance.Token);
             foreach (var v in HttpTool.Instance.RequestHeader)
             {
                 webRequest.SetRequestHeader(v.Key, v.Value);

Assets/Scripts/Download/DownloadManager.cs

@@ -428,7 +428,7 @@ public class DownloadManager : SingletonMono<DownloadManager>
         UnityWebRequest uwr = new UnityWebRequest(url, UnityWebRequest.kHttpVerbPOST);
         uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
         uwr.downloadHandler = new DownloadHandlerFile(data.localSavePath);
-        uwr.SetRequestHeader("authorization", HttpTool.Instance.Token);
+        uwr.SetRequestHeader("authorization", UserInfo.Instance.Token);
         foreach (var v in HttpTool.Instance.RequestHeader)
         {
             uwr.SetRequestHeader(v.Key, v.Value);
@@ -660,7 +660,7 @@ public class DownloadManager : SingletonMono<DownloadManager>
             request.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
             DownloadHandlerTexture downloadHandlerTexture = new DownloadHandlerTexture(true);
             request.downloadHandler = downloadHandlerTexture;
-            request.SetRequestHeader("authorization", HttpTool.Instance.Token);
+            request.SetRequestHeader("authorization", UserInfo.Instance.Token);
             foreach (var v in HttpTool.Instance.RequestHeader)
             {
                 request.SetRequestHeader(v.Key, v.Value);
@@ -794,7 +794,7 @@ public class DownloadManager : SingletonMono<DownloadManager>
             //Debug.Log(baseUrl + "ABABABABABAB");
             AssetBundle ab = null;
             UnityWebRequest request = UnityWebRequestAssetBundle.GetAssetBundle(baseUrl);
-            request.SetRequestHeader("authorization", HttpTool.Instance.Token);
+            request.SetRequestHeader("authorization", UserInfo.Instance.Token);
             yield return request.SendWebRequest();
             if (request.isNetworkError || request.isHttpError)
             {

Assets/Scripts/Net/HttpSocket.cs

@@ -112,20 +112,6 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     }
 
 
-    public void SendSnInfo(SceneValue scene, int index, Action<int, string> CallBack)
-    {
-        SendSnInfo sendNet = new SendSnInfo();
-
-        sendNet.sn =SendSN.GetSN();
-        //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
-
-        sendNet.projectId = scene.id;
-        string jsonData = JsonMapper.ToJson(sendNet);
-
-        Debug.Log(jsonData);
-        HttpTool.Instance.PostSnInfo("/client/snInfo", jsonData, index, CallBack);
-    }
-
 
     private void CallBack(string message)
     {

Assets/Scripts/Net/HttpTool.cs

@@ -14,11 +14,14 @@ using Newtonsoft.Json.Linq;
 /// </summary>
 public class HttpTool : MonoSingleton<HttpTool>
 {
+    public static bool is20 = false;
 
-  //  private string baseUrl = "http://office.ghz-tech.com:3425/guideSystem";
+    private string baseUrl20 = "https://office.ghz-tech.com:3424/api";
+
+    //  private string baseUrl = "http://office.ghz-tech.com:3425/guideSystem";
     private string baseUrl = "http://office.ghz-tech.com:9904/api";
     private string UrlPointCloud = "https://pro.qulivr.com/mr-navigator/v1";
-    private string token = "";
+    //private string token = "";
     Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
     void Awake()
     {
@@ -27,10 +30,10 @@ public class HttpTool : MonoSingleton<HttpTool>
 
     }
 
-    public string Token
-    {
-        get { return token; }
-    }
+  //  public string Token
+   // {
+       // get { return token; }
+   // }
 
     public string BaseUrl
     {
@@ -45,76 +48,12 @@ public class HttpTool : MonoSingleton<HttpTool>
 
     public void Get(string methodName, Action<string> callback)
     {
-        StartCoroutine(GetRequest(methodName, callback));
-    }
-    private IEnumerator GetRequest(string methodName, Action<string> callback)
-    {
-        //   string url = Application.streamingAssetsPath + methodName;
-        string url = baseUrl + methodName;
-        //Debug.Log("URL:"+url);
-        using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
-        {
-            webRequest.SetRequestHeader("authorization", token);
-            //设置header
-            foreach (var v in requestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-            }
-            yield return webRequest.SendWebRequest();
-
-            if (webRequest.isHttpError || webRequest.isNetworkError)
-            {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
-                if (callback != null)
-                {
-                    callback(null);
-                }
-            }
-            else
-            {
-                if (callback != null)
-                {
-
-                    callback(webRequest.downloadHandler.text);
-                }
-            }
-        }
+        StartCoroutine(SendHttp(methodName,"", callback,false, false));
     }
 
-    public void GetPoint(string methodName, Action<string> callback)
+    public void GetPoint(string methodName, Action<string> callback,bool isCloud=false)
     {
-        StartCoroutine(GetPointRequest(methodName, callback));
-    }
-    private IEnumerator GetPointRequest(string methodName, Action<string> callback)
-    {
-        string url = UrlPointCloud + methodName;
-        //Debug.Log("URL:"+url);
-        using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
-        {
-            webRequest.SetRequestHeader("authorization", token);
-            //设置header
-            foreach (var v in requestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-            }
-            yield return webRequest.SendWebRequest();
-
-            if (webRequest.isHttpError || webRequest.isNetworkError)
-            {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
-                if (callback != null)
-                {
-                    callback(null);
-                }
-            }
-            else
-            {
-                if (callback != null)
-                {
-                    callback(webRequest.downloadHandler.text);
-                }
-            }
-        }
+        StartCoroutine(SendHttp(methodName,"", callback,false, isCloud));
     }
 
     public void GetPointFile(string methodName, string projectId, string fileType, Action<string> callback)
@@ -124,228 +63,100 @@ public class HttpTool : MonoSingleton<HttpTool>
         UriBuilder uriBuilder = new UriBuilder(url);
         // 添加查询参数
         uriBuilder.Query = "projectId=" + projectId + "&fileType=" + fileType;
-        // 创建UnityWebRequest
-        UnityWebRequest webRequest = UnityWebRequest.Get(uriBuilder.Uri);
-        webRequest.SetRequestHeader("Authorization", token);
-        // 发送请求
-        StartCoroutine(GetPointGetPointFileRequest(webRequest, callback));
-    }
-    private IEnumerator GetPointGetPointFileRequest(UnityWebRequest webRequest, Action<string> callback)
-    {
-        yield return webRequest.SendWebRequest();
 
-        if (webRequest.result != UnityWebRequest.Result.Success)
-        {
-            Debug.LogError("GetPointRequest failed: " + webRequest.error);
-        }
-        else
-        {
-            //Debug.LogError("GetPointRequest successful!");
-            callback?.Invoke(webRequest.downloadHandler.text);
-        }
+        StartCoroutine(SendHttp(uriBuilder.Uri.ToString(),"", callback,false));
     }
     public void PostTest(string methodName, string jsonString, Action<string> CallBack)
     {
-        StartCoroutine(PostRequestTest(methodName, jsonString, CallBack));
+        StartCoroutine(SendHttp(methodName, jsonString, CallBack));
     }
-    private IEnumerator PostRequestTest(string methodName, string jsonString, Action<string> CallBack)
+    public void Post(string methodName, string jsonString, Action<string> CallBack)
     {
-        string url = baseUrl + methodName;
-        Debug.Log(url + jsonString);
-
-        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
-        {
-            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
-            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
-            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
-
-            webRequest.SetRequestHeader("authorization", token);
-            foreach (var v in requestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-                Debug.Log(v.Value + "   " + methodName);
-            }
-            yield return webRequest.SendWebRequest();
-
-            if (webRequest.isHttpError || webRequest.isNetworkError)
-            {
-                CallBack?.Invoke("UnityWebRequest Error");
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + methodName);
-                //GameManager.Instance.text2.text = webRequest.error;
-            }
-            else
-            {
-                Debug.Log(webRequest.downloadHandler.text);
-                CallBack(webRequest.downloadHandler.text);
-
-            }
-        }
+        StartCoroutine(SendHttp(methodName, jsonString, CallBack));
     }
-
-    public void PostSnInfo(string methodName, string jsonString, int index, Action<int, string> CallBack)
+    public void GetAllMaterials(string methodName, string jsonString, Action<String> CallBack)
     {
-        StartCoroutine(PostnInfoRequest(methodName, jsonString, index, CallBack));
+        StartCoroutine(SendHttp(methodName, "", CallBack,false));
     }
-    public IEnumerator PostnInfoRequest(string methodName, string jsonString, int index, Action<int, string> CallBack)
-    {
-        string url = baseUrl + methodName;
-        Debug.Log("URL:" + url);
-
-        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
-        {
-            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
-            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
-            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
-
-            webRequest.SetRequestHeader("authorization", token);
-            foreach (var v in requestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-                //Debug.Log(v.Value + "   " + methodName);
-            }
-            yield return webRequest.SendWebRequest();
 
-            if (webRequest.isHttpError || webRequest.isNetworkError)
-            {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + methodName);
-                //GameManager.Instance.text2.text = webRequest.error;
-            }
-            else
-            {
-                Debug.Log(webRequest.downloadHandler.text);
-                CallBack(index, webRequest.downloadHandler.text);
-
-            }
-        }
+    /// <summary>
+    ///  登录 
+    /// </summary>
+    /// <param name="methodName"></param>
+    /// <param name="jsonString"></param>
+    /// <param name="CallBack"></param>
+    public void PostLogin(string methodName, string jsonString, Action<string> CallBack)
+    {
+        StartCoroutine(SendHttp(methodName, jsonString, CallBack));
     }
 
-    public IEnumerator PostRequestSpoitDetail(string methodName, string jsonString, Action<string> CallBack)
+    public void initHead()
     {
-        string url = baseUrl + methodName;
-        Debug.Log(url);
-
-        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
+        requestHeader.Clear();
+        if (UserInfo.Instance.Token!="" && UserInfo.Instance.Token!=null)
         {
-            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
-            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
-            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
-
-            webRequest.SetRequestHeader("authorization", token);
-            foreach (var v in requestHeader)
-            {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-                //Debug.Log(v.Value + "   " + methodName);
-            }
-            yield return webRequest.SendWebRequest();
-
-            if (webRequest.isHttpError || webRequest.isNetworkError)
-            {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + methodName);
-                //GameManager.Instance.text2.text = webRequest.error;
-            }
-            else
-            {
-                //Debug.Log(webRequest.downloadHandler.text);
-                CallBack(webRequest.downloadHandler.text);
-
-            }
+            requestHeader.Add("x-token", UserInfo.Instance.Token);
+            requestHeader.Add("authorization", UserInfo.Instance.Token);
         }
+        requestHeader.Add("Content-Type", "application/json");
     }
 
-
-    public void Post(string methodName, string jsonString, Action<string> CallBack)
-    {
-        StartCoroutine(PostRequest(methodName, jsonString, CallBack));
-    }
-
-    // 
-    private IEnumerator PostRequest(string methodName, string jsonString, Action<string> CallBack)
+    public IEnumerator SendHttp(string methodName, string jsonString, Action<string> CallBack,bool isPost=true,bool isCloud=false)
     {
-        string url = baseUrl + methodName;
-        //Debug.Log(url);
-
-        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
+        Debug.Log("Start Queue SendHttp " + methodName);
+        string url;
+        if (methodName.Contains("http"))
         {
-            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
-            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
-            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
-
-            webRequest.SetRequestHeader("authorization", token);
-            foreach (var v in requestHeader)
+            url =methodName;
+        }
+        else
+        {
+            if(isCloud)
+            {  
+                url = UrlPointCloud + methodName;
+            }else
             {
-                webRequest.SetRequestHeader(v.Key, v.Value);
-                //Debug.Log(v.Value + "   " + methodName);
-            }
-            yield return webRequest.SendWebRequest();
+                if(is20)
+                {
+                    url = baseUrl20 + methodName;
 
-            if (webRequest.isHttpError || webRequest.isNetworkError)
-            {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + methodName);
-                //GameManager.Instance.text2.text = webRequest.error;
-            }
-            else
-            {
-                //Debug.Log(webRequest.downloadHandler.text);
-                CallBack(webRequest.downloadHandler.text);
+                }
+                else
+                {
+                    url = baseUrl + methodName;
 
+                }
             }
-        }
-    }
 
-    public void GetAllMaterials(string methodName, string jsonString, Action<String> CallBack)
-    {
-        StartCoroutine(GetRequest(methodName, jsonString, CallBack));
-    }
-    private IEnumerator GetRequest(string methodName, string jsonString, Action<String> CallBack)
-    {
-        string url = baseUrl + methodName;
-        //Debug.Log("URL:"+url);
-        token = jsonString;
-        HeadAddToken(token);
-        using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
+        }
+        Debug.Log("URL:" + url+" isPost  "+ isPost);
+        UnityWebRequest webRequest;
+        if (!isPost)
         {
-            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
-            webRequest.SetRequestHeader("authorization", jsonString);
-            foreach (var v in requestHeader)
-            {
-                //Debug.Log(v.Key + "    " + v.Value);
-                webRequest.SetRequestHeader(v.Key, v.Value);
-            }
-            yield return webRequest.SendWebRequest();
+            webRequest = UnityWebRequest.Get(url);
 
-            if (webRequest.isHttpError || webRequest.isNetworkError)
+        }
+        else
+        {
+            webRequest = new UnityWebRequest(url, "POST");
+        }
+        initHead();
+        using (webRequest)
+        {
+            if (!isPost)
             {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
-
+                webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+                foreach (var v in requestHeader)
+                {
+                    webRequest.SetRequestHeader(v.Key, v.Value);
+                }
             }
             else
             {
-                //Debug.Log(webRequest.downloadHandler.text);
-                CallBack(webRequest.downloadHandler.text);
+                byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
+                webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+                webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
             }
-        }
-    }
-
-    /// <summary>
-    ///  登录 
-    /// </summary>
-    /// <param name="methodName"></param>
-    /// <param name="jsonString"></param>
-    /// <param name="CallBack"></param>
-    public void PostLogin(string methodName, string jsonString, Action<string> CallBack)
-    {
-        StartCoroutine(PostRequestLogin(methodName, jsonString, CallBack));
-    }
-    private IEnumerator PostRequestLogin(string methodName, string jsonString, Action<string> CallBack)
-    {
-        string url = baseUrl + methodName;
-        Debug.Log("URL:" + url);
-
-        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
-        {
-            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
-            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
-            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
 
             foreach (var v in requestHeader)
             {
@@ -355,7 +166,7 @@ public class HttpTool : MonoSingleton<HttpTool>
 
             if (webRequest.isHttpError || webRequest.isNetworkError)
             {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
+                Debug.LogError(url + "\n" + webRequest.error + "\n" + webRequest.downloadHandler.text);
                 string error = webRequest.downloadHandler.text;
                 JObject jObject = JObject.Parse(error);
                 CallBack(jObject["message"].ToString());
@@ -365,47 +176,11 @@ public class HttpTool : MonoSingleton<HttpTool>
                 //Debug.Log(webRequest.downloadHandler.text);
                 var mes = webRequest.downloadHandler.text;
 
-                JObject obj = JObject.Parse(mes);
-                if (obj["code"].ToString() == "200")
-                {
-                    //Debug.Log(obj["data"]["token"].ToString());
-                    token = obj["data"]["token"].ToString();
-                    //Debug.Log(mes);
-                }
                 CallBack(mes);
             }
         }
-    }
-
-
-    ///// <summary>
-    /////  获取本地Sprite
-    ///// </summary>
-    ///// <param name="mObj"></param>
-    ///// <param name="CallBack"></param>
-    //public void GetLocalSprite(DownLoadMaterial mObj, Action<DownLoadMaterial, object> CallBack)
-    //{
-    //    StartCoroutine(GetSpriteRequest(mObj, CallBack));
-    //}
-
-    //private IEnumerator GetSpriteRequest(DownLoadMaterial mObj, Action<DownLoadMaterial, object> CallBack)
-    //{
-    //    UnityWebRequest request = UnityWebRequestTexture.GetTexture(mObj.mObj.localSavePath);
-    //    yield return request.SendWebRequest();
-    //    if (request.isNetworkError || request.isHttpError)
-    //    {
-    //        Debug.LogError(request.error);
-    //    }
-    //    else
-    //    {
-    //        Texture2D texture = DownloadHandlerTexture.GetContent(request);
-    //        Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
-    //        CallBack(mObj, sprite);
-    //        // LoadManager.Instance.DownLoadEnd(mObj, sprite);
-    //    }
-    //}
-
 
+    }
     public void HeadAddToken(string token)
     {
         requestHeader.Add("x-token", token);

Assets/Scripts/UI/LoginPanel.cs

@@ -292,7 +292,16 @@ public class LoginPanel : BaseUI
         sendLogin.password = m_PasswordStr;
         string jsonLogin = JsonMapper.ToJson(sendLogin);
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.login);
-        HttpTool.Instance.PostLogin("/user/login", jsonLogin, LoginCallBack);
+
+        HttpTool.is20 = true;
+        if(HttpTool.is20)
+        {
+            HttpTool.Instance.PostLogin("/user/login", jsonLogin, LoginCallBack);
+        }
+        else
+        {
+            HttpTool.Instance.PostLogin("/user/login", jsonLogin, LoginCallBack);
+        }
     }
 
     /// <summary>
@@ -314,9 +323,9 @@ public class LoginPanel : BaseUI
         }
         else
         {
-            var token = obj["data"]["token"].ToString();
+            UserInfo.Instance.Token = obj["data"]["token"].ToString();
             UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.getMaterialValue);
-            StartCoroutine(GetAllMaterials(token));
+            StartCoroutine(GetAllMaterials(UserInfo.Instance.Token));
         }
     }
 
@@ -371,17 +380,16 @@ public class LoginPanel : BaseUI
             //API_GSXR_Slam.SlamManager.plugin.SN;
             sendNet.projectId = scenes[i].id;
             string jsonData = JsonMapper.ToJson(sendNet);
-
-            yield return StartCoroutine(HttpTool.Instance.PostnInfoRequest("/client/snInfo", jsonData, i, (index, message) =>
+            yield return StartCoroutine(HttpTool.Instance.SendHttp("/client/snInfo", jsonData, (message) =>
             {
                 JObject jobject = JObject.Parse(message);
                 if (jobject["code"].ToString() == "200")
                 {
-                    sucessvalues.Add(scenes[index]);
+                    sucessvalues.Add(scenes[i]);
                 }
                 else
                 {
-                    failevalues.Add(scenes[index]);
+                    failevalues.Add(scenes[i]);
                 }
             }));
         }

Assets/Scripts/UI/SceneChoose.cs

@@ -96,7 +96,7 @@ public class SceneChoose : BaseUI
                          }
                      }
                  }
-             });
+             },true);
 
             DownLoadFile(detail.id,"json");
             DownLoadFile(detail.id,"bytes");
@@ -227,7 +227,7 @@ public class SceneChoose : BaseUI
             detail.id = spoits[i].id;
             string jsonString = JsonConvert.SerializeObject(detail);
 
-            yield return StartCoroutine(HttpTool.Instance.PostRequestSpoitDetail("/viewpoint/detail", jsonString, (message) =>
+            yield return StartCoroutine(HttpTool.Instance.SendHttp("/viewpoint/detail", jsonString, (message) =>
             {
                 Debug.Log("当前选择场景数据： " + message);
                 JObject jObject = JObject.Parse(message);