From af7eb9ed7818c9778fc66f77f53a1504f3f9d967 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 04:18:35 +0000
Subject: [PATCH] 合并优化

---
 app/build.gradle |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1789858..306004b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,16 +18,14 @@
     buildTypes {
         debug{
             minifyEnabled false
-            buildConfigField 'String','HOST_IP_ADDR','"http://192.168.100.82:8080/"'
-            buildConfigField 'String','ENVIRONMENT','"release"'
-            resValue "string", "app_name", "MVVM开源项目测试"
+            buildConfigField 'String','HOST_IP_ADDR','"http://192.168.110.116:8080/"'
+            resValue "string", "app_name", "MVVM OPEN TEST"
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         release {
             minifyEnabled false
-            buildConfigField 'String','HOST_IP_ADDR','"http://192.168.100.82:8080/"'
-            buildConfigField 'String','ENVIRONMENT','"release"'
-            resValue "string", "app_name", "MVVM开源项目"
+            buildConfigField 'String','HOST_IP_ADDR','"http://192.168.100.82:8080/'
+            resValue "string", "app_name", "MVVM OPEN"
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -38,10 +36,24 @@
     buildFeatures {
         viewBinding true
     }
+    android.applicationVariants.all { variant ->
+        variant.outputs.all {
+            def viron
+
+            if (buildType.name.equals('release')) {
+                viron = "正式版";
+            }else if (buildType.name.equals('debug')) {
+                viron = "开发版";
+            }
+            outputFileName =  "MVVM开源项目-" + viron + "-v" +
+                    defaultConfig.versionName +"-" + defaultConfig.versionCode +"-" + new Date().format("MMddHHmm", TimeZone.getTimeZone("UTC"))+
+                    ".apk"
+        }
+    }
 }
 
 dependencies {
-
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
@@ -60,7 +72,11 @@
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'    //RXjava和retrofit结合
-    implementation 'com.permissionx.guolindev:permissionx:1.2.2'    //权限依赖让你推广你就发群里?没有别的群了?
+    implementation 'com.guolindev.permissionx:permissionx:1.6.0'    //权限依赖
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation 'com.facebook.rebound:rebound:0.3.6'//Rebound  “弹簧”动画效果的第三方工具包,由FaceBook
+    implementation 'com.github.zhaolei9527:BottomMenu:v1.0.1'//底部菜单弹框
+    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.2.3'//图片选择
+    implementation 'com.github.wildma:PictureSelector:1.1.1'//图片选择裁切工具
 }
\ No newline at end of file

--
Gitblit v1.9.1