Merge pull request #11 from c86y/master

fix：修复大图报错无法定位的问题
owenlongbo · Apr 15, 2018 · aa50073 · aa50073
2 parents 74b564b + c3bd920
commit aa50073
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/bintray.gradle b/bintray.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.jfrog.bintray'
 def siteUrl = 'https://github.com/Aweme/McImage'
 def gitUrl = 'https://github.com/Aweme/McImage.git'
 group = "com.smallsoho.mobcase"
-version = "0.1.2"
+version = "0.1.3"
 
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())

diff --git a/src/main/groovy/com/smallsoho/mcplugin/image/ImagePlugin.groovy b/src/main/groovy/com/smallsoho/mcplugin/image/ImagePlugin.groovy
@@ -89,9 +89,12 @@ class ImagePlugin implements Plugin<Project> {
                                 def file = new File("${drawDir}")
                                 if (file.name.contains('drawable') || file.name.contains('mipmap')) {
                                     file.eachFile { imgFile ->
-
-                                        if (mConfig.isCheck && ImageUtil.isBigImage(imgFile, mConfig.maxSize)) {
-                                            bigImgList.add(file.getPath() + file.getName())
+                                        if (mConfig.whiteList.contains("${file.getName()}/${imgFile.getName()}".toString())) {
+                                            return
+                                        }
+                                        if (mConfig.isCheck &&
+                                                ImageUtil.isBigImage(imgFile, mConfig.maxSize)) {
+                                            bigImgList.add(imgFile.getAbsolutePath())
                                         }
                                         if (mConfig.isCompress) {
                                             CompressUtil.compressImg(imgFile)

diff --git a/src/main/groovy/com/smallsoho/mcplugin/image/models/Config.groovy b/src/main/groovy/com/smallsoho/mcplugin/image/models/Config.groovy
@@ -7,4 +7,5 @@ class Config {
     def isWebpConvert = true
     def isJPGConvert = true
     def enableWhenDebug = true
+    Iterable<String> whiteList = []
 }