From 420afc7a1e182774181174023a310d5b66abe6a2 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Thu, 18 Dec 2025 17:10:38 +0800
Subject: [PATCH] =?UTF-8?q?77=20=20=E7=BB=83=E6=AD=8C=E6=88=BF=20=E6=BC=94?=
 =?UTF-8?q?=E5=94=B1=E8=80=85=E9=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/bean/room/RoomInfoResp.java    |  2 +-
 .../com/xscm/moduleutil/utils/TimeUtils.java  |  2 +-
 .../activity/room/activity/RoomActivity.kt    | 22 +++++++++++++++++--
 .../room/fragment/RoomKtvFragment.java        | 12 +++++++---
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java
index baef1200..54887d4a 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java
@@ -26,7 +26,7 @@ public class RoomInfoResp implements Serializable {
     private RoomOrderDemand demand;//嘉宾需求
     private int rejoin;
     private int is_show_self;//盲盒是否送自己
-    private MusicSongBean song_user_info;
+    private MusicSongBean song_user_info;//ktv
     private MusicSongBean nextInfo;
     private RoomAuction room_auction;//拍卖房信息
     private RoomCpUserBean cp_user;
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java
index 3ff66af2..23071c73 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java
@@ -209,7 +209,7 @@ public class TimeUtils {
     //获取当前日期
     public static String getCurrentDate2() {
         Date d = new Date();
-        SimpleDateFormat sf = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss_SSS");
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy年MM月dd日hh时mm分ss秒SSS");
         return sf.format(d);
     }
     /**
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 420eaf17..8f829831 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -1670,6 +1670,13 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             queren1(text.fromUserInfo.nickname)
         } else {
             roomFragment?.handleRoomMessage(messageEvent)
+
+            if (messageEvent.text.songInfo != null) {
+                mRoomInfoResp?.song_user_info = messageEvent.text.songInfo
+            } else {
+              mRoomInfoResp?.song_user_info = null
+            }
+            roomBtnShowIsHide()
         }
     }
 
@@ -2806,7 +2813,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
     //底部麦上按钮显示
     private fun roomBtnShowIsHide() {
-
         //KTV 显示点歌按钮
         if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.DATING
             && mRoomInfoResp?.room_info?.label_id.equals("2")) {
@@ -2818,7 +2824,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if (mRoomInfoResp?.user_info?.pit_number != 0) {
             maiStatus = false
             mBinding!!.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up)
-            switchMic(2)
             setVoiveState(maiStatus)
             mBinding?.rlMai?.visibility = View.VISIBLE
             if (mRoomInfoResp?.user_info?.pit_number == 9) {
@@ -2838,6 +2843,13 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     mBinding?.rlPk?.visibility = View.GONE
                 }
 
+                if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.DATING
+                    && mRoomInfoResp?.room_info?.label_id.equals("2")
+                    && mRoomInfoResp?.song_user_info?.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())){
+                    mBinding?.rlMai?.visibility = View.VISIBLE
+                    return
+                }
+                switchMic(2)
             }
         } else {
             if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id) == RoomType.JUKEBOX
@@ -2846,6 +2858,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 return
             }
 
+            if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.DATING
+                && mRoomInfoResp?.room_info?.label_id.equals("2")
+                && mRoomInfoResp?.song_user_info?.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())){
+                mBinding?.rlMai?.visibility = View.VISIBLE
+                return
+            }
             maiStatus = true
             mBinding!!.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding)
             switchMic(2)
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
index f92ae9c7..cdc4681f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
@@ -110,12 +110,12 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 
             @Override
             public void onRefPitchUpdate(float refPitch, int numberOfRefPitches) {
-
+                mKaraokeView.setPitch(refPitch);
             }
 
             @Override
             public void onLineFinished(KaraokeView view, LyricsLineModel line, int score, int cumulativeScore, int index, int numberOfLines) {
-
+                    LogUtils.e("onLineFinished :" + score + "  " + cumulativeScore + "  " + index + "  " + numberOfLines);
             }
         });
 
@@ -618,7 +618,13 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void roomInfoEvent(MusicPlayBean messageEvent) {
-        mKaraokeView.setProgress(messageEvent.getPosition());
+
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mKaraokeView.setProgress(messageEvent.getPosition());
+            }
+        });
         qiegSta(messageEvent.getPosition());
     }