From 440b773823771fd39ddf2b048a76a8765170a997 Mon Sep 17 00:00:00 2001
From: huangwei <983142558@qq.com>
Date: Sat, 14 Sep 2024 14:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E6=B5=8B=E6=9B=B4=E6=96=B0common=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8B=AC=E6=9C=89=E4=B8=89=E5=9B=9B=E7=AD=89?=
 =?UTF-8?q?=E9=99=90=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 13 +++++++++----
 control_common   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

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