修复打包Bug && 优化

wilinz · Aug 20, 2022 · 81703d2 · 81703d2
1 parent 0f6a794
commit 81703d2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/app/src/main/java/org/autojs/autojs/build/ApkBuilder.kt b/app/src/main/java/org/autojs/autojs/build/ApkBuilder.kt
@@ -96,23 +96,31 @@ class ApkBuilder(
         return this
     }
 
+    private fun getAbsolutePath(name: String): String = projectConfig!!.getAbsolutePath(name)
+
     fun copyDir(
         srcPath: String,
         relativeTargetPath: String,
-        ignoredPath: List<String> = projectConfig!!.ignoredDirs,
-        ignoredName: List<String> = emptyList()
+        ignoredPathList: List<String> = emptyList(),
     ) {
-        val ignoredPath1 = ignoredPath.map {
-            if (it.startsWith("/")) it
-            else PFiles.join(projectConfig!!.projectDirectory!!, it)
-        }
+        val ignoredPath1 = ignoredPathList.toMutableList()
+            .apply { addAll(projectConfig!!.ignoredDirs.map { getAbsolutePath(it) }) }
+            .map { path ->
+                if (File(path).isDirectory && !path.endsWith("/")) "$path/" else path
+            }
+
         val fromDir = File(srcPath)
         val toDir = File(workspacePath, relativeTargetPath)
         toDir.mkdirs()
-        val children = fromDir.listFiles() ?: return
+
+        val children = fromDir.listFiles()
+            ?.filter { file ->
+                !ignoredPath1.any {
+                    (file.path.startsWith(it) || file.canonicalFile == File(it).canonicalFile)
+                }
+            } ?: return
+
         for (child in children) {
-            val ignored = ignoredPath1.any { child.path.startsWith(it) } || ignoredName.contains(child.name)
-            if (ignored) continue
             if (child.isFile) {
                 if (child.name.endsWith(".js")) {
                     encryptToDir(child, toDir)
@@ -188,9 +196,9 @@ class ApkBuilder(
                 copyDir(
                     srcPath = file.path,
                     relativeTargetPath = relativeTo.path,
-                    ignoredPath = listOf(
-                        ProjectConfig.CONFIG_FILE_NAME,
-                        projectConfig!!.sourcePath!!
+                    ignoredPathList = listOf(
+                        getAbsolutePath(ProjectConfig.CONFIG_FILE_NAME),
+                        getAbsolutePath(projectConfig!!.sourcePath!!)
                     )
                 )
                 return@forEach

diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
@@ -46,6 +46,12 @@ data class ProjectConfig(
     var assets: List<Asset> = emptyList(),
     var signingConfig: SigningConfig = SigningConfig(),
 ) {
+
+    fun getAbsolutePath(name: String): String {
+        return if (name.startsWith("/")) name
+        else File(this.projectDirectory, name).absolutePath
+    }
+
     companion object {
 
         const val CONFIG_FILE_NAME = "project.json"
@@ -97,6 +103,7 @@ data class ProjectConfig(
         fun configFileOfDir(projectDir: String, configName: String): String {
             return PFiles.join(projectDir, configName)
         }
+
     }
 
     fun toJson(): String {

diff --git a/common/src/main/java/com/stardust/app/GlobalAppContext.kt b/common/src/main/java/com/stardust/app/GlobalAppContext.kt
@@ -30,7 +30,7 @@ object GlobalAppContext {
 
     fun set(a: Application, buildConfig: BuildConfig) {
         this.buildConfig = buildConfig
-        Log.d(TAG, buildConfig.toString())
+        Log.i(TAG, buildConfig.toString())
         sHandler = Handler(Looper.getMainLooper())
         sApplicationContext = a.applicationContext
     }