optimize R file merge rules, check whether the resource is exist.

kezong · Jul 21, 2019 · 22e2a04 · 22e2a04
1 parent 56cec29
commit 22e2a04
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/source/src/main/groovy/com/kezong/fataar/RProcessor.groovy b/source/src/main/groovy/com/kezong/fataar/RProcessor.groovy
@@ -101,7 +101,9 @@ class RProcessor {
         if (rTxt.exists()) {
             rTxt.eachLine { line ->
                 def (type, subclass, name, value) = line.tokenize(' ')
-                rMap[subclass].putAt(name, type)
+                if (checkValid(subclass, name)) {
+                    rMap[subclass].putAt(name, type)
+                }
             }
         }
 
@@ -124,6 +126,24 @@ class RProcessor {
         outputStream.close()
     }
 
+    private boolean checkValid(def resourceClass, def resourceName) {
+        def file = mVersionAdapter.getSymbolFile()
+        if (!file.exists()) {
+            throw IllegalAccessException("{$file.absolutePath} not found")
+        }
+
+        def result = false
+        file.eachLine { line ->
+            def (type, subclass, name, value) = line.tokenize(' ')
+            if (resourceName == name && resourceClass == subclass) {
+                result = true
+                return
+            }
+        }
+
+        return result
+    }
+
     private Task createRFileTask(final def destFolder) {
         def task = mProject.tasks.create(name: 'createRsFile' + mVariant.name)
         task.doLast {

diff --git a/source/src/main/groovy/com/kezong/fataar/VersionAdapter.groovy b/source/src/main/groovy/com/kezong/fataar/VersionAdapter.groovy
@@ -73,4 +73,12 @@ class VersionAdapter {
             return mVariant.getMergeAssets()
         }
     }
+
+    File getSymbolFile() {
+        if (Utils.compareVersion(mGradlePluginVersion, "3.1.0") >= 0) {
+            return mProject.file(mProject.buildDir.path + '/intermediates/symbols/' + mVariant.dirName + "/R.txt")
+        } else {
+            return mProject.file(mProject.buildDir.path + '/intermediates/bundles/' + mVariant.name + "/R.txt")
+        }
+    }
 }