From 02c0189d283376058b2397c1bbfdb67f3e4c88a7 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Fri, 28 Jan 2022 21:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=A2=9E=E5=8A=A0AB?=
 =?UTF-8?q?I=E9=85=8D=E7=BD=AE=EF=BC=88=E6=8C=89CPU=E6=9E=B6=E6=9E=84?=
 =?UTF-8?q?=E5=88=86=E5=88=AB=E6=89=93=E5=8C=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a9910799..4e84a744 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,6 +27,9 @@ android {
         versionCode versionProps['versionCode'].toInteger()
         versionName versionProps['versionName']
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        //ndk {
+        //    abiFilters 'armeabi-v7a', 'x86_64'
+        //}
     }
     lintOptions {
         checkReleaseBuilds false
@@ -47,31 +50,40 @@ android {
     }
     buildTypes {
         release {
-            //minifyEnabled true
+            minifyEnabled false
             //shrinkResources true
             //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            //minifyEnabled true
+            minifyEnabled false
             //shrinkResources true
             //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
     }
-    //apk file name
+    //ABI配置——按CPU架构分别打包
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk true
+        }
+    }
+    def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4, 'universal': 5]
     android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            //def date = new Date().format("yyyyMMdd" , TimeZone.getTimeZone("Asia/Shanghai"))
-            def date = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08"))
-            if (variant.buildType.name == 'debug') {
-                outputFileName = "SmsForwarder_debug_${date}_${versionName}.apk"
-            }
-            if (variant.buildType.name == 'release') {
-                outputFileName = "SmsForwarder_release_${date}_${versionName}.apk"
-            }
+        // Assigns a different version code for each output APK.
+        variant.outputs.each {
+            output ->
+                def date = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08"))
+                def abiName = output.getFilter(com.android.build.OutputFile.ABI)
+                if (abiName == null) abiName = "universal"
+                output.versionCodeOverride = abiCodes.get(abiName, 0) * 10000 + variant.versionCode
+                output.outputFileName = "SmsForwarder_${variant.name}_${versionName}_${output.versionCodeOverride}_${date}_${abiName}.apk"
         }
     }
+
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES.txt'
         exclude 'META-INF/LICENSE.txt'
@@ -151,7 +163,7 @@ dependencies {
     //友盟统计SDK
     implementation 'com.umeng.umsdk:common:9.4.6'// 必选
     implementation 'com.umeng.umsdk:asms:1.6.0'// asms包依赖必选
-    //implementation 'com.umeng.umsdk:apm:1.5.2'// 错误分析升级为独立SDK，看crash数据请一定集成，可选
+    implementation 'com.umeng.umsdk:apm:1.5.2'// 错误分析升级为独立SDK，看crash数据请一定集成，可选
     //implementation 'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选
 
     //XUpdate
@@ -173,8 +185,10 @@ dependencies {
     //AndroidAsync
     implementation 'com.koushikdutta.async:androidasync:3.1.0'
 
+    //吐司框架：https://github.com/getActivity/ToastUtils
+    implementation 'com.github.getActivity:ToastUtils:10.3'
     //权限请求框架：https://github.com/getActivity/XXPermissions
-    //implementation 'com.github.getActivity:XXPermissions:13.2'
+    implementation 'com.github.getActivity:XXPermissions:13.2'
 
     //jetty
     implementation "org.eclipse.jetty:jetty-server:9.2.30.v20200428"