From d4216c017c26695ebc569ea7b811918cbbea3b06 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Wed, 31 Dec 2025 11:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E9=A9=BB=E9=80=9A=E7=9F=A5=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=20icon=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../builder/NotificationDataFactory.kt        |   2 +-
 .../layout/layout_notification_resident.xml   | 117 ++++++++++-----
 .../layout_notification_resident_12.xml       | 136 +++++++++++++-----
 notification/src/main/res/values/strings.xml  |   2 +-
 4 files changed, 183 insertions(+), 74 deletions(-)

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 7a803fc..64af477 100644
--- a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt
+++ b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt
@@ -379,7 +379,7 @@ class ResidentModelManger {
                 it.putExtra(LANDING_NOTIFICATION_FROM, NotificationCheckController.NotificationType.RESIDENT.string)
             })
             .setOnClickPendingIntent(
-                R.id.resident_withdraw, entryPointPendingIntent(context,
+                R.id.resident_cash, entryPointPendingIntent(context,
                     type2notificationId[NotificationType.RESIDENT_WITHDRAW] ?: 0
                 ) {
                     it.putExtra(LANDING_NOTIFICATION_ACTION, PushContent.ACTION_TYPE_WITHDRAW)
diff --git a/notification/src/main/res/layout/layout_notification_resident.xml b/notification/src/main/res/layout/layout_notification_resident.xml
index bc6554c..a2f56f2 100644
--- a/notification/src/main/res/layout/layout_notification_resident.xml
+++ b/notification/src/main/res/layout/layout_notification_resident.xml
@@ -6,56 +6,107 @@
     android:background="@drawable/noti_bg_r16_white"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="12dp"
+    android:padding="5dp"
     tools:ignore="ResourceName">
 
-
-    <ImageView
+    <FrameLayout
         android:id="@+id/resident_gold"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_task_gold"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_gold"
+            />
 
-    <ImageView
-        android:id="@+id/resident_withdraw"
+        <TextView
+            android:id="@+id/tv_resident_gold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="13dp"
+            android:textSize="9sp"
+            android:textColor="@color/white"
+            android:text="0"
+            />
+    </FrameLayout>
+
+
+    <FrameLayout
+        android:id="@+id/resident_cash"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_task_cash"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_cash"
+            />
 
-    <ImageView
+        <TextView
+            android:id="@+id/tv_resident_cash"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="13dp"
+            android:textSize="9sp"
+            android:textColor="@color/white"
+            android:text="0"
+            />
+    </FrameLayout>
+
+
+    <FrameLayout
         android:id="@+id/resident_box"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_benefit_item_ongoing"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_box"
+            />
 
-    <ImageView
+        <TextView
+            android:id="@+id/tv_resident_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="13dp"
+            android:textSize="9sp"
+            android:textColor="@color/white"
+            android:text="0"
+            />
+    </FrameLayout>
+
+    <FrameLayout
         android:id="@+id/resident_game"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_task_act_game"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_game"
+            />
+    </FrameLayout>
 
-    <ImageView
-        android:id="@+id/resident_close"
-        android:layout_width="0dp"
-        android:layout_height="30dp"
-        android:layout_weight="1"
-        android:layout_gravity="top"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_icon_close"
-        android:visibility="gone"
-        />
 
 </LinearLayout>
 
diff --git a/notification/src/main/res/layout/layout_notification_resident_12.xml b/notification/src/main/res/layout/layout_notification_resident_12.xml
index 1c1cb4a..ad2dbc1 100644
--- a/notification/src/main/res/layout/layout_notification_resident_12.xml
+++ b/notification/src/main/res/layout/layout_notification_resident_12.xml
@@ -1,66 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="50dp"
+    android:layout_height="65dp"
     android:background="@drawable/noti_bg_r16_white"
     android:gravity="center_vertical"
     android:orientation="horizontal"
+    android:padding="5dp"
     tools:ignore="ResourceName">
 
-
-    <ImageView
+    <FrameLayout
         android:id="@+id/resident_gold"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:clickable="true"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_task_gold"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_gold"
+            />
 
-    <ImageView
-        android:id="@+id/resident_withdraw"
+        <TextView
+            android:id="@+id/tv_resident_gold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="16dp"
+            android:textSize="12sp"
+            android:textColor="@color/white"
+            android:text="0"
+            />
+    </FrameLayout>
+
+
+    <FrameLayout
+        android:id="@+id/resident_cash"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:clickable="true"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_task_cash"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_cash"
+            />
 
-    <ImageView
+        <TextView
+            android:id="@+id/tv_resident_cash"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="16dp"
+            android:textSize="12sp"
+            android:textColor="@color/white"
+            android:text="0"
+            />
+    </FrameLayout>
+
+
+    <FrameLayout
         android:id="@+id/resident_box"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:clickable="true"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_benefit_item_ongoing"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_box"
+            />
 
-    <ImageView
+        <TextView
+            android:id="@+id/tv_resident_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="16dp"
+            android:textSize="12sp"
+            android:textColor="@color/white"
+            android:text="0"
+            />
+    </FrameLayout>
+
+    <FrameLayout
         android:id="@+id/resident_game"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:clickable="true"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_task_act_game"
-        />
+        android:layout_weight="1">
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:src="@mipmap/noti_game"
+            />
+        <TextView
+            android:id="@+id/tv_resident_game"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:singleLine="true"
+            android:layout_marginTop="16dp"
+            android:textSize="12sp"
+            android:textColor="@color/white"
+            android:text="@string/game"
+            />
+    </FrameLayout>
 
-    <ImageView
-        android:id="@+id/resident_close"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:layout_weight="1"
-        android:layout_gravity="top"
-        android:scaleType="fitCenter"
-        android:src="@drawable/vidi_icon_close"
-        android:visibility="gone"
-        />
 
 </LinearLayout>
 
diff --git a/notification/src/main/res/values/strings.xml b/notification/src/main/res/values/strings.xml
index c81c177..fab7897 100644
--- a/notification/src/main/res/values/strings.xml
+++ b/notification/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <!--  new text for notify  -->
     <string name="title_bg_withdraw">Olá!</string>
     <string name="content_bg_withdraw">Não perca seus R$ %s. Toque para sacar!</string>
-
+    <string name="game">Game\n</string>
 
 
 </resources>
\ No newline at end of file