From 57ef04f86e83fadb496e58d0d64d8b7f05d3a12a Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Thu, 15 Jan 2026 18:11:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A8=E9=80=81=E3=80=91=E9=94=81?= =?UTF-8?q?=E5=B1=8F=E7=95=8C=E9=9D=A2=E4=B8=AD=E6=8E=A8=E9=80=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationTriggerController.kt | 8 +++---- notification/src/main/res/drawable/logo.webp | Bin 0 -> 3032 bytes .../layout/layout_notification_resident.xml | 4 ++-- .../layout_notification_resident_12.xml | 20 +++++++++--------- .../src/main/res/mipmap-xxhdpi/logo.webp | Bin 0 -> 3032 bytes 5 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 notification/src/main/res/drawable/logo.webp create mode 100644 notification/src/main/res/mipmap-xxhdpi/logo.webp diff --git a/notification/src/main/java/com/remax/notification/controller/NotificationTriggerController.kt b/notification/src/main/java/com/remax/notification/controller/NotificationTriggerController.kt index 0046715..0eb2063 100644 --- a/notification/src/main/java/com/remax/notification/controller/NotificationTriggerController.kt +++ b/notification/src/main/java/com/remax/notification/controller/NotificationTriggerController.kt @@ -334,8 +334,8 @@ object NotificationTriggerController { private fun resident(model: GeneralNotificationData) = NotificationCompat.Builder(context!!, CHANNEL_ID_RESIDENT) - .setColor(ContextCompat.getColor(context!!, R.color.noti_color)) - .setSmallIcon(R.drawable.ic_noti_icon) + //.setColor(ContextCompat.getColor(context!!, R.color.noti_color)) + .setSmallIcon(R.mipmap.logo) .setContentTitle(model.contentTitle) .setContentText(model.contentContent) .setPriority(NotificationCompat.PRIORITY_MAX) @@ -365,7 +365,7 @@ object NotificationTriggerController { val builder = NotificationCompat.Builder(context!!, channelId) .setPriority(NotificationCompat.PRIORITY_MAX) .setColor(ContextCompat.getColor(context!!, R.color.noti_color)) - .setSmallIcon(R.drawable.ic_noti_icon).setAutoCancel(true) + .setSmallIcon(R.mipmap.logo).setAutoCancel(true) .setGroup("push_" + System.currentTimeMillis()).setContentText(model.contentTitle) .setContentIntent(model.contentIntent).setDeleteIntent(deletePendingIntent) // 设置删除监听 .setCustomContentView(model.contentView).setCustomBigContentView(model.bigContentView) @@ -402,7 +402,7 @@ object NotificationTriggerController { val builder = NotificationCompat.Builder(context!!, channelId) .setPriority(NotificationCompat.PRIORITY_MAX) .setColor(ContextCompat.getColor(context!!, R.color.noti_color)) - .setSmallIcon(R.drawable.ic_noti_icon).setAutoCancel(true) + .setSmallIcon(R.mipmap.logo).setAutoCancel(true) .setGroup("push_" + System.currentTimeMillis()).setContentText(model.contentTitle) .setContentIntent(model.contentIntent).setDeleteIntent(deletePendingIntent) // 设置删除监听 .setCustomContentView(model.contentView).setCustomBigContentView(model.bigContentView) diff --git a/notification/src/main/res/drawable/logo.webp b/notification/src/main/res/drawable/logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..1c5a352ba18b72d47daa64763ff38c9c1b6d043c GIT binary patch literal 3032 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 literal 0 HcmV?d00001 diff --git a/notification/src/main/res/layout/layout_notification_resident.xml b/notification/src/main/res/layout/layout_notification_resident.xml index 3620854..23c8106 100644 --- a/notification/src/main/res/layout/layout_notification_resident.xml +++ b/notification/src/main/res/layout/layout_notification_resident.xml @@ -2,11 +2,11 @@ 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 literal 0 HcmV?d00001