From c8418aaa370cf4055e6996541364d021802f9605 Mon Sep 17 00:00:00 2001
From: Quyunshuo <quyunshuo@qq.com>
Date: Mon, 13 Feb 2023 23:27:50 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=20App=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=B7=A5=E5=85=B7=E6=96=B9=E6=B3=95=EF=BC=8C=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E8=87=B3=20AppUtils.kt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/utils/AppUtils.kt                    | 45 +++++++++++++++++++
 .../androidbaseframemvvm/base/utils/Utils.kt  | 30 -------------
 2 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AppUtils.kt

diff --git a/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AppUtils.kt b/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AppUtils.kt
new file mode 100644
index 0000000..76f2634
--- /dev/null
+++ b/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AppUtils.kt
@@ -0,0 +1,45 @@
+package com.quyunshuo.androidbaseframemvvm.base.utils
+
+import android.content.pm.PackageInfo
+import android.os.Build
+import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+
+/**
+ * App 相关工具类
+ *
+ * @author Qu Yunshuo
+ * @sine 2023/2/13 23:15
+ */
+class AppUtils {
+
+    /**
+     * 获取当前 App 版本号
+     *
+     * @return Long
+     */
+    fun getAppVersionCode(): Long {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            getAppPackageInfo().longVersionCode
+        } else {
+            getAppPackageInfo().versionCode.toLong()
+        }
+    }
+
+    /**
+     * 获取当前 App 版本名
+     *
+     * @return String
+     */
+    fun getAppVersionName(): String = getAppPackageInfo().versionName
+
+    /**
+     * 获取当前 App 的 [PackageInfo]
+     *
+     * @return PackageInfo
+     */
+    fun getAppPackageInfo(): PackageInfo {
+        return BaseApplication.context
+            .packageManager
+            .getPackageInfo(BaseApplication.context.packageName, 0)
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/Utils.kt b/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/Utils.kt
index 3b9c2a7..5c4e9c1 100644
--- a/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/Utils.kt
+++ b/lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/Utils.kt
@@ -1,14 +1,11 @@
 package com.quyunshuo.androidbaseframemvvm.base.utils
 
-import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import com.alibaba.android.arouter.launcher.ARouter
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 
@@ -63,31 +60,4 @@ fun toast(msg: String, duration: Int = Toast.LENGTH_SHORT) {
  */
 fun toast(msgId: Int, duration: Int = Toast.LENGTH_SHORT) {
     ToastUtils.showToast(msgId, duration)
-}
-/**************************************************************************************************/
-/**
- * 获取App版本号
- * @return Long App版本号
- */
-fun getVersionCode(): Long {
-    val packageInfo = BaseApplication.context
-        .packageManager
-        .getPackageInfo(BaseApplication.context.packageName, 0)
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-        packageInfo.longVersionCode
-    } else {
-        packageInfo.versionCode.toLong()
-    }
-}
-
-/**************************************************************************************************/
-/**
- * 获取App版本名
- * @return String App版本名
- */
-fun getVersionName(): String {
-    return BaseApplication.context
-        .packageManager
-        .getPackageInfo(BaseApplication.context.packageName, 0)
-        .versionName
 }
\ No newline at end of file