优化gradle文件

添加企业签名配置
添加企业打包文件文件自动命名

Author: wzqjava

app/build.gradle

@@ -3,27 +3,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
-def releaseTime() {
+static def releaseTime() {
     return new Date().format("yyyyMMdd-HH")
 }
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     signingConfigs {
-        debug {
-            keyAlias 'xxx'
-            keyPassword 'xxx'
-            storeFile file(rootProject.getRootDir().getAbsolutePath() + '/readapp.jks')
-            storePassword 'xxx'
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-
-        release {
-            keyAlias 'xxx'
-            keyPassword 'xxx'
-            storeFile file(rootProject.getRootDir().getAbsolutePath() + '/readapp.jks')
-            storePassword 'xxx'
+        android_studio_app {
+            keyAlias 'wzq'
+            keyPassword '123456'
+            storeFile file('/Users/wzq/workspaces/MVVMSmart-kotlin/wzq.jks')
+            storePassword '123456'
             v1SigningEnabled true
             v2SigningEnabled true
         }
@@ -36,6 +27,8 @@ android {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        flavorDimensions "default"
+        signingConfig signingConfigs.debug
     }
     dataBinding {
         enabled true
@@ -51,15 +44,15 @@ android {
         abortOnError false
     }
 
-
     buildTypes {
+
         release {
             minifyEnabled false
             //Zipalign优化
             zipAlignEnabled true
             // 移除无用的resource文件
             shrinkResources false
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.android_studio_app
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 //            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
@@ -70,6 +63,7 @@ android {
             zipAlignEnabled true
             // 移除无用的resource文件
             shrinkResources false
+            signingConfig signingConfigs.android_studio_app
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -83,18 +77,18 @@ android {
         qa {
             manifestPlaceholders = [ENVIRONMENT: "4", LOG_ENABLE: "1", CHANNEL_ID: "qa", SCREENPORTRAIT: "1", APP_VERSION: rootProject.ext.android.versionCode]
         }
-       /* huawei {
-            manifestPlaceholders = [ENVIRONMENT: "2", LOG_ENABLE: "0", CHANNEL_ID: "biaozhun", SCREENPORTRAIT: "1", APP_VERSION: rootProject.ext.android.versionCode]
-        }*/
-
+         huawei {
+             manifestPlaceholders = [ENVIRONMENT: "2", LOG_ENABLE: "0", CHANNEL_ID: "biaozhun", SCREENPORTRAIT: "1", APP_VERSION: rootProject.ext.android.versionCode]
+         }
+        flavorDimensions "default"
     }
+    buildToolsVersion = android.buildToolsVersion
     //参考：https://blog.csdn.net/lablenet/article/details/78391457
     applicationVariants.all { variant ->
         variant.outputs.all {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                def fileName = outputFileName.replace("app", "MVVMSmart")
+                def fileName = outputFileName.replace("app", "MVVMSmart-kotlin")
                 // 中段(保持不变)
-                //fileName = fileName.replace("-ceshi", "")
                 // 尾端
                 if (fileName.contains("-dev"))
                     fileName = fileName.replace(".apk", "_v${defaultConfig.versionName}_t${releaseTime()}.apk")

app/dev/debug/MVVMSmart-dev-debug_v1.0_t20200502-18.apk

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"MVVMSmart-dev-debug_v1.0_t20200502-18.apk","fullName":"devDebug","baseName":"dev-debug","dirName":""},"path":"MVVMSmart-dev-debug_v1.0_t20200502-18.apk","properties":{}}]

app/dev/debug/output.json

@@ -1,7 +1,7 @@
 package com.wzq.sample.http2.service
 
 import com.wzq.sample.bean.User
-import com.wzq.sample.http2.model.BaseResponse
+import com.wzq.sample.http2.base.BaseResponse
 import io.reactivex.Observable
 import okhttp3.RequestBody
 import retrofit2.http.Body

app/src/main/java/com/wzq/sample/data/source/http/service2/DemoApiService.kt

@@ -41,7 +41,7 @@ public Float read(JsonReader in) throws IOException {
             }
             if (in.peek() == JsonToken.STRING) {
                 String str = in.nextString();
-                if (NumberUtils.isFloatOrDouble(str)){
+                if (com.wzq.sample.http2.utils.gsontypeadapter.NumberUtils.isFloatOrDouble(str)){
                     return Float.parseFloat(str);
                 } else {
                     Log.e("TypeAdapter", str + " is not a number");

app/src/main/java/com/wzq/sample/http2/net_utils/gsontypeadapter/FloatTypeAdapter.java

@@ -42,7 +42,7 @@ public Integer read(JsonReader in)throws IOException {
             }
             if (in.peek() == JsonToken.STRING) {
                 String str = in.nextString();
-                if (NumberUtils.isIntOrLong(str)){
+                if (com.wzq.sample.http2.utils.gsontypeadapter.NumberUtils.isIntOrLong(str)){
                     return Integer.parseInt(str);
                 } else {
                     Log.e("TypeAdapter", str + " is not a int number");

app/src/main/java/com/wzq/sample/http2/net_utils/gsontypeadapter/IntegerTypeAdapter.java

@@ -43,7 +43,7 @@ public Long read(JsonReader in) throws IOException {
             }
             if (in.peek() == JsonToken.STRING) {
                 String str = in.nextString();
-                if (NumberUtils.isIntOrLong(str)){
+                if (com.wzq.sample.http2.utils.gsontypeadapter.NumberUtils.isIntOrLong(str)){
                     return Long.parseLong(str);
                 } else {
                     Log.e("TypeAdapter", str + " is not a int number");

app/src/main/java/com/wzq/sample/http2/net_utils/gsontypeadapter/LongTypeAdapter.java

@@ -5,9 +5,9 @@ import androidx.lifecycle.MutableLiveData
 import com.wzq.mvvmsmart.utils.KLog
 import com.wzq.sample.base.BaseViewModel
 import com.wzq.sample.bean.User
+import com.wzq.sample.data.source.http.service2.MRequest
 import com.wzq.sample.http2.listener.OnServerResponseListener
 import com.wzq.sample.http2.base.BaseResponse
-import com.wzq.sample.http2.service2.MRequest
 import com.wzq.sample.http2.net_utils.GsonUtil
 import java.util.*