From 739d6580e5fb228c5d36867e26e2342205b82802 Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Fri, 17 Mar 2023 18:31:28 +0800
Subject: [PATCH] =?UTF-8?q?version:1.1=20update:=20bugfixes:=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 91 ++++++++++++-------
 .../activity/main/MainActivity.java           |  2 +-
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index edce63c..625af8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,13 @@
 apply plugin: 'com.android.application'
 
+static def appName() {
+    return "HomeVideoPlayer"
+}
+
+static def releaseTime() {
+    return new Date().format("yyyyMMdd-HHmmss", TimeZone.getDefault())
+}
+
 android {
     compileSdkVersion 28
     buildToolsVersion "30.0.3"
@@ -24,42 +32,63 @@ android {
             abortOnError false
         }
     }
-    //签名
-    signingConfigs {
-        debug {
-            storeFile file("src/doc/tuixin.jks")
-            storePassword "123456"
-            keyAlias "universal"
-            keyPassword "123456"
-            v2SigningEnabled false
-        }
-        release {//  签名文件
-            storeFile file("src/doc/tuixin.jks")
-            storePassword "123456"
-            keyAlias "universal"
-            keyPassword "123456"
-            v2SigningEnabled false
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            zipAlignEnabled true
-            signingConfig signingConfigs.release
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            minifyEnabled false
-            zipAlignEnabled false
-            signingConfig signingConfigs.release
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    //签名
+    signingConfigs {
+        tuixin {//  签名文件
+            storeFile file("src/doc/tuixin.jks")
+            storePassword "123456"
+            keyAlias "universal"
+            keyPassword "123456"
+            v2SigningEnabled false
+        }
+    }
+
+    buildTypes {
+        debug {
+            buildConfigField "String", "platform", '"UMTK11"'
+            versionNameSuffix "-debug"
+            //Zipalign优化
+            zipAlignEnabled true
+            minifyEnabled false
+            signingConfig signingConfigs.tuixin
+            applicationVariants.all { variant ->
+                variant.outputs.each { output ->
+                    if (outputFile != null) {
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
+                        output.outputFileName = fileName
+                    }
+                }
+            }
+        }
+
+        release {
+            buildConfigField "String", "platform", '"UMTK11"'
+            //Zipalign优化
+            zipAlignEnabled true
+            //混淆
+            minifyEnabled false
+            //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            //签名
+            signingConfig signingConfigs.tuixin
+//            将release版本的包名重命名，加上版本及日期
+            applicationVariants.all { variant ->
+                variant.outputs.each { output ->
+                    def outputFile = ""
+                    if (outputFile != null) {
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
+                        output.outputFileName = new File(outputFile, fileName)
+                    }
+                }
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java b/app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java
index e1b4f20..6878d35 100644
--- a/app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java
@@ -440,7 +440,7 @@ public class MainActivity extends BaseLightActivity implements MainAContact.Main
 
     @Override
     public void setHomeVideo(ArrayList<LocalVideoInfo> video) {
-        if (video.size() == 0) {
+        if (video == null || video.size() == 0) {
             tips.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {