From 56d5d402144bd9acbb000733737d2de5d886b08b 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 22:25:04 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=87=BA=E7=8E=B0roomId=E4=B8=A2=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=BA=A2?=
 =?UTF-8?q?=E5=8C=85=E5=88=97=E8=A1=A8=E4=B8=8A=E6=8B=89=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=203=EF=BC=9A?=
 =?UTF-8?q?=E7=BB=99=E7=AD=BE=E7=BA=A6=E6=88=BF=E6=B7=BB=E5=8A=A0=E5=80=92?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../room/activity/RedResultActivity.java      |  4 ++++
 .../room/fragment/RoomMentorShipFragment.kt   | 13 +++++++++++++
 .../dialog/RoomGiftDialogFragment.java        |  2 +-
 .../main/res/layout/fragment_mentor_ship.xml  | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
index 8129520f..b736136a 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
@@ -64,10 +64,12 @@ public class RedResultActivity extends BaseMvpActivity<RedEnvelopesPresenter, Fr
 
             @Override
             public void onRefresh(@NonNull @NotNull RefreshLayout refreshLayout) {
+                MvpPre.getRedpacketDetail(redpacketId);
             }
 
             @Override
             public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) {
+                MvpPre.getRedpacketDetail(redpacketId);
             }
         });
     }
@@ -83,6 +85,8 @@ public class RedResultActivity extends BaseMvpActivity<RedEnvelopesPresenter, Fr
         if (isFinishing() || isDestroyed()) {
             return;
         }
+        mBinding.smartRefreshLayout.finishLoadMore();
+        mBinding.smartRefreshLayout.finishRefresh();
         if (redpacketDetail != null) {
             ImageUtils.loadHeadCC(redpacketDetail.getRedpacket_info().getAvatar(),  mBinding.userAvatar);
             mBinding.userName.setText(redpacketDetail.getRedpacket_info().getNickname());
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
index 23303c62..a4fd352b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
@@ -290,6 +290,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
 
             mBinding.tvTimeRight.visibility = View.GONE
             mBinding.tvTime.visibility = View.GONE
+            mBinding.tvJsq.visibility= View.GONE
 
             mBinding.tvTimeLeft.visibility = View.GONE
 
@@ -350,12 +351,14 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
     fun roomInfoUpdate(mRoomInfoResp: RoomInfoResp) {
         mRoomInfo = mRoomInfoResp
         mUserInfo = mRoomInfo?.user_info
+        mRoomId = mRoomInfo?.room_id!!
         showBtn()
     }
 
     fun roomTypeSwitch(mRoomInfoResp: RoomInfoResp) {
         mRoomInfo = mRoomInfoResp
         mUserInfo = mRoomInfo?.user_info
+        mRoomId = mRoomInfo?.room_id!!
         initView()
     }
 
@@ -503,6 +506,16 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
         // 观察时间变化
         scope.launch {
             timer.timeLeft.collect { time ->
+                LogUtils.e("startTimer:"+time)
+                if (time/1000 <= 10){
+                    mBinding.tvJsq.visibility= View.VISIBLE
+                    mBinding.tvJsq.text = (time/1000).toString()
+                    if ((time/1000).toInt() <= 0){
+                        mBinding.tvJsq.visibility= View.GONE
+                    }
+                }else{
+                    mBinding.tvJsq.visibility= View.GONE
+                }
                 val formattedTime = timer.formatTime(time)
                 // 更新UI显示
                 updateTimerDisplay(formattedTime)
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
index 388673a0..5e323baa 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -622,7 +622,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
 //                return;
 //            }
 //        } else {
-        if (roonGiftModel == null|| roonGiftModel.getGift_id() == null) {
+        if (roonGiftModel == null|| roonGiftModel.getGift_id() == null || !roonGiftModel.isChecked()) {
             ToastUtils.show("请选择礼物");
             return;
         }
diff --git a/MainModule/src/main/res/layout/fragment_mentor_ship.xml b/MainModule/src/main/res/layout/fragment_mentor_ship.xml
index 17963c78..7c7c8376 100644
--- a/MainModule/src/main/res/layout/fragment_mentor_ship.xml
+++ b/MainModule/src/main/res/layout/fragment_mentor_ship.xml
@@ -348,6 +348,25 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <TextView
+            android:id="@+id/tv_jsq"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            android:layout_marginBottom="@dimen/dp_90"
+            android:background="@color/transparent"
+            android:gravity="center"
+            android:paddingBottom="@dimen/dp_18"
+            android:text="1"
+            android:textColor="@color/color_FFFFF0F0"
+            android:textSize="90sp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file