From 5ddf6fc6381454c15755c6b596ceac3a14d11b79 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 Sep 2025 11:19:27 +0800
Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=A6=BB=E7=BA=BF?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9C=A8?=
=?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=E5=90=8E=E5=86=8D=E6=9C=80?=
=?UTF-8?q?=E5=B0=8F=E5=8C=96=EF=BC=8C=E4=BB=8E=E5=90=8E=E5=8F=B0=E8=BF=9B?=
=?UTF-8?q?=E5=85=A5=E5=87=BA=E7=8E=B0=E5=9C=A8=E9=A6=96=E9=A1=B5=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xscm/moduleutil/widget/BaseWheatView.java | 18 +---
modulemain/src/main/AndroidManifest.xml | 3 +-
.../modulemain/activity/MainActivity.java | 3 +-
.../moduleroom/activity/RoomActivity.java | 4 +-
.../dialog/RoomUserInfoFragment.java | 1 +
.../fragment/FriendshipRoomFragment.java | 99 ++++++++++++++-----
.../fragment/RoomAuctionFragment.java | 56 ++++++++++-
.../moduleroom/fragment/RoomFragment.java | 48 +++++++++
.../moduleroom/fragment/RoomKtvFragment.java | 44 +++++++--
.../moduleroom/fragment/SingSongFragment.java | 21 ++++
.../main/res/layout/fragment_room_auction.xml | 33 ++++++-
.../presenter/VoiceCategoryPresenter.java | 80 ++++-----------
12 files changed, 302 insertions(+), 108 deletions(-)
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
index 60fc4a1..41f6731 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
@@ -160,6 +160,11 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
setCardiac(pitBean.getCharm(), getTzbl());
setPitData(bean);
+ if (bean.getIs_online() == 2){
+ iv_on_line.setVisibility(VISIBLE);
+ }else {
+ iv_on_line.setVisibility(GONE);
+ }
// if (bean.getIs_online() == 0 &&bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
// iv_on_line.setVisibility(VISIBLE);
// } else {
@@ -296,19 +301,6 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
}
- @Subscribe(threadMode = ThreadMode.MAIN)
- public void subscribeMessages(RoomMessageEvent roomMessageEvent) {
- if(roomMessageEvent.getMsgType()==1058){
- if (roomMessageEvent.getText().getUser_id().equals(pitBean.getUser_id())){
- if (roomMessageEvent.getText().getType()==1){
- iv_on_line.setVisibility(GONE);
- }else {
- iv_on_line.setVisibility(VISIBLE);
- }
- }
- }
- }
-
/**
* 开始倒计时
diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml
index 239c5ee..d741110 100644
--- a/modulemain/src/main/AndroidManifest.xml
+++ b/modulemain/src/main/AndroidManifest.xml
@@ -10,8 +10,7 @@
diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
index 9593939..147795e 100644
--- a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
@@ -371,7 +371,7 @@ public class MainActivity extends BaseMvpActivity updateFriendshipState(FriendshipPartType.HAND));
}
+
private void queren() {
// 创建并显示确认对话框
new ConfirmDialog(getActivity(),
@@ -1147,6 +1201,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment 0) {
+ for (int i = 0; i < auctionList.size(); i++) {
+ RoomAuction.AuctionListBean auctionListBean = auctionList.get(i);
+ int j = i;
+ j++;
+ if (j == 4) {
+ if (auctionListBean.getUser_id().equals(messageEvent.getText().getUser_id())){
+ mBinding.ivOnline4.setVisibility(type==1?GONE : VISIBLE);
+ }
+ } else if (j == 5) {
+ if (auctionListBean.getUser_id().equals(messageEvent.getText().getUser_id())){
+ mBinding.ivOnline5.setVisibility(type==1?GONE : VISIBLE);
+ }
+ } else if (j == 6) {
+ if (auctionListBean.getUser_id().equals(messageEvent.getText().getUser_id())){
+ mBinding.ivOnline6.setVisibility(type==1?GONE : VISIBLE);
+ }
+ }
+ }
+ }
}
public void event1003(RoomMessageEvent messageEvent) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
index 0b650ba..2bc0100 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
@@ -1006,6 +1006,9 @@ public class RoomFragment extends BaseMvpFragment
+
+
+
+
+
list) {
SpUtil.setRoomTypeModel(GsonUtils.getGSON().toJson(list));
+ if (MvpRef==null){
+ MvpRef=new WeakReference<>(mView);
+ }
MvpRef.get().setCategories(list);
}
});
-// List list = new ArrayList();
-// for (int i = 0; i < 5; i++) {
-// RoomTypeModel roomTypeModel = new RoomTypeModel();
-// roomTypeModel.setId(i+"");
-// roomTypeModel.setName("分类"+i);
-// roomTypeModel.setSort(i+"");
-// roomTypeModel.setType("1");
-// list.add(roomTypeModel);
-// }
-// MvpRef.get().setCategories(list);
}
@Override
public void getMediaRoom(String label_id) {
-// ApiClient.getInstance().getMediaRoom(label_id,new BaseObserver() {
-// @Override
-// public void onSubscribe(Disposable d) {
-// addDisposable(d);
-// }
-//
-// @Override
-// public void onNext(String roomId) {
-// MvpRef.get().setRoomId(roomId);
-// }
-//
-// @Override
-// public void onComplete() {
-//// MvpRef.get().disLoadings();
-// }
-// });
}
public void getBanners() {
@@ -103,11 +80,11 @@ public class VoiceCategoryPresenter extends BasePresenter>() {}.getType();
- List restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoomTop(), listType);
- if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
- MvpRef.get().setTopRoom(restoredRoomModels,type);
- }
+// Type listType = new TypeToken>() {}.getType();
+// List restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoomTop(), listType);
+// if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
+// MvpRef.get().setTopRoom(restoredRoomModels,type);
+// }
api.getTopRooms(page+"",page_limit,is_top,label_id,new BaseObserver>() {
@Override
public void onSubscribe(Disposable d) {
@@ -117,16 +94,19 @@ public class VoiceCategoryPresenter extends BasePresenter topRooms) {
SpUtil.setTopRoomTop(GsonUtils.getGSON().toJson(topRooms));
+ if (MvpRef==null){
+ MvpRef=new WeakReference<>(mView);
+ }
MvpRef.get().setTopRoom(topRooms,type);
}
});
}else if (type == 2){//这是获取所有房间
- Type listType = new TypeToken>() {}.getType();
- List restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoom(), listType);
- if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
- MvpRef.get().setTopRoom(restoredRoomModels, type);
- }
+// Type listType = new TypeToken>() {}.getType();
+// List restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoom(), listType);
+// if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
+// MvpRef.get().setTopRoom(restoredRoomModels, type);
+// }
api.getTopRooms(page+"",page_limit,is_top,label_id,new BaseObserver>() {
@Override
public void onSubscribe(Disposable d) {
@@ -135,34 +115,14 @@ public class VoiceCategoryPresenter extends BasePresenter topRooms) {
- SpUtil.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
+// SpUtil.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
+ if (MvpRef==null){
+ MvpRef=new WeakReference<>(mView);
+ }
MvpRef.get().setTopRoom(topRooms,type);
}
});
}
-
-
-
-// List topRooms = new ArrayList();
-// for (int i = 0; i < 5; i++) {
-// TopRoom topRoom = new TopRoom();
-// topRoom.setRoom_name("名："+i);
-// topRoom.setCover_picture("");
-// topRoom.setUser_count("123");
-// topRoom.setUser_list(new ArrayList());
-// TopRoom.UserList userList = new TopRoom.UserList();
-// userList.setHead_picture("");
-// topRoom.getUser_list().add(userList);
-// topRoom.setOn_line("123");
-// topRoom.setChatrooms("123");
-// topRoom.setPopularity("123");
-// topRoom.setRoom_id("123");
-// topRoom.setLabel_id("123");
-// topRoom.setVoice("123");
-// topRoom.setUser_id("123");
-// topRooms.add(topRoom);
-// }
-// MvpRef.get().setTopRoom(topRooms);
}
}
\ No newline at end of file