Merge branch 'dev'

FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/act/BaseActivity.kt

@@ -0,0 +1,12 @@
+package com.fizzer.base.lib.android.act
+
+import androidx.appcompat.app.AppCompatActivity
+
+/**
+ * @Author: Fizzer
+ * @Email: fizzer503@sina.com
+ * @Date: 2023/12/23
+ * @Descriptor: 基类Activity
+ */
+open class BaseActivity : AppCompatActivity() {
+}

FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/application/App.kt

@@ -0,0 +1,24 @@
+package com.fizzer.base.lib.android.application
+
+import android.app.Application
+
+/**
+* @Author: Fizzer
+* @Email: fizzer503@sina.com
+* @Date: 2023/12/23
+* @Descriptor: 基类的Application
+*/
+open class App : Application() {
+
+    companion object {
+        private lateinit var mApplication: App
+        fun getApplication(): App {
+            return mApplication
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        mApplication = this
+    }
+}

FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/BaseBottomDialog.kt → FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/dialog/BaseBottomDialog.kt

@@ -1,8 +1,9 @@
-package com.fizzer.base.lib.android
+package com.fizzer.base.lib.android.dialog
 
 import android.view.Gravity
 import androidx.viewbinding.ViewBinding
 import com.fizzer.base.lib.R
+import com.fizzer.base.lib.android.BaseViewModel
 import com.fizzer.base.lib.utils.UIUtils
 
 /**

FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/BaseDialog.kt → FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/dialog/BaseDialog.kt

@@ -1,17 +1,15 @@
-package com.fizzer.base.lib.android
+package com.fizzer.base.lib.android.dialog
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import androidx.annotation.DrawableRes
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 import com.fizzer.base.lib.R
+import com.fizzer.base.lib.android.BaseViewModel
 import com.fizzer.base.lib.utils.UIUtils
 
 /**

FizzerBaseLib/src/main/java/com/fizzer/base/lib/android/fragment/BaseFragment.kt

@@ -0,0 +1,12 @@
+package com.fizzer.base.lib.android.fragment
+
+import androidx.fragment.app.Fragment
+
+/**
+ * @Author: Fizzer
+ * @Email: fizzer503@sina.com
+ * @Date: 2023/12/23
+ * @Descriptor: 基类Fragment
+ */
+open class BaseFragment : Fragment() {
+}

FizzerBaseLib/src/main/java/com/fizzer/base/lib/utils/AppInfoUtils.kt

@@ -16,6 +16,7 @@ object AppInfoUtils {
     /**
      * 获取当前APP的Version Name
      */
+    @JvmStatic
     fun getVersionName(context: Context?): String {
         context?.let {
             val pm = it.packageManager
@@ -31,6 +32,7 @@ object AppInfoUtils {
     /**
      * 获取当前APP的版本号
      */
+    @JvmStatic
     fun getVersionCode(context: Context?): Long {
         context?.let {
             val pm = it.packageManager
@@ -51,6 +53,7 @@ object AppInfoUtils {
      * 判断是否已安装了当前APP
      * @return true:已安装   false:未安装
      */
+    @JvmStatic
     fun isAppAvailable(context: Context?, packageName: String?): Boolean {
         if (packageName.isNullOrEmpty()) {
             return false
@@ -66,4 +69,19 @@ object AppInfoUtils {
         return false
     }
 
+    /**
+     * 判断当前的进程是否是APP的主进程
+     */
+    @JvmStatic
+    fun isMainProcess(context: Context): Boolean {
+        val pid = android.os.Process.myPid()
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        for (appProcess in activityManager.runningAppProcesses) {
+            if (appProcess.processName == context.packageName) {
+                return appProcess.pid == pid
+            }
+        }
+        return false
+    }
+
 }

FizzerBaseLib/src/main/java/com/fizzer/base/lib/utils/AppJumpUtils.kt

@@ -17,6 +17,7 @@ object AppJumpUtils {
     /**
      * 调用系统拨打电话
      */
+    @JvmStatic
     fun callPhone(context: Context?, phone: String?) {
         if (phone.isNullOrEmpty()) {
             return

FizzerBaseLib/src/main/java/com/fizzer/base/lib/utils/DeviceInfoUtils.kt

@@ -1,10 +1,74 @@
 package com.fizzer.base.lib.utils
 
+import android.content.Context
+import android.nfc.NfcManager
+import android.os.Build
+
 /**
  * @Author:Fizzer
  * @Email: fizzer503@gmail.com
  * @Date: 2022/9/7
  * @Descriptor: 获取当前设备信息的工具类
  */
 object DeviceInfoUtils {
+
+    /**
+     * 获取厂商名字
+     */
+    fun getDeviceManufacturer(): String {
+        return Build.MANUFACTURER
+    }
+
+    /**
+     * 获取产品名
+     */
+    fun getDeviceProduct(): String {
+        return Build.PRODUCT
+    }
+
+    /**
+     * 获取设备品牌
+     */
+    fun getDevicesBrandName(): String {
+        return Build.BRAND
+    }
+
+    /**
+     * 获取设备型号
+     */
+    fun getDeviceModel(): String {
+        return Build.MODEL
+    }
+
+    /**
+     * 获取设备的主板名
+     */
+    fun getDeviceBoard(): String {
+        return Build.BOARD
+    }
+
+    /**
+     * 获取设备名称
+     */
+    fun getDeviceName(): String {
+        return Build.DEVICE
+    }
+
+    /**
+     * 获取设备指纹信息
+     */
+    fun getDeviceFingerprint(): String {
+        return Build.FINGERPRINT
+    }
+
+    /**
+     * 设备是否支持NFC功能
+     * true - 支持
+     * false - 不支持
+     */
+    fun hasNfcSupport(context: Context?): Boolean {
+        val nfcManager = context?.getSystemService(Context.NFC_SERVICE) as NfcManager
+        val nfcAdapter = nfcManager.defaultAdapter
+        return nfcAdapter != null
+    }
 }