update wechat file system

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/WechatFileSystem.cs

@@ -1,9 +1,9 @@
 #if UNITY_WEBGL && WEIXINMINIGAME
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using YooAsset;
 using WeChatWASM;
-using System;
 
 public static class WechatFileSystemCreater
 {
@@ -55,9 +55,9 @@ internal class WechatFileSystem : IFileSystem
     /// <summary>
     /// Key:资源包GUID Value:缓存路径
     /// </summary>
-    private readonly Dictionary<string, string> _wxFilePaths = new Dictionary<string, string>(10000);
+    private readonly Dictionary<string, string> _cacheFilePaths = new Dictionary<string, string>(10000);
     private WXFileSystemManager _wxFileSystemMgr;
-    private string _wxFileCacheRoot = string.Empty;
+    private string _fileCacheRoot = string.Empty;
 
     /// <summary>
     /// 包裹名称
@@ -71,7 +71,7 @@ internal class WechatFileSystem : IFileSystem
     {
         get
         {
-            return _wxFileCacheRoot;
+            return _fileCacheRoot;
         }
     }
 
@@ -86,12 +86,12 @@ internal class WechatFileSystem : IFileSystem
         }
     }
 
-#region 自定义参数
+    #region 自定义参数
     /// <summary>
     /// 自定义参数：远程服务接口
     /// </summary>
     public IRemoteServices RemoteServices { private set; get; } = null;
-#endregion
+    #endregion
 
 
     public WechatFileSystem()
@@ -121,7 +121,6 @@ internal class WechatFileSystem : IFileSystem
         OperationSystem.StartOperation(PackageName, operation);
         return operation;
     }
-
     public virtual FSClearUnusedBundleFilesOperation ClearUnusedBundleFilesAsync(PackageManifest manifest)
     {
         var operation = new WXFSClearUnusedBundleFilesAsync(this, manifest);
@@ -172,8 +171,8 @@ internal class WechatFileSystem : IFileSystem
         }
 
         _wxFileSystemMgr = WX.GetFileSystemManager();
-        _wxFileCacheRoot = PathUtility.Combine(WX.PluginCachePath, $"StreamingAssets/WebGL");// WX.PluginCachePath; //注意：如果有子目录，请修改此处！
-        Debug.Log($"==_wxFileCacheRoot=={_wxFileCacheRoot}");
+        _fileCacheRoot = WX.env.USER_DATA_PATH; //注意：如果有子目录，请修改此处！
+        //_fileCacheRoot = PathUtility.Combine(WX.PluginCachePath, $"StreamingAssets/WebGL");
     }
     public virtual void OnUpdate()
     {
@@ -185,16 +184,14 @@ internal class WechatFileSystem : IFileSystem
     }
     public virtual bool Exists(PackageBundle bundle)
     {
-        string filePath = GetWXFileLoadPath(bundle);
-        //Debug.Log($"CacheFile:{WX.GetCachePath($"StreamingAssets/WebGL/v1.0.0/{bundle.FileName}")}");
-        return CheckWXFileIsExist(filePath);
+        string filePath = GetCacheFileLoadPath(bundle);
+        return CheckCacheFileExist(filePath);
     }
     public virtual bool NeedDownload(PackageBundle bundle)
     {
         if (Belong(bundle) == false)
             return false;
 
-        //Debug.Log($"WX NeedDownload: bundleName:{bundle.BundleName} + Exists:{Exists(bundle)}");
         return Exists(bundle) == false;
     }
     public virtual bool NeedUnpack(PackageBundle bundle)
@@ -208,111 +205,36 @@ internal class WechatFileSystem : IFileSystem
 
     public virtual byte[] ReadFileData(PackageBundle bundle)
     {
-        throw new System.NotImplementedException();
-    }
-    public virtual string ReadFileText(PackageBundle bundle)
-    {
-        throw new System.NotImplementedException();
-    }
-
-    public byte[] ReadFileData(string filePath)
-    {
-        if (CheckWXFileIsExist(filePath))
+        string filePath = GetCacheFileLoadPath(bundle);
+        if (CheckCacheFileExist(filePath))
             return _wxFileSystemMgr.ReadFileSync(filePath);
         else
             return Array.Empty<byte>();
-        //throw new System.NotImplementedException();
     }
-
-    public string ReadFileText(string filePath)
+    public virtual string ReadFileText(PackageBundle bundle)
     {
-        if(CheckWXFileIsExist(filePath))
+        string filePath = GetCacheFileLoadPath(bundle);
+        if (CheckCacheFileExist(filePath))
             return _wxFileSystemMgr.ReadFileSync(filePath, "utf8");
         else
             return string.Empty;
-        //throw new System.NotImplementedException();
     }
 
-    /// <summary>
-    /// 获取所有缓存文件的路径
-    /// </summary>
-    /// <returns></returns>
-    public Dictionary<string,string> GetWXAllCacheFilePath() 
-    {
-        return _wxFilePaths;
-    }
-    /// <summary>
-    /// 判断微信缓存文件是否存在
-    /// </summary>
-    /// <param name="filePath"></param>
-    /// <returns></returns>
-    public bool CheckWXFileIsExist(string filePath)
+    #region 内部方法
+    public bool CheckCacheFileExist(string filePath)
     {
         string result = _wxFileSystemMgr.AccessSync(filePath);
         return result.Equals("access:ok");
     }
-#region 调用微信小游戏接口删除缓存文件目录下所有文件
-    public void ClearAllCacheFile()
+    public string GetCacheFileLoadPath(PackageBundle bundle)
     {
-#if !UNITY_EDITOR && UNITY_WEBGL && WEIXINMINIGAME
-        ShowModalOption showModalOp = new ShowModalOption();
-        showModalOp.title = "提示";
-        showModalOp.content = "是否确定要清理缓存并重启";
-        showModalOp.confirmText = "确定";
-        showModalOp.cancelText = "取消";
-        showModalOp.complete = (GeneralCallbackResult callResult) => { Debug.Log($"complete==={callResult.errMsg}"); };
-        showModalOp.fail = (GeneralCallbackResult callResult) => { Debug.Log($"fail==={callResult.errMsg}"); };
-        showModalOp.success = (ShowModalSuccessCallbackResult callResult) =>
-        { 
-            if(callResult.confirm)
-                RestartMiniGame(); 
-        };
-        WX.ShowModal(showModalOp);
-#endif
-    }
-
-    /// <summary>
-    /// 微信小游戏清除缓存并且重启小游戏
-    /// 参考小游戏=>出发吧麦芬
-    /// </summary>
-    private void RestartMiniGame()
-    {
-        WX.CleanAllFileCache((bool isOk) =>
+        if (_cacheFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
         {
-            RestartMiniProgramOption restartMini = new RestartMiniProgramOption();
-            restartMini.complete = RestartMiniComplete;
-            restartMini.fail = RestartMiniFailComplete;
-            restartMini.success = RestartMiniSuccComplete;
-            WX.RestartMiniProgram(restartMini);
-        });
-    }
-
-    private void RestartMiniComplete(GeneralCallbackResult result)
-    {
-        Debug.Log($"RestartMiniComplete:{result.errMsg}");
-    }
-
-    private void RestartMiniFailComplete(GeneralCallbackResult result)
-    {
-        Debug.Log($"RestartMiniFailComplete:{result.errMsg}");
-    }
-
-    private void RestartMiniSuccComplete(GeneralCallbackResult result)
-    {
-        Debug.Log($"RestartMiniSuccComplete:{result.errMsg}");
-    }
-
-#endregion
-#region 内部方法
-    private string GetWXFileLoadPath(PackageBundle bundle)
-    {
-        if (_wxFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
-        {
-            filePath = PathUtility.Combine(_wxFileCacheRoot, bundle.FileName);
-            _wxFilePaths.Add(bundle.BundleGUID, filePath);
+            filePath = PathUtility.Combine(_fileCacheRoot, bundle.FileName);
+            _cacheFilePaths.Add(bundle.BundleGUID, filePath);
         }
         return filePath;
     }
-#endregion
+    #endregion
 }
 #endif