同步PD：日志系统

同步PD：6.7.1

app/build.gradle

@@ -6,9 +6,6 @@ apply plugin: 'com.alibaba.arouter'
 apply from: "../package_config.gradle"
 android {
     namespace "com.pandoralive.shayu"
-    dexOptions {
-        jumboMode = true
-    }
     /*  applicationVariants.all { variant ->
           variant.mergeAssetsProvider.configure {
               doLast {
@@ -114,10 +111,11 @@ android {
         println "清空build文件夹";
         for (final def project in rootProject.getAllprojects()) {
             def name = variant.name.replace('Debug', '').replace('Release', '').toLowerCase()
-            delete project.buildDir
-            delete 'app' + File.separator + name
-            println project.buildDir
+            //delete project.buildDir
+            delete project.rootDir.absolutePath+File.separator+"app"+File.separator+name
+            //println project.buildDir
         }
+        //delete project.rootDir.absolutePath + File.separator + "outputs"
         String variantName = variant.name.capitalize()
         def processManifestTask = project.tasks.getByName("process${variantName}Manifest")
         processManifestTask.doLast { pm ->
@@ -183,29 +181,38 @@ android {
                 }
             }
         }
-        variant.outputs.all { vt ->
-            println("输出文件名：${vt}")
+        variant.assemble.doLast { vt ->
             def channel = ''
-            def server=''
-            if (variant.name.startsWith('huawei')) {
+            def server = ''
+            if (variant.name.contains('huawei')) {
                 channel = "华为"
-            } else if (variant.name.startsWith('samsung')) {
+            } else if (variant.name.contains('samsung')) {
                 channel = "三星"
-            } else if (variant.name.startsWith('google')) {
+            } else if (variant.name.contains('google')) {
                 channel = "谷歌"
             } else {
                 channel = "链接"
             }
-            if(variant.name.contains('online')){
-                server='正式服'
-            }else{
-                server='测试服'
+            if (variant.name.contains('online')) {
+                server = '正式服'
+            } else {
+                server = '测试服'
+            }
+            def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]潘多拉-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.apk"
+            variant.outputs.forEach { fe ->
+                copy {
+                    from fe.outputFile
+                    into file("${project.rootDir}\\outputs\\apk\\")
+                    rename { fn ->
+                        fileName
+                    }
+                }
             }
-            outputFileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]潘多拉-${defaultConfig.versionName}-${channel}-${server}-${variant.buildType.name}.apk"
         }
         tasks.named("sign${variant.name.capitalize()}Bundle", com.android.build.gradle.internal.tasks.FinalizeBundleTask) {
             File file = finalBundleFile.asFile.get()
             def channel = ''
+            def server = ''
             if (variant.name.startsWith('huawei')) {
                 channel = "华为"
             } else if (variant.name.startsWith('samsung')) {
@@ -215,7 +222,13 @@ android {
             } else {
                 channel = "链接"
             }
-            File finalFile = new File(file.parentFile, "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]潘多拉-${defaultConfig.versionName}-${channel}-${variant.buildType.name}.aab")
+            if (variant.name.contains('online')) {
+                server = '正式服'
+            } else {
+                server = '测试服'
+            }
+            def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]潘多拉-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.aab"
+            File finalFile = new File("${project.rootDir}\\outputs\\aab", fileName)
             finalBundleFile.set(finalFile)
         }
         project.afterEvaluate { project ->
@@ -294,13 +307,16 @@ android {
         multiDexEnabled true
         ndk {
             // TODO: 谷歌商城需要兼容两个平台
-            println("打包版本:${rootProject.ext.manifestPlaceholders.isGooglePlay}")
-            if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
+            Gradle gradle = getGradle()
+            String tskReqStr = gradle.getStartParameter().getTaskRequests().args.toString()
+            println("处理ndk 版本 = " + tskReqStr)
+            def isLink = tskReqStr.contains("Link")
+            if (isLink) {
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-                println("链接包")
+                println("打包ndk 链接")
             } else {
                 abiFilters "armeabi-v7a", "arm64-v8a"
-                println("谷歌包")
+                println("打包ndk其他")
             }
 
         }
@@ -357,17 +373,3 @@ dependencies {
 
 
 }
-// 链接包需要注释掉 否正无法更新 谷歌包需要打开
-/*
-project.afterEvaluate {
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.processResources.doFirst { pm->
-                String manifestPath = output.processResources.manifestFile;
-                def manifestContent = file(manifestPath).getText()
-                manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '')
-                file(manifestPath).write(manifestContent)
-            }
-        }
-    }
-}*/