diff --git a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt index d2d3f1b..aa4fd17 100644 --- a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt +++ b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt @@ -14,7 +14,6 @@ import com.remax.notification.R import com.remax.notification.check.NotificationCheckController import com.remax.notification.config.PushContent import com.remax.notification.config.PushContentController -import com.remax.notification.controller.NotificationTriggerController import com.remax.notification.newUtil.NotificationDatas import com.remax.notification.service.NotificationKeepAliveServiceManager import java.io.File @@ -406,7 +405,6 @@ class ResidentModelManger { }) .build() - return GeneralNotificationData( notificationId = type2notificationId[NotificationType.RESIDENT] ?: 0, contentTitle = StringUtils.getString(R.string.noti_resident_title), diff --git a/notification/src/main/java/com/remax/notification/newUtil/NotificationUtil.kt b/notification/src/main/java/com/remax/notification/newUtil/NotificationUtil.kt index 09e3e2b..c13fb55 100644 --- a/notification/src/main/java/com/remax/notification/newUtil/NotificationUtil.kt +++ b/notification/src/main/java/com/remax/notification/newUtil/NotificationUtil.kt @@ -429,7 +429,7 @@ class NotificationUtil private constructor() { .setAutoCancel(true) .setContentIntent(pendingIntent) - showNotification(notificationId, builder.build(), channelName) + showNotification(notificationId, builder.build(), channelName, NotificationManager.IMPORTANCE_MAX) } @@ -454,11 +454,12 @@ class NotificationUtil private constructor() { private fun showNotification(notificationId: Int = System.currentTimeMillis().toInt(), notification: Notification, - channelName: String) { + channelName: String, + importance: Int = NotificationManager.IMPORTANCE_DEFAULT) { if (!isNotificationsEnabled()) { PermissionUtil.checkPermission(Manifest.permission.POST_NOTIFICATIONS, object : PermissionUtil.ICallback() { override fun onAllGranted() { - doShowNotification(notificationId, notification, channelName) + doShowNotification(notificationId, notification, channelName, importance) } override fun onPartialGranted() { @@ -468,14 +469,14 @@ class NotificationUtil private constructor() { } }) } else { - doShowNotification(notificationId, notification, channelName) + doShowNotification(notificationId, notification, channelName, importance) } } @RequiresPermission(Manifest.permission.POST_NOTIFICATIONS) - private fun doShowNotification(notificationId: Int = System.currentTimeMillis().toInt(), notification: Notification, channelName: String) { + private fun doShowNotification(notificationId: Int = System.currentTimeMillis().toInt(), notification: Notification, channelName: String, importance: Int = NotificationManager.IMPORTANCE_DEFAULT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager.getNotificationChannel(notification.channelId) == null) { - createNotificationChannel(notification.channelId, channelName, NotificationCompat.PRIORITY_HIGH) + createNotificationChannel(notification.channelId, channelName, importance) } NotificationManagerCompat.from(mContext).notify(notificationId, notification) }