优化编译脚本

app/build.gradle

@@ -42,29 +42,10 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
-            android.applicationVariants.all { variant ->
-                variant.outputs.all { output ->
-                    if (outputFileName.endsWith('.apk')) {
-                        def fileName = "mpapp_v${defaultConfig.versionName}_rel_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
-                        outputFileName = fileName
-                    }
-                }
-            }
         }
         debug {
             jniDebuggable true
             testCoverageEnabled false
-
-            android.applicationVariants.all { variant ->
-                variant.outputs.all { output ->
-                    if (outputFileName.endsWith('.apk')) {
-                        def fileName = "mpapp_v${defaultConfig.versionName}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
-                        outputFileName = fileName
-                    }
-                }
-            }
-
         }
     }
 
@@ -84,6 +65,20 @@ android {
             version '3.22.1'
         }
     }
+
+    android.applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            if (outputFileName.endsWith('.apk')) {
+                def buildTypeFlag = "dbg"
+                if(variant.buildType.name.equals('release')) {
+                    buildTypeFlag = "rel"
+                }
+                def fileName = "mpapp_v${defaultConfig.versionName}_${buildTypeFlag}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
+                outputFileName = fileName
+            }
+        }
+    }
+
     buildFeatures {
         viewBinding true
     }

mpmaster/build.gradle

@@ -28,25 +28,21 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
-            android.applicationVariants.all { variant ->
-                variant.outputs.all { output ->
-                    if (outputFileName.endsWith('.apk')) {
-                        def fileName = "MpMaster_v${defaultConfig.versionName}_rel_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
-                        outputFileName = fileName
-                    }
-                }
-            }
         }
         debug {
             jniDebuggable true
-            android.applicationVariants.all { variant ->
+        }
-                variant.outputs.all { output ->
+    }
-                    if (outputFileName.endsWith('.apk')) {
+
-                        def fileName = "MpMaster_v${defaultConfig.versionName}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
+    android.applicationVariants.all { variant ->
-                        outputFileName = fileName
+        variant.outputs.all { output ->
-                    }
+            if (outputFileName.endsWith('.apk')) {
+                def buildTypeFlag = "dbg"
+                if(variant.buildType.name.equals('release')) {
+                    buildTypeFlag = "rel"
                 }
+                def fileName = "MpMaster_v${defaultConfig.versionName}_${buildTypeFlag}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
+                outputFileName = fileName
             }
         }
     }