!199 修复Hap包中引用资源保留异常的问题

Merge pull request !199 from HanSY/dev

src/file_manager.cpp

@@ -42,7 +42,7 @@ uint32_t FileManager::ScanModules(const vector<string> &inputs, const string &ou
     if (!noBaseResource.empty()) {
         ResourceUtil::PrintWarningMsg(noBaseResource);
     }
-    return isHar || scanHap_ ? RESTOOL_SUCCESS : ParseReference(output);
+    return isHar ? RESTOOL_SUCCESS : ParseReference(output);
 }
 
 uint32_t FileManager::MergeResourceItem(const map<int64_t, vector<ResourceItem>> &resourceInfos)

src/generic_compiler.cpp

@@ -29,6 +29,7 @@ GenericCompiler::GenericCompiler(ResType type, const string &output, bool isOver
     : IResourceCompiler(type, output, isOverlap)
 {
 }
+
 GenericCompiler::~GenericCompiler()
 {
 }

src/reference_parser.cpp

@@ -70,6 +70,9 @@ uint32_t ReferenceParser::ParseRefInResources(map<int64_t, vector<ResourceItem>>
 {
     for (auto &iter : items) {
         for (auto &resourceItem : iter.second) {
+            if (resourceItem.IsCoverable()) {
+                continue;
+            }
             if (IsElementRef(resourceItem) && ParseRefInResourceItem(resourceItem) != RESTOOL_SUCCESS) {
                 return RESTOOL_ERROR;
             }