From d63fd43ad24b3bb6aed9af02912a44d0db12dc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 12 Dec 2025 18:30:20 +0800
Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=B8=88=E5=BE=92?=
 =?UTF-8?q?=E7=9A=84=E7=A4=BC=E7=89=A9=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/adapter/GiftRoomAdapter.java   | 24 ++++++++++++-------
 .../xscm/moduleutil/bean/RoonGiftModel.java   |  3 ++-
 .../src/main/res/layout/item_gift_room.xml    |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java
index 1926019c..52e1e5a5 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java
@@ -80,6 +80,7 @@ public class GiftRoomAdapter extends BaseAdapter {
         private static RoonGiftModel sGiftModel;
         private GiftRoomAdapter mAdapter;
         private RoonGiftModel mGiftModel;
+
         public void setGiftModel(GiftRoomAdapter adapter, RoonGiftModel gift) {
             sAdapter = new WeakReference<>(adapter);
             sGiftModel = gift;
@@ -129,7 +130,7 @@ public class GiftRoomAdapter extends BaseAdapter {
             viewHolder.tv_gift_price = (TextView) convertView.findViewById(R.id.tv_gift_price);
             viewHolder.iv_gift_pic = (ImageView) convertView.findViewById(R.id.iv_gift_pic);
             viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on);
-            viewHolder.iv_gift_select= (ImageView) convertView.findViewById(R.id.iv_gift_select);
+            viewHolder.iv_gift_select = (ImageView) convertView.findViewById(R.id.iv_gift_select);
 
             // im_heart现在位于顶层布局中
             viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss);
@@ -140,25 +141,32 @@ public class GiftRoomAdapter extends BaseAdapter {
 
         viewHolder.item_layout.setOnClickListener(v -> {
 //            RoonGiftModel clickedModel = (RoonGiftModel) v.getTag();
-            if (giftModel.getIs_lock()==0) {
+            if (giftModel.getIs_lock() == 0) {
                 EventBus.getDefault().post(new RoomGiftClickToEvent(this, giftModel, 1));
-            }else if (giftModel.getIs_lock()==1){
+            } else if (giftModel.getIs_lock() == 1) {
                 ToastUtils.show("当前属于爵位礼物，请开通爵位");
             }
         });
-        if (giftModel.getIs_lock()==0){
+        if (giftModel.getIs_lock() == 0) {
             viewHolder.iv_gift_select.setVisibility(GONE);
-        }else {
+        } else {
             viewHolder.iv_gift_select.setVisibility(VISIBLE);
         }
 
-        if (giftModel.getIs_cp()==0) {//这是cp礼物
-                viewHolder.im_heart.setVisibility(GONE);
-        }else {
+        if (giftModel.getIs_cp() == 0 && giftModel.getIs_teacher() == 0 ) {//这是cp礼物
+            viewHolder.im_heart.setVisibility(GONE);
+        } else {
             if (viewHolder.im_heart != null) {
                 viewHolder.im_heart.setVisibility(VISIBLE);
+                if (giftModel.getIs_cp() == 1) {
+                    viewHolder.im_heart.setImageResource(R.mipmap.icon_heart);
+                }else if (giftModel.getIs_teacher() == 1) {
+                    viewHolder.im_heart.setImageResource(R.mipmap.icon_teacher);
+                }
             }
         }
+
+
         /*
          * 在给View绑定显示的数据时，计算正确的position = position + curIndex * pageSize，
          */
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java
index 9350c3cb..641e19da 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java
@@ -35,7 +35,8 @@ public class RoonGiftModel {
     private int gift_bag;//10：天空之境 11：岁月之城 12：时空之巅
     private int is_lock;//爵位礼物 0：不锁 1：锁
 
-    private int is_cp;//1:是 0：不是
+    private int is_cp;//1:是 0：不是 是不是cp心动礼物
+    private int is_teacher;//1:是 0：不是 是不是师徒礼物
     public boolean isCan_send_self() {
         if ( isManghe()) {
             return true;
diff --git a/BaseModule/src/main/res/layout/item_gift_room.xml b/BaseModule/src/main/res/layout/item_gift_room.xml
index 7eb2f114..064c40ad 100644
--- a/BaseModule/src/main/res/layout/item_gift_room.xml
+++ b/BaseModule/src/main/res/layout/item_gift_room.xml
@@ -90,7 +90,7 @@
         android:id="@+id/im_heartssss"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/icon_heart"
+        tools:src="@mipmap/icon_heart"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:scaleType="fitCenter"