Merge branch 'jimmy_carotidshell_0821' of http://git.ius.plus/Project-Wing/fis into jimmy_carotidshell_0821

fis/Managers/Modules/Storage/FisStorageBase.cs

@@ -13,7 +13,7 @@ namespace fis.Win.Dev.Managers.modules.storage
         private string BasePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AppStorage");
         internal FisStorageBase(string storagePath)
         {
-            StoragePath =Path.Combine(BasePath, storagePath);
+            StoragePath = Path.Combine(BasePath, storagePath);
         }
         public string StoragePath { get; }
 

fis/Managers/Modules/Ultra3D/Ultra3DDownloadWorker.cs

@@ -14,6 +14,8 @@ namespace fis.Win.Dev.Managers.Modules.Ultra3D
     { 
         public string FilePath { get; set; }
 
+        public string FileUrl { get; set; }
+
         public CarotidScanType CarotidScanType { get; set; }
 
         public CarotidScanDirection CarotidScanDirection { get; set; }
@@ -97,7 +99,8 @@ namespace fis.Win.Dev.Managers.Modules.Ultra3D
                 MainMDFileReady?.Invoke(this, new MDFileArgs { 
                 FilePath= workUnion.MdFileWorkItem.FilePath,
                 CarotidScanType = info.CarotidScanType,
-                CarotidScanDirection=info.CarotidScanDirection
+                FileUrl= info.MdFileUrl,
+                CarotidScanDirection =info.CarotidScanDirection
                 });
             }
         }

fis/Managers/Modules/Ultra3D/Ultra3DFileWorkItem.cs

@@ -105,8 +105,6 @@ namespace fis.Win.Dev.Managers.Modules.Ultra3D
                 SurfaceFileCanbeAccess?.Invoke(this, DataId);
             }
 
-      
-
             //访问模型数据
 
             if (MdFileWorkItem.FileAccessStatus == FileAccessStatus.ReadyToDownload)

fis/Managers/Ultra3DManager.cs

@@ -54,7 +54,7 @@ namespace fis.Win.Dev.Managers
             lock (_lock)
             {
                 Parse3DModelManager.ParseMdl(e.FilePath, e.CarotidScanType, e.CarotidScanDirection);
-                MDFileReady(e.FilePath);
+                MDFileReady(e.FileUrl);
             }
         }
 
@@ -95,7 +95,7 @@ namespace fis.Win.Dev.Managers
 
         private void MDFileReady(string key)
         {
-            var callString = PlatFormHelper.GetMethodStr("externalNotification", TargetMethodName.MdlFileLoaded, new List<string>());
+            var callString = PlatFormHelper.GetMethodStr("externalNotification", TargetMethodName.MdlFileLoaded, new List<string>() { key});
             AvaloniaCefBrowserHelper.browser?.ExecuteJavaScript(callString, null, 0);
         }