修改下载

Assets/2.0/Tools/DownLoadItem.cs

@@ -1,3 +1,4 @@
+using LitJson;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -53,16 +54,23 @@ public class DownLoadItem : MonoBehaviour
 
     public System.Collections.IEnumerator DownloadFile()
     {
-        string url = HttpAction.baseurl + HttpAction.file_download;
+        string url = HttpAction.baseurl + HttpAction.file_download ;
         if (UserInfo.Instance.is20)
         {
             url = HttpAction.baseurl + HttpAction.file_download;
         }
+        Debug.Log(url);
         using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
         {
-            byte[] bodyRaw = Encoding.UTF8.GetBytes(downLoadPath);
+            SendMaterials sendImage = new SendMaterials();
+            sendImage.url = downLoadPath;
+            string jsonImage = JsonMapper.ToJson(sendImage);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonImage);
             webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
             webRequest.SetRequestHeader("authorization", UserInfo.Instance.Token);
+            webRequest.SetRequestHeader("Content-Type", "application/json");
+           
             webRequest.SendWebRequest();
 
             while (!webRequest.isDone)
@@ -90,6 +98,19 @@ public class DownLoadItem : MonoBehaviour
             callback?.Invoke(isDownLoad);
         }
     }
+    Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
+    public void initHead()
+    {
+        requestHeader.Clear();
+        if (UserInfo.Instance.Token != "" && UserInfo.Instance.Token != null)
+        {
+            //  requestHeader.Add("x-token", UserInfo.Instance.Token);
+            Debug.Log("ADD  Token");
+            requestHeader.Add("authorization", UserInfo.Instance.Token);
+        }
+        requestHeader.Add("Content-Type", "application/json");
+    }
+
 
     private void OnDestroy()
     {

Assets/2.0/Tools/LoadManager.cs

@@ -17,15 +17,15 @@ public class LoadManager : Singleton<LoadManager>
                 for (int i = 0; i < downloadQueueList.Count; i++)
                 {
                     DownLoadItem item = downloadQueueList.Dequeue();
-                    Debug.Log("正在下载===>"+ item.name);
+                    Debug.Log("姝ｅ湪涓嬭浇===>"+ item.name);
                     item.onProgress += (float f) => {
 
-                        Debug.Log("下载进度===>" + f);
+                        Debug.Log("涓嬭浇杩涘害===>" + f);
                     };
 
                     item.callback += (bool b) => {
 
-                        Debug.Log("下载完成===>" );
+                        Debug.Log("涓嬭浇瀹屾垚===>" );
                         nowLoad--;
                     };
                    GameScene.Instance.StartCoroutine( item.DownloadFile());
@@ -52,6 +52,7 @@ public class LoadManager : Singleton<LoadManager>
             GameObject obj = new GameObject(dName);
             DownLoadItem dli = obj.AddComponent<DownLoadItem>();
             dli.Init(model.url, model.uid);
+            downList.Add(dName, dli);
         }
 
 
@@ -66,7 +67,7 @@ public class LoadManager : Singleton<LoadManager>
             {
                 if (!downList[dName].isAction)
                 {
-                    //涓嬭浇鎴愬姛骞舵棤澶勭悊
+                    //娑撳�娴囬幋鎰��楠炶埖妫ゆ径鍕�倞
                     switch (model.modelType)
                     {
                         case ModelItem.ModelType.Image:
@@ -84,7 +85,7 @@ public class LoadManager : Singleton<LoadManager>
             }
             else
             {
-                //涓嬭浇澶辫触
+                //娑撳�娴囨径杈�Е
             }
         };
     }

Assets/2.0/User/Model/ModelItem.cs

@@ -137,6 +137,10 @@ public class ModelItem
         }
         url = DownloadPath;
         this.modelList = modelList;
+       
+        if (Version == null)
+            Version = Application.version.ToString();
+
         if (Model != null)
             Debug.Log(" 添加模型 " + name);
     }

Assets/Resources/VuforiaConfiguration.asset

@@ -23,7 +23,7 @@ MonoBehaviour:
     modelTargetRecoWhileExtendedTracked: 1
     shareRecordingsInITunes: 0
     logLevel: 0
-    version: 10.13.3
+    version: 10.15.4
     eulaAcceptedVersions: '{"Values":["","0.0","10.11","10.12","10.13","8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","9.2","9.4","10.10","9.8","10.3","10.2","9.1","10.15","9.7"]}'
   database:
     disableModelExtraction: 0

Packages/packages-lock.json

@@ -251,14 +251,18 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "con.ghz.obe": {
+    "jh.immersalsdk.engine": {
-      "version": "file:D:/JiHe/OOBEPackageXR/package",
+      "version": "file:G:/GUnityProject/ImmersalSDK/package",
       "depth": 0,
       "source": "local",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.inputsystem": "1.4.2"
+      }
     },
     "jh.xr.engine": {
-      "version": "file:D:/JiHe/XRSDK/package",
+      "version": "file:G:/GUnityProject/NavigatorXRSDK/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {

ProjectSettings/ProjectSettings.asset

@@ -924,7 +924,6 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
-      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -936,6 +935,7 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
+      BackgroundMediaPlayback: False
       Objects3D: False
       RemoteSystem: False
       BlockedChatMessages: False
@@ -957,10 +957,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      Proximity: False
       InternetClient: True
+      Proximity: False
       CodeGeneration: False
-      BackgroundMediaPlayback: False
+      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False