Update AssetComponentUpdate.cs

修复在空包状态下连续对同一个分包检查更新的IO冲突
mister91jiao · Aug 8, 2023 · 91e50d1 · 91e50d1
1 parent 08b24dd
commit 91e50d1
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/BundleMasterRuntime/AssetComponentUpdate.cs b/BundleMasterRuntime/AssetComponentUpdate.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using ET;
 using UnityEngine.Networking;
 
@@ -90,9 +91,8 @@ public static async ETTask<UpdateBundleDataInfo> CheckAllBundlePackageUpdate(Dic
                 {
                     CreateUpdateLogFile(crcLogPath, null);
                 }
-                StreamWriter crcStream = new StreamWriter(crcLogPath, true);
-                crcStream.AutoFlush = false;
-                updateBundleDataInfo.PackageCRCFile.Add(bundlePackageName, crcStream);
+                //把CRCLogPath的分包名存起来
+                updateBundleDataInfo.PackageCRCFile.Add(bundlePackageName, null);
                 //获取本地的VersionLog
                 string localVersionLogExistPath = BundleFileExistPath(bundlePackageName, "VersionLogs.txt", true);
                 ETTask logTcs = ETTask.Create();
@@ -136,19 +136,14 @@ public static async ETTask<UpdateBundleDataInfo> CheckAllBundlePackageUpdate(Dic
             }
             else
             {
-                //不需要更新，关闭CRC文件写入流
-                foreach (StreamWriter sw in updateBundleDataInfo.PackageCRCFile.Values)
-                {
-                    sw.Close();
-                    sw.Dispose();
-                }
+                //如果不需要更新就清理CRC路径
                 updateBundleDataInfo.PackageCRCFile.Clear();
             }
             return updateBundleDataInfo;
         }
 
         /// <summary>
-        /// 获取所哟需要更新的Bundle的文件(不检查文件CRC)
+        /// 获取所有需要更新的Bundle的文件(不检查文件CRC)
         /// </summary>
         private static async ETTask CalcNeedUpdateBundle(UpdateBundleDataInfo updateBundleDataInfo, string bundlePackageName, string[] remoteVersionData, string[] localVersionData)
         {
@@ -394,6 +389,15 @@ public static async ETTask DownLoadUpdate(UpdateBundleDataInfo updateBundleDataI
                 AssetLogHelper.LogError("AssetLoadMode != AssetLoadMode.Build 不需要更新");
                 return;
             }
+            //打开CRCLog文件
+            List<string> bundlePackageNames = updateBundleDataInfo.PackageCRCFile.Keys.ToList();
+            foreach (string bundlePackageName in bundlePackageNames)
+            {
+                string crcLogPath = Path.Combine(AssetComponentConfig.HotfixPath, bundlePackageName, "CRCLog.txt");
+                StreamWriter crcStream = new StreamWriter(crcLogPath, true);
+                crcStream.AutoFlush = false;
+                updateBundleDataInfo.PackageCRCFile[bundlePackageName] = crcStream;
+            }
             Dictionary<string, Queue<DownLoadTask>> packageDownLoadTask = new Dictionary<string, Queue<DownLoadTask>>();
             ETTask downLoading = ETTask.Create();
             //准备需要下载的内容的初始化信息
@@ -495,4 +499,4 @@ public static async ETTask DownLoadUpdate(UpdateBundleDataInfo updateBundleDataI
 
     }
 
-}
+}