openharmony/global_resource_management
1
0
Fork 0
mirror of https://gitee.com/openharmony/global_resource_management synced 2024-11-23 16:09:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

系统资源加载优化

Browse Source 
Signed-off-by: fangyunzhong <fangyunzhong2@huawei.com>
This commit is contained in:
fangyunzhong 2024-04-10 12:52:39 +08:00
parent 6add0fff3e
commit cc73d3e372
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/resmgr/include/system_resource_manager.h
View File

@ -59,6 +59,8 @@ private:
static const std::string SYSTEM_RESOURCE_NO_SAND_BOX_HAP_PATH;
static const std::string SYSTEM_RESOURCE_EXT_NO_SAND_BOX_HAP_PATH;
static bool LoadSystemResource(ResourceManagerImpl *impl, bool isSandbox = true);
static bool CreateSystemResourceManager(bool isSandbox = true);

14
frameworks/resmgr/src/system_resource_manager.cpp
View File

@ -36,6 +36,9 @@ const std::string SystemResourceManager::SYSTEM_RESOURCE_NO_SAND_BOX_PKG_PATH =
const std::string SystemResourceManager::SYSTEM_RESOURCE_NO_SAND_BOX_HAP_PATH = "/system/app/SystemResources" \
"/SystemResources.hap";
const std::string SystemResourceManager::SYSTEM_RESOURCE_EXT_NO_SAND_BOX_HAP_PATH = "/system/app/SystemResources" \
"/SystemResourcesExt.hap";
ResourceManagerImpl *SystemResourceManager::resourceManager_ = nullptr;
std::mutex SystemResourceManager::mutex_;
@ -98,6 +101,7 @@ bool SystemResourceManager::LoadSystemResource(ResourceManagerImpl *impl, bool i
{
std::string sysPkgNamePath = SystemResourceManager::SYSTEM_RESOURCE_PATH;
std::string sysHapNamePath = SystemResourceManager::SYSTEM_RESOURCE_PATH_COMPRESSED;
std::string sysHapExtNamePath = SystemResourceManager::SYSTEM_RESOURCE_EXT_NO_SAND_BOX_HAP_PATH;
if (!isSandbox) {
sysPkgNamePath = SystemResourceManager::SYSTEM_RESOURCE_NO_SAND_BOX_PKG_PATH;
sysHapNamePath = SystemResourceManager::SYSTEM_RESOURCE_NO_SAND_BOX_HAP_PATH;
@ -112,12 +116,18 @@ bool SystemResourceManager::LoadSystemResource(ResourceManagerImpl *impl, bool i
}
if (Utils::IsFileExist(sysHapNamePath)) {
bool result = false;
if (Utils::IsFileExist(SYSTEM_RESOURCE_OVERLAY_PATH_COMPRESSED)) {
vector<string> overlayPaths;
overlayPaths.push_back(SYSTEM_RESOURCE_OVERLAY_PATH_COMPRESSED);
return impl->AddResource(sysHapNamePath.c_str(), overlayPaths);
result = impl->AddResource(sysHapNamePath.c_str(), overlayPaths);
} else {
result = impl->AddResource(sysHapNamePath.c_str());
}
return impl->AddResource(sysHapNamePath.c_str());
if (result && Utils::IsFileExist(sysHapExtNamePath)) {
result = impl->AddResource(sysHapExtNamePath.c_str());
}
return result;
}
return false;
}