diff --git a/app/build.gradle b/app/build.gradle index 2c6af71..85f1f64 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,8 @@ import com.bingce.App import com.bingce.Libs import com.bingce.ModuleName +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'kotlin-kapt' @@ -16,8 +18,11 @@ android { namespace App.ControlNetwork.applicationId defaultConfig { - versionName "1.0.1" - versionCode 1 + def currentDate = new SimpleDateFormat(".yy.M.d").format(new Date()) + def code = new SimpleDateFormat("yyyyMMdd").format(new Date()).toInteger() + + versionName "1.1${currentDate}" + versionCode code applicationId "com.bingce.controlnetwork.pla" minSdkVersion AndroidSdk.minSdkVersion targetSdkVersion AndroidSdk.targetSdkVersion @@ -61,9 +66,9 @@ android { applicationVariants.all { variant -> variant.outputs.all { - def createTime = new Date().format("YYYY-MM-dd-HH-mm-ss", TimeZone.getTimeZone("GMT+08:00")) + def createTime = new Date().format("HH-mm-ss", TimeZone.getTimeZone("GMT+08:00")) // app包名称 - outputFileName = "app_v" + defaultConfig.versionName + "_" + createTime + ".apk" + outputFileName = "pla_v" + defaultConfig.versionName + "_" + createTime + ".apk" } } } diff --git a/control_common b/control_common index 2c900a8..50dbeba 160000 --- a/control_common +++ b/control_common @@ -1 +1 @@ -Subproject commit 2c900a8568c9ff845af01c2f6113c531119b4aee +Subproject commit 50dbeba04ff4e7349013d00fb8e1015989f1d682