From: snickersun <scy@incartech.cn>
Date: Wed, 21 Oct 2020 11:36:46 +0000 (+0800)
Subject: release IcAkLauncher V161
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=7cc8f8d3925f0973acccd1602cc1568ed22480ab;p=aklauncher.git

release IcAkLauncher V161
打开release版日志。
---

diff --git a/app/build.gradle b/app/build.gradle
index 76bbd70..263f929 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,22 @@
 apply plugin: 'com.android.application'
-
+static def getL02ApkBaseName() {
+    return "ICAkLauncher"
+}
 android {
 
+    def currentVersionCode = getVersionCode()
+    def currentVersionName = releaseTime()
+    def buildVersionType = 0
+
     compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         applicationId "com.ic.ak.launcher"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode currentVersionCode
+        versionName "${currentVersionName}"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
@@ -45,30 +52,6 @@ android {
         }
     }
 
-    productFlavors{
-
-        IcA9Launcher{
-            flavorDimensions "IcA9Launcher"
-            versionCode 1
-            versionName "5.0"
-            buildConfigField "int", "productType", "1002"
-
-        }
-        IcA9LauncherCN{
-            flavorDimensions "IcA9LauncherCN"
-            versionCode 1
-            versionName "5.0"
-            buildConfigField "int", "productType", "1003"
-
-        }
-        IcAkLauncher{
-            flavorDimensions "IcAkLauncher"
-            versionCode 1
-            versionName "6.0"
-            buildConfigField "int", "productType", "1001"
-        }
-    }
-
     buildTypes {
         release {
             zipAlignEnabled true     // zip 对齐优化
@@ -90,14 +73,33 @@ android {
     android.applicationVariants.all { variant ->
         variant.outputs.all {
             if (variant.buildType.name == "release") {
-                outputFileName = "${variant.getFlavorName()}_V${versionCode}_${versionName}_${releaseTime()}_release.apk"
+                outputFileName = "${getL02ApkBaseName()}_V${currentVersionCode}_${currentVersionName}_release.apk"
             } else {
-                outputFileName = "${variant.getFlavorName()}_V${versionCode}_${versionName}_${releaseTime()}_debug.apk"
+                outputFileName = "${getL02ApkBaseName()}_V${currentVersionCode}_${currentVersionName}_debug.apk"
             }
         }
     }
 }
 
+def getVersionCode() {
+    def versionCodeFile = file('version_code.properties')
+    if (versionCodeFile.canRead()) {
+        Properties properties = new Properties()
+        properties.load(new FileInputStream(versionCodeFile))
+        def versionCode = properties['VERSION_CODE'].toInteger()//读取version_code.properties文件存放的版本号。
+        def runTasks = gradle.startParameter.taskNames
+        def task = ':app:assembleRelease'
+        if (task in runTasks) {
+            properties['VERSION_CODE'] = (++versionCode).toString()
+            properties.store(versionCodeFile.newWriter(), null)
+        }
+
+        return versionCode
+    } else {
+        throw new GradleException("无法读取version_code.properties文件！")
+    }
+}
+
 static def releaseTime() {
     return new Date().format("yyyyMMddHHmm", TimeZone.getTimeZone("GMT+08:00"))
 }
diff --git a/app/release/ICAkLauncher_V161_202010211934_release.apk b/app/release/ICAkLauncher_V161_202010211934_release.apk
new file mode 100644
index 0000000..4ab0614
Binary files /dev/null and b/app/release/ICAkLauncher_V161_202010211934_release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 0000000..daf8a38
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.ic.ak.launcher",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 161,
+      "versionName": "202010211934",
+      "enabled": true,
+      "outputFile": "ICAkLauncher_V161_202010211934_release.apk"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/ak/launcher/util/IcLog.java b/app/src/main/java/com/ic/ak/launcher/util/IcLog.java
index 5d8415f..3d2f5b7 100644
--- a/app/src/main/java/com/ic/ak/launcher/util/IcLog.java
+++ b/app/src/main/java/com/ic/ak/launcher/util/IcLog.java
@@ -12,7 +12,7 @@ import com.ic.ak.launcher.BuildConfig;
 public class IcLog {
 
     private static final String DOT = ".";
-    private static boolean isDebug = BuildConfig.DEBUG;
+    private static boolean isDebug = true;//BuildConfig.DEBUG;
     private static String tagHead = "";
 
     public static void v(String tag, String msg) {
diff --git a/app/version_code.properties b/app/version_code.properties
new file mode 100644
index 0000000..fb82437
--- /dev/null
+++ b/app/version_code.properties
@@ -0,0 +1,2 @@
+#Wed Oct 21 19:34:49 CST 2020
+VERSION_CODE=161