优化代码

Theoneee · Sep 4, 2023 · 5a4c909 · 5a4c909
1 parent c17ee2d
commit 5a4c909
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/core/src/main/java/com/theone/mvvm/core/app/util/NotificationManager.kt b/core/src/main/java/com/theone/mvvm/core/app/util/NotificationManager.kt
@@ -75,7 +75,11 @@ class NotificationManager private constructor() {
 
     }
 
-    private var mNotificationManager: android.app.NotificationManager? = null
+    private val mNotificationManager: android.app.NotificationManager by lazy {
+        appContext.getSystemService(
+            Context.NOTIFICATION_SERVICE
+        ) as android.app.NotificationManager
+    }
 
     /**
      * 注册 8.0 通知栏等级，应用开始时调用
@@ -102,59 +106,52 @@ class NotificationManager private constructor() {
         importance: Int
     ) {
         val channel = NotificationChannel(channelId, channelName, importance)
-        getNotificationManager()!!.createNotificationChannel(channel)
-    }
-
-    private fun getNotificationManager(): android.app.NotificationManager? {
-        if (null == mNotificationManager) mNotificationManager =
-            appContext.getSystemService(
-                Context.NOTIFICATION_SERVICE
-            ) as android.app.NotificationManager
-        return mNotificationManager
+        mNotificationManager.createNotificationChannel(channel)
     }
 
     /**
      * 删除通知渠道
      * 会在通知设置界面显示所有被删除的通知渠道数量，会导致不美观，不推荐使用
      * @param id
      */
-    @RequiresApi(api = Build.VERSION_CODES.O)
     fun deleteNotificationChannel(id: String?) {
-        getNotificationManager()!!.deleteNotificationChannel(id)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mNotificationManager.deleteNotificationChannel(id)
+        }
     }
 
     /**
      * 创建通知
      *
-     * @param ID           渠道ID
-     * @param LEVEL        通知等级
+     * @param id           渠道ID
+     * @param level        通知等级
      * @param ticker       提示语
      * @param title        标题
      * @param content      内容
      * @param showWhen     是否显示时间
      * @param smallIcon    小ICON
      */
     fun createNotification(
-        ID: Int,
+        id: Int,
         ticker: String?,
         title: String?,
         content: String?,
-        LEVEL: String? = LEVEL_DEFAULT_CHANNEL_ID,
+        level: String = LEVEL_DEFAULT_CHANNEL_ID,
         showWhen: Boolean = true,
         smallIcon: Int = R.drawable.service_down
     ): NotificationCompat.Builder {
         val builder =
             NotificationCompat.Builder(
                 appContext,
-                LEVEL!!
+                level
             )
         if (null != ticker) builder.setTicker(ticker)
         if (null != title) builder.setContentTitle(title)
         if (null != content) builder.setContentText(content)
         if (showWhen) builder.setWhen(System.currentTimeMillis())
         builder.setOnlyAlertOnce(true)
         setNotificationIcon(builder, smallIcon)
-        getNotificationManager()?.notify(ID, builder.build())
+        mNotificationManager.notify(id, builder.build())
         return builder
     }
 
@@ -185,8 +182,8 @@ class NotificationManager private constructor() {
      * @param ID
      * @param builder
      */
-    fun notify(ID: Int, builder: NotificationCompat.Builder) {
-        getNotificationManager()?.notify(ID, builder.build())
+    fun notify(id: Int, builder: NotificationCompat.Builder) {
+        mNotificationManager.notify(id, builder.build())
     }
 
 }