From 9dce54f32605d888b8d7d3d9c216944eb4376fb8 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Sun, 22 Jan 2023 14:23:41 +0800
Subject: [PATCH] Added appVersionNameOf, appVersionCodeOf functions and merge
 to appVersionBrandOf function in FunctionFactory

---
 .../utils/factory/FunctionFactory.kt            | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt
index fe4f3e8..520d65e 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt
@@ -141,10 +141,23 @@ fun Context.appNameOf(packageName: String = getPackageName()) =
 /**
  * 得到 APP 版本信息与版本号
  * @param packageName APP 包名 - 默认为当前 APP
+ * @return [String] 无法获取时返回 "unknown(-1)"
+ */
+fun Context.appVersionBrandOf(packageName: String = getPackageName()) = "${appVersionNameOf(packageName)}(${appVersionCodeOf(packageName)})"
+
+/**
+ * 得到 APP 版本名称
+ * @param packageName APP 包名 - 默认为当前 APP
  * @return [String] 无法获取时返回 "unknown"
  */
-fun Context.appVersionBrandOf(packageName: String = getPackageName()) =
-    getPackageInfoCompat(packageName)?.let { "${it.versionName}(${it.versionCodeCompat})" } ?: "unknown"
+fun Context.appVersionNameOf(packageName: String = getPackageName()) = getPackageInfoCompat(packageName)?.versionName ?: "unknown"
+
+/**
+ * 得到 APP 版本号
+ * @param packageName APP 包名 - 默认为当前 APP
+ * @return [Long] 无法获取时返回 -1
+ */
+fun Context.appVersionCodeOf(packageName: String = getPackageName()) = getPackageInfoCompat(packageName)?.versionCodeCompat ?: -1L
 
 /**
  * 获取 APP CPU ABI 名称