Browse Source

下载完成后 XML Dat 回调

DGJ 1 year ago
parent
commit
a7070bebdb

+ 3 - 0
Assets/2.0/User/Trigger/VufroiaTrigger.cs

@@ -22,6 +22,9 @@ public class VufroiaTrigger
         datFile = msg["vuforiaDat"].ToString();
         LoaclxmlFile = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.xml";
         LoacldatFile = Application.persistentDataPath + "/StreamingAssets/Vuforia/GHZVuforia.dat";
+
+        Debug.Log(" DGJ ===> " + LoaclxmlFile);
+        Debug.Log(" DGJ ===>  " + LoacldatFile);
         LoadManager.Instance.loadVuforia(xmlFile, datFile,(bool b)=> {
 
             isXML = true;

+ 9 - 0
Assets/COSScripts/DownloadResManager.cs

@@ -217,6 +217,15 @@ private bool Screen(DownLoadMaterial downloadMaterial)
                 Save();
                 break;
             }
+
+            if((localFilePath.Split('.')[1]=="xml"|| localFilePath.Split('.')[1]=="dat")&&( (localFilePath.Split('.')[1] == Path.GetFileName(listNotMaterial[i].downLoadPath).Split('.')[1])))
+                {
+                listCompletedMaterial.Add(listNotMaterial[i]);
+                LocalLoadManager.Instance.LocalLoadMaterial(listNotMaterial[i]);
+                listNotMaterial.RemoveAt(i);
+                Save();
+                break;
+            }
         }
     }
 

+ 1 - 1
Assets/Resources/VuforiaConfiguration.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: VuforiaConfiguration
   m_EditorClassIdentifier: 
   vuforia:
-    vuforiaLicenseKey: AVdaifr/////AAABmTxtN/ZN0Eg+uuJIO4iBD7dsw2+y7PFk/RTJIeK591PAPZFHjA0YUX2pybiHDZk+xm0fFr2tLCDPOwMR8S/wxajuVOXUYDkGA8NlzQiNbSfQyFSEFLS92UNrOQO0dnMwsTnZKS0VUhk+Xh9bYy4Iv7lfQ8fPvG6/DSQ/qfSrn8IbZsQ3Dl2MomN1VAO5YPXSQwjCyY8Lncu6XwJXfrxZoDvBJkDDnp5NiWhlqdiYi/ZewaJyrhAE1tImEkTKR4B4bu2VE1n8qaXCEFmRGtX2SLYiCchylxYXzYnF9DwTlLOVvY/3vXnuJ8VPhaUtAM8xIrk072ZL5lvBnVJ508LHC5vzzWJcLBI8pDmS9p6BcU1D
+    vuforiaLicenseKey: 
     ufoLicenseKey: QWRvTlZRYi8vLy8vQUFBQUtFUlVmMFlNSUUyWG5CbzJUQ2JlazFZSXptZnlBb29UdzVkdGg2bmdRWjQyWjM4eEphZjZPa2VFcDlSb2xoekRPeXZCcVlKbXQvZjduby9xbjVjNVMxVnlxZ2VhNVBiVzlBTVpJRVU5TmJCaVNxcGc4QzVXdWpySEJWOVcvT1JJZGdxbmowUVp2OHR5UytzQk9CWWlMbVJaZXErTE5MWXJSUEhlNjMzWWh0NnR3Q2RxTFRVVzFtSjNacUIwYW5pYnk3S2FhK241UDVtTXZoRzUyWkZKM2VKZk9JTXZEV05WU05wOFVOY0tyalZwRDRkeEw2Y3d5cFpDWjJub09IOUxUNVNEV2xqMDRYUnZRYXZ2UTJjVlFqUkdvc2E1NjY3TFNjQ0JqTUJFaXlFRTFtbDNhbERnQUtldllOalpoVkpadVkydnl3NzU5eVhYUXl3STZIZXFsYUh2aWxwV05EaTcrZCtFZE04bTlVanI=
     delayedInitialization: 0
     cameraFocusModeSetting: 2

+ 1 - 1
Assets/Scripts/UI/LoginPanel.cs

@@ -309,7 +309,7 @@ public class LoginPanel : BaseUI
         m_AccountStr = "jiajun.hu@ghz-tech.com";
       //  m_AccountStr = "1768147286@qq.com";
         m_AccountStr = "bactest1@1.com";
-       // m_AccountStr = "advtest1@1.com";
+      //  m_AccountStr = "advtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))

+ 12 - 0
Assets/VuforiaLicense.cs

@@ -0,0 +1,12 @@
+
+            //This class is auto-generated, please do not overwrite
+
+            public class VuforiaLicense
+            {
+const string license = "QVZkYWlmci8vLy8vQUFBQm1UeHROL1pOMEVnK3V1SklPNGlCRDdkc3cyK3k3UEZrL1JUSkllSzU5MVBBUFpGSGpBMFlVWDJweWJpSERaayt4bTBmRnIydExDRFBPd01SOFMvd3hhanVWT1hVWURrR0E4Tmx6UWlOYlNmUXlGU0VGTFM5MlVOck9RTzBkbk13c1RuWktTMFZVaGsrWGg5Yll5NEl2N2xmUThmUHZHNi9EU1EvcWZTcm44SWJac1EzRGwyTW9tTjFWQU81WVBYU1F3akN5WThMbmN1Nlh3Slhmcnhab0R2QkprRERucDVOaVdobHFkaVlpL1pld2FKeXJoQUUxdEltRWtUS1I0QjRidTJWRTFuOHFhWENFRm1SR3RYMlNMWWlDY2h5bHhZWHpZbkY5RHdUbExPVnZZLzN2WG51SjhWUGhhVXRBTTh4SXJrMDcyWkw1bHZCblZKNTA4TEhDNXZ6eldKY0xCSThwRG1TOXA2QmNVMUQ=";
+
+                static string GetLicenseKey()
+                {
+                    return license;
+                }
+            }

+ 11 - 0
Assets/VuforiaLicense.cs.meta

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

+ 2 - 2
Packages/packages-lock.json

@@ -5,14 +5,14 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "226456e7e10d7ad11486d11c42e302ffcfdacce1"
+      "hash": "ec4bb2403989db8a5f491f8a9d6e5ac7c1288a67"
     },
     "com.ghz.mqtt": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "8940161beca41cc8b95219b7df02872acd1ba99a"
+      "hash": "238c8807d10555932c59dbd78f2b7f4a56faa07c"
     },
     "com.ptc.vuforia.engine": {
       "version": "file:com.ptc.vuforia.engine-10.15.4.tgz",

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -927,7 +927,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
-      EnterpriseAuthentication: False
+      CodeGeneration: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -962,8 +962,8 @@ PlayerSettings:
       Contacts: False
       Proximity: False
       InternetClient: True
-      CodeGeneration: False
       BackgroundMediaPlayback: False
+      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False