openharmony/developtools_global_resource_tool
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_global_resource_tool.git synced 2026-07-20 22:47:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

代码规范整改

Browse Source 
Signed-off-by: chencheng31 <chencheng8@huawei.com>
This commit is contained in:
chencheng31
2022-03-26 15:04:06 +08:00
parent 054e9befb7
commit 0dd120ad36
9 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file_manager.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ uint32_t FileManager::ScanModules(const vector<string> &inputs, const string &ou
uint32_t FileManager::ScanIncrement(const string &output)
{
auto &incrementManager = IncrementManager::GetInstance();
alls_ = incrementManager.GetResourceItems();
items_ = incrementManager.GetResourceItems();
vector<string> sxmlFolders;
FilterRefSolidXml(output, sxmlFolders, incrementManager.GetScanDirs());
return ParseReference(output, sxmlFolders);
@@ -67,14 +67,14 @@ uint32_t FileManager::ScanModule(const string &input, const string &output,
uint32_t FileManager::MergeResourceItem(const map<int32_t, vector<ResourceItem>> &resourceInfos)
{
return ResourceModule::MergeResourceItem(alls_, resourceInfos);
return ResourceModule::MergeResourceItem(items_, resourceInfos);
}
uint32_t FileManager::ParseReference(const string &output, const vector<string> &sxmlFolders)
{
ReferenceParser referenceParser;
if (referenceParser.ParseRefInSolidXml(sxmlFolders) != RESTOOL_SUCCESS ||
referenceParser.ParseRefInElement(alls_) != RESTOOL_SUCCESS ||
referenceParser.ParseRefInElement(items_) != RESTOOL_SUCCESS ||
referenceParser.ParseRefInProfile(output) != RESTOOL_SUCCESS) {
return RESTOOL_ERROR;
}