DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support loading flutter assets from dynamic patch (flutter/engine#7308)

Browse Source 
This replicates similar logic found in ApkAssetProvider that locates assets by their short name in a sudbirectory inside of an archive file, instead of only at the root of archive.
This commit is contained in:
Stanislav Baranov 2018-12-28 10:34:47 -08:00 committed by GitHub
parent 6f003dd428
commit 733d65dd7b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/assets/zip_asset_store.cc
View File

@ -22,8 +22,8 @@ void UniqueUnzipperTraits::Free(void* file) {
unzClose(file);
}
ZipAssetStore::ZipAssetStore(std::string file_path)
: file_path_(std::move(file_path)) {
ZipAssetStore::ZipAssetStore(std::string file_path, std::string directory)
: file_path_(std::move(file_path)), directory_(std::move(directory)) {
BuildStatCache();
}
@ -43,8 +43,8 @@ std::unique_ptr<fml::Mapping> ZipAssetStore::GetAsMapping(
const std::string& asset_name) const {
TRACE_EVENT1("flutter", "ZipAssetStore::GetAsMapping", "name",
asset_name.c_str());
auto found = stat_cache_.find(asset_name);
auto found = stat_cache_.find(directory_ + "/" + asset_name);
if (found == stat_cache_.end()) {
return nullptr;
}

6
engine/src/flutter/assets/zip_asset_store.h
View File

@ -23,7 +23,7 @@ using UniqueUnzipper = fml::UniqueObject<void*, UniqueUnzipperTraits>;
class ZipAssetStore final : public AssetResolver {
public:
ZipAssetStore(std::string file_path);
ZipAssetStore(std::string file_path, std::string directory);
~ZipAssetStore() override;
@ -35,7 +35,9 @@ class ZipAssetStore final : public AssetResolver {
: file_pos(p_file_pos), uncompressed_size(p_uncompressed_size) {}
};
std::string file_path_;
const std::string file_path_;
const std::string directory_;
mutable std::map<std::string, CacheEntry> stat_cache_;
// |blink::AssetResolver|

2
engine/src/flutter/shell/platform/android/platform_view_android_jni.cc
View File

@ -253,7 +253,7 @@ static void RunBundleAndSnapshotFromLibrary(JNIEnv* env,
const auto file_ext_index = bundlepath.rfind(".");
if (bundlepath.substr(file_ext_index) == ".zip") {
asset_manager->PushBack(
std::make_unique<blink::ZipAssetStore>(bundlepath));
std::make_unique<blink::ZipAssetStore>(bundlepath, "flutter_assets"));
} else {
asset_manager->PushBack(
std::make_unique<blink::DirectoryAssetBundle>(fml::OpenDirectory(