From 0d5e64e31aa28349de516361bf621e542310d288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Wed, 3 Dec 2025 20:02:14 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=82=B9=E6=AD=8C?= =?UTF-8?q?=E6=88=BF=E5=87=BA=E7=8E=B0=E7=9A=84=E9=94=99=E8=AF=AF=202?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5=E5=AE=B6=E6=97=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moduleutil/bean/room/RoomPitBean.java | 2 +- .../xscm/moduleutil/widget/BaseWheatView.java | 20 ++++++++++-- .../dialog/RewardGiftDialogFragment.java | 2 +- .../com/xscm/modulemain/BaseMvpActivity.java | 20 ++++++------ .../modulemain/activity/WebViewActivity.java | 2 +- .../activity/room/activity/RoomActivity.kt | 12 +++++-- .../room/fragment/RoomJukeboxFragment.java | 32 ++++++++----------- .../room/fragment/SongRequestFragment.java | 2 +- .../modulemain/service/ForegroundService.kt | 4 ++- .../src/main/res/layout/fragment_jukebox.xml | 10 +++++- .../res/layout/room_view_jukebox_wheat.xml | 30 +++++++++-------- .../classicui/page/TUIGroupChatFragment.java | 4 +-- 12 files changed, 85 insertions(+), 55 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java index 847ca7d0..f0ac0e63 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java @@ -64,7 +64,7 @@ public class RoomPitBean implements Serializable { private String dress_picture; private RankInfo rank_info; private int ball_state;//1开球0未开球 - private int is_online;//是否在线 : 1在线 2离线 + private int is_online=1;//是否在线 : 1在线 2离线 private String to_pit_number; private boolean is_pk;//是否是在pk模式中 private boolean isMute;//是否打开麦圈 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java index 73bdb796..051ee579 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java @@ -179,7 +179,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe setCardiac(pitBean.getCharm(), getTzbl()); if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) { - iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE); + if (bean.getIs_online()==1){ + iv_on_line.setVisibility(GONE); + }else if (bean.getIs_online()==2){ + if (!bean.getUser_id().equals(SpUtil.getUserId()+"")) { + iv_on_line.setVisibility(VISIBLE); + } + }else { + iv_on_line.setVisibility(GONE); + } } else { iv_on_line.setVisibility(GONE); } @@ -420,7 +428,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe public void setOnlineStatus() { if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) { - iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE); + if (pitBean.getIs_online()==1){ + iv_on_line.setVisibility(GONE); + }else if (pitBean.getIs_online()==2){ + if (!pitBean.getUser_id().equals(SpUtil.getUserId()+"")) { + iv_on_line.setVisibility(VISIBLE); + } + }else { + iv_on_line.setVisibility(GONE); + } } else { iv_on_line.setVisibility(GONE); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java index f8f3324e..b1d53d69 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java @@ -152,7 +152,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment clazz) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java index 40809072..ad051c70 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java @@ -420,7 +420,7 @@ public class WebViewActivity extends BaseMvpActivity(), LogUtils.e("messageEvent!!.text.type" + messageEvent.text.type) CommonAppContext.getInstance().onlineMap[userId ?: ""] = messageEvent.text.type if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) { - roomFragment!!.handleRoomMessage(messageEvent) + if (userId.equals(SpUtil.getUserId().toString())){ + if(messageEvent.text.type!=2){ + roomFragment!!.handleRoomMessage(messageEvent) + } + }else { + roomFragment!!.handleRoomMessage(messageEvent) + } // when(mRoomInfoResp?.room_info?.type_id) { // "1","3","4","8" -> { // if (mRoomInfoResp?.room_info?.label_id == "1") { @@ -1916,8 +1922,8 @@ class RoomActivity : BaseMvpActivity(), roomFragment!!.handleRoomMessage(messageEvent) } RoomType.JUKEBOX -> { - mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] = - getPitBean(messageEvent, 1) + mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] =RoomPitBean(pitNumber) +// getPitBean(messageEvent, 1) roomFragment!!.upRoomInfoData(mRoomInfoResp) roomFragment?.handleRoomMessage(messageEvent) } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java index d6a4f119..e5e084d6 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java @@ -394,17 +394,16 @@ public class RoomJukeboxFragment extends BaseMvpFragment + + - - + + + + param = new HashMap<>(); // if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {