diff --git a/app/build.gradle b/app/build.gradle index 33b543a..aca5500 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -11,13 +13,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 - buildToolsVersion "30.0.3" + compileSdkVersion 33 defaultConfig { applicationId "com.casic.smarttube" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 2 versionName "1.0.1" @@ -46,18 +47,23 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { + outputFileName = "GT_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + dependencies { //基础依赖库 implementation files('libs/lite-release.aar') - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' @@ -68,23 +74,21 @@ //空白页 implementation 'com.qmuiteam:qmui:2.0.0-alpha10' implementation 'com.qmuiteam:arch:0.3.1' - //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + def vm_version = "2.5.1" //Kotlin协程 - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" + //MVVM+LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'io.github.lucksiege:pictureselector:v3.0.4' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航(高德导航和高德地图会重复,不兼容,只能选其一) - implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' - implementation 'com.amap.api:location:5.3.1' + //高德导航、定位、地图三合一 + implementation 'com.amap.api:navi-3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //返回值转换器 @@ -97,7 +101,7 @@ implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0' //官方Json解析库 - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10.1' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //图表 diff --git a/app/build.gradle b/app/build.gradle index 33b543a..aca5500 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -11,13 +13,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 - buildToolsVersion "30.0.3" + compileSdkVersion 33 defaultConfig { applicationId "com.casic.smarttube" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 2 versionName "1.0.1" @@ -46,18 +47,23 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { + outputFileName = "GT_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + dependencies { //基础依赖库 implementation files('libs/lite-release.aar') - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' @@ -68,23 +74,21 @@ //空白页 implementation 'com.qmuiteam:qmui:2.0.0-alpha10' implementation 'com.qmuiteam:arch:0.3.1' - //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + def vm_version = "2.5.1" //Kotlin协程 - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" + //MVVM+LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'io.github.lucksiege:pictureselector:v3.0.4' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航(高德导航和高德地图会重复,不兼容,只能选其一) - implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' - implementation 'com.amap.api:location:5.3.1' + //高德导航、定位、地图三合一 + implementation 'com.amap.api:navi-3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //返回值转换器 @@ -97,7 +101,7 @@ implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0' //官方Json解析库 - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10.1' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //图表 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0885263..fb4538c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,8 +16,14 @@ - - + + + + + + - variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { + outputFileName = "GT_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + dependencies { //基础依赖库 implementation files('libs/lite-release.aar') - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' @@ -68,23 +74,21 @@ //空白页 implementation 'com.qmuiteam:qmui:2.0.0-alpha10' implementation 'com.qmuiteam:arch:0.3.1' - //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + def vm_version = "2.5.1" //Kotlin协程 - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" + //MVVM+LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'io.github.lucksiege:pictureselector:v3.0.4' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航(高德导航和高德地图会重复,不兼容,只能选其一) - implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' - implementation 'com.amap.api:location:5.3.1' + //高德导航、定位、地图三合一 + implementation 'com.amap.api:navi-3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //返回值转换器 @@ -97,7 +101,7 @@ implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0' //官方Json解析库 - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10.1' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //图表 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0885263..fb4538c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,8 +16,14 @@ - - + + + + + + - variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { + outputFileName = "GT_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + dependencies { //基础依赖库 implementation files('libs/lite-release.aar') - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' @@ -68,23 +74,21 @@ //空白页 implementation 'com.qmuiteam:qmui:2.0.0-alpha10' implementation 'com.qmuiteam:arch:0.3.1' - //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + def vm_version = "2.5.1" //Kotlin协程 - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" + //MVVM+LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'io.github.lucksiege:pictureselector:v3.0.4' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航(高德导航和高德地图会重复,不兼容,只能选其一) - implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' - implementation 'com.amap.api:location:5.3.1' + //高德导航、定位、地图三合一 + implementation 'com.amap.api:navi-3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //返回值转换器 @@ -97,7 +101,7 @@ implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0' //官方Json解析库 - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10.1' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //图表 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0885263..fb4538c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,8 +16,14 @@ - - + + + + + + - variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { + outputFileName = "GT_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + dependencies { //基础依赖库 implementation files('libs/lite-release.aar') - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' @@ -68,23 +74,21 @@ //空白页 implementation 'com.qmuiteam:qmui:2.0.0-alpha10' implementation 'com.qmuiteam:arch:0.3.1' - //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + def vm_version = "2.5.1" //Kotlin协程 - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" + //MVVM+LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'io.github.lucksiege:pictureselector:v3.0.4' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航(高德导航和高德地图会重复,不兼容,只能选其一) - implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' - implementation 'com.amap.api:location:5.3.1' + //高德导航、定位、地图三合一 + implementation 'com.amap.api:navi-3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //返回值转换器 @@ -97,7 +101,7 @@ implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0' //官方Json解析库 - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10.1' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //图表 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0885263..fb4538c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,8 +16,14 @@ - - + + + + + +