YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

删除部分不需要代码。

Browse Source
This commit is contained in:
骆召亮
2025-10-30 09:19:46 +08:00
parent f1ef717e2b
commit 430816878d
33 changed files with 1068 additions and 4211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@@ -189,7 +189,6 @@
android:name=".wxapi.WXEntryActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:exported="true"
android:taskAffinity="com.qxcm.qxlive"
android:launchMode="singleTask">
</activity>
<!-- 微信支付回调Activity（必须放在包名.wxapi路径下） -->

342
moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
View File

@@ -91,11 +91,13 @@ public class MessageListenerSingleton {
}
public static MessageListenerSingleton getInstance() {
synchronized (MessageListenerSingleton.class) {
if (instance == null) {
instance = new MessageListenerSingleton();
}
return instance;
}
}
/**
* 缓存消息（用于在Fragment未准备好时存储消息）
@@ -160,111 +162,6 @@ public class MessageListenerSingleton {
}
}
// 修改 joinGroup 方法
// public void joinGroup(String roomId) {
// if (TextUtils.isEmpty(roomId)) {
// return;
// }
//
// // 使用同步块确保操作的原子性
// synchronized (groupOperationLock) {
// if (isGroupOperationInProgress) {
// // 如果有操作正在进行，延迟执行
// mainHandler.removeCallbacksAndMessages(null);
// mainHandler.postDelayed(() -> joinGroup(roomId), 100);
// return;
// }
//
// isGroupOperationInProgress = true;
// }
//
//
// // 在新线程中执行操作
// new Thread(() -> {
// try {
// // 先退出当前群组
// if (groupId != null && !groupId.equals(roomId)) {
// try {
// quitGroup(groupId);
// // 执行退出操作
// // TIMGroupManager.getInstance().quitGroup(groupId);
// LogUtils.d("MessageListener", "退出群组: " + groupId);
// } catch (Exception e) {
// LogUtils.e("MessageListener", "退出群组失败: " + e.getMessage());
// }
// }
//
// // 等待一小段时间确保退出完成
// Thread.sleep(500);
//
// // 加入新群组
// try {
// // 执行加入操作
//
// ensureListenersAdded();
// V2TIMManager.getInstance().joinGroup("room" + roomId, "申请加入", new V2TIMCallback() {
// @Override
// public void onSuccess() {
// Log.d("@@@", "加入im群组成功：");
//
// groupId = roomId;
// }
//
// @Override
// public void onError(int code, String desc) {
// Log.d("@@@", "加入群组失败：" + code + "=" + desc);
// }
// });
//
// groupId = roomId;
// LogUtils.d("MessageListener", "加入群组: " + roomId);
// } catch (Exception e) {
// LogUtils.e("MessageListener", "加入群组失败: " + e.getMessage());
// }
// } catch (InterruptedException e) {
// Thread.currentThread().interrupt();
// } finally {
// synchronized (groupOperationLock) {
// isGroupOperationInProgress = false;
// }
// }
// }).start();
//
//
//// LogUtils.e("@@@", "加入房间的"+roomId);
//// if (groupId!=null){
//// quitGroup(groupId);
//// }
////
//// // 确保监听器已初始化并添加
//// ensureListenersAdded();
//// V2TIMManager.getInstance().joinGroup("room" + roomId, "申请加入", new V2TIMCallback() {
//// @Override
//// public void onSuccess() {
//// Log.d("@@@", "加入im群组成功：");
////
//// groupId = roomId;
//// }
////
//// @Override
//// public void onError(int code, String desc) {
//// Log.d("@@@", "加入群组失败：" + code + "=" + desc);
//// }
//// });
//
// if (tempGroupJoinListener == null) {
// tempGroupJoinListener = new OnMessageReceivedListener() {
// @Override
// public void onMessageReceived(RoomMessageEvent message) {
// // 处理消息
//
// }
// };
// addOnMessageReceivedListener(tempGroupJoinListener);
// }
// }
// 修改 joinGroup 方法，确保先退出再加入
public void joinGroup(String roomId) {
if (TextUtils.isEmpty(roomId)) {
@@ -381,13 +278,11 @@ public class MessageListenerSingleton {
simpleMsgListener = new V2TIMSimpleMsgListener() {
@Override
public void onRecvC2CTextMessage(String msgID, V2TIMUserInfo sender, String text) {
// notifyMessageReceived("C2C 文本消息：" + sender.getNickName() + " - " + text);
LogUtils.d("C2C 文本消息 " + sender.getNickName());
}
@Override
public void onRecvC2CCustomMessage(String msgID, V2TIMUserInfo sender, byte[] customData) {
// notifyMessageReceived("C2C 自定义（信令）消息：" + sender.getNickName());
LogUtils.d("C2C 自定义（信令）消息 " + sender.getNickName());
String message = new String(customData, StandardCharsets.UTF_8);
RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class);
@@ -396,13 +291,11 @@ public class MessageListenerSingleton {
@Override
public void onRecvGroupTextMessage(String msgID, String groupID, V2TIMGroupMemberInfo sender, String text) {
// notifyMessageReceived("群文本消息：群组 " + groupID + " 中 " + sender.getNickName() + " - " + text);
LogUtils.d("群文本消息：群组 " + groupID + " 中 " + sender.getNickName());
}
@Override
public void onRecvGroupCustomMessage(String msgID, String groupID, V2TIMGroupMemberInfo sender, byte[] customData) {
// notifyMessageReceived("群自定义（信令）消息：群组 " + groupID + " 中 " + sender.getNickName());
LogUtils.d("收到群自定义消息：群组 " + groupID + " 中 " + sender.getNickName());
if (!groupID.equals("")) {
String message = new String(customData, StandardCharsets.UTF_8);
@@ -441,29 +334,16 @@ public class MessageListenerSingleton {
@Override
public void onMemberEnter(String groupID, List<V2TIMGroupMemberInfo> memberList) {
// 有新成员加入群，该群所有的成员都能收到
// for (V2TIMGroupMemberInfo member : memberList) {
// notifyMessageReceived("系统消息：" + member.getNickName() + " 加入了群组");
// }
}
@Override
public void onMemberLeave(String groupID, V2TIMGroupMemberInfo member) {
// 有成员离开群，该群所有的成员都能收到
// notifyMessageReceived("系统消息：" + member.getNickName() + " 离开了群组");
}
@Override
public void onReceiveRESTCustomData(String groupID, byte[] customData) {
// 服务器发送的自定义系统通知
// 将 byte[] 转换为 String
// String message = new String(customData, StandardCharsets.UTF_8);
// RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class);
// if (groupID.contains(SpUtil.getMyRoomId())) {
// notifyMessageReceived(event);
// }
// LogUtils.e("收到群自定义消息(系统)：" + message);
String message = "";
try {
@@ -506,11 +386,11 @@ public class MessageListenerSingleton {
super.onTotalUnreadMessageCountChanged(totalUnreadCount);
UnreadCountEvent event = CommonAppContext.getInstance().getUnreadCountEvent();
if (event== null){
if (event == null) {
event = new UnreadCountEvent();
event.setBLong(0);
}
event.setALong( totalUnreadCount);
event.setALong(totalUnreadCount);
CommonAppContext.getInstance().setUnreadCountEvent(event);
EventBus.getDefault().post(event);
}
@@ -602,141 +482,10 @@ public class MessageListenerSingleton {
// 确保监听器已添加
private void ensureListenersAdded() {
// if (!listenersAdded) {
initListeners();
addAllListeners();
// listenersAdded = true;
// }
}
// private void initListeners() {
// // 简单消息监听器
// simpleMsgListener = new V2TIMSimpleMsgListener() {
// @Override
// public void onRecvC2CTextMessage(String msgID, V2TIMUserInfo sender, String text) {
//// notifyMessageReceived("C2C 文本消息：" + sender.getNickName() + " - " + text);
// LogUtils.d("C2C 文本消息 " + sender.getNickName());
// }
//
// @Override
// public void onRecvC2CCustomMessage(String msgID, V2TIMUserInfo sender, byte[] customData) {
//// notifyMessageReceived("C2C 自定义（信令）消息：" + sender.getNickName());
// LogUtils.d("C2C 自定义（信令）消息 " + sender.getNickName());
// String message = new String(customData, StandardCharsets.UTF_8);
// RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class);
// notifyMessageReceived(event);
// }
//
// @Override
// public void onRecvGroupTextMessage(String msgID, String groupID, V2TIMGroupMemberInfo sender, String text) {
//// notifyMessageReceived("群文本消息：群组 " + groupID + " 中 " + sender.getNickName() + " - " + text);
// LogUtils.d("群文本消息：群组 " + groupID + " 中 " + sender.getNickName());
// }
//
// @Override
// public void onRecvGroupCustomMessage(String msgID, String groupID, V2TIMGroupMemberInfo sender, byte[] customData) {
//// notifyMessageReceived("群自定义（信令）消息：群组 " + groupID + " 中 " + sender.getNickName());
// LogUtils.d("收到群自定义消息：群组 " + groupID + " 中 " + sender.getNickName());
// if (!groupID.equals("")) {
// String message = new String(customData, StandardCharsets.UTF_8);
// RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class);
// notifyMessageReceived(event);
// LogUtils.d("收到群自定义消息（信令）：", message);
// }else {
// String message = new String(customData, StandardCharsets.UTF_8);
// LogUtils.d("收到群自定义消息（信令）：", message);
// HeadlineBean event = GsonUtils.fromJson(message, HeadlineBean.class);
// EventBus.getDefault().post(event);
// }
//
// }
// };
// V2TIMManager.getMessageManager().addAdvancedMsgListener(v2TIMAdvancedMsgListener);
// V2TIMManager.getInstance().addSimpleMsgListener(simpleMsgListener);
//
// v2TIMAdvancedMsgListener=new V2TIMAdvancedMsgListener() {
// @Override
// public void onRecvNewMessage(V2TIMMessage msg) {
// super.onRecvNewMessage(msg);
// if (msg.isBroadcastMessage()) {
// // 收到了广播消息
// String message = new String(msg.getCustomElem().getData(), StandardCharsets.UTF_8);
// LogUtils.e("收到广播消息（系统）：",message);
// }
// }
// };
//
// groupListener = new V2TIMGroupListener() {
// @Override
// public void onMemberEnter(String groupID, List<V2TIMGroupMemberInfo> memberList) {
// // 有新成员加入群，该群所有的成员都能收到
//// for (V2TIMGroupMemberInfo member : memberList) {
//// notifyMessageReceived("系统消息：" + member.getNickName() + " 加入了群组");
//// }
// }
//
// @Override
// public void onMemberLeave(String groupID, V2TIMGroupMemberInfo member) {
// // 有成员离开群，该群所有的成员都能收到
//// notifyMessageReceived("系统消息：" + member.getNickName() + " 离开了群组");
// }
//
// @Override
// public void onReceiveRESTCustomData(String groupID, byte[] customData) {
// // 服务器发送的自定义系统通知
// // 将 byte[] 转换为 String
//
//// String message = new String(customData, StandardCharsets.UTF_8);
//// RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class);
//// if (groupID.contains(SpUtil.getMyRoomId())) {
//// notifyMessageReceived(event);
//// }
//// LogUtils.e("收到群自定义消息(系统)：" + message);
//
// String message = "";
// try {
//
// message = new String(customData, StandardCharsets.UTF_8);
// LogUtils.e("收到群自定义消息(系统)：" + message);
// } catch (Exception e) {
// // 处理转换过程中可能出现的异常，例如记录日志
// LogUtils.e("转换 customData 为 String 时出错：" + e.getMessage());
// return; // 退出方法，避免后续代码执行
// }
//
// RoomMessageEvent event = null;
// try {
// // 特殊处理某些消息类型
// event = parseSpecialMessageTypes(message);
// if (event == null) {
// // 使用默认解析
// event = GsonUtils.fromJson(message, RoomMessageEvent.class);
// }
//
//// event = GsonUtils.fromJson(message, RoomMessageEvent.class);
// } catch (Exception e) {
// // 处理 JSON 解析过程中可能出现的异常，例如记录日志
// LogUtils.e("解析 JSON 数据时出错：" + e.getMessage());
// return; // 退出方法，避免后续代码执行
// }
//
// if (groupID.contains(SpUtil.getMyRoomId())) {
// notifyMessageReceived(event);
// }
// }
// };
//
// V2TIMManager.getInstance().addGroupListener(groupListener);
//
// V2TIMConversationListener conversationListener = new V2TIMConversationListener() {
// @Override
// public void onTotalUnreadMessageCountChanged(long totalUnreadCount) {
// super.onTotalUnreadMessageCountChanged(totalUnreadCount);
// EventBus.getDefault().post(new UnreadCountEvent(totalUnreadCount));
// }
// };
// V2TIMManager.getConversationManager().addConversationListener(conversationListener);
// }
private RoomMessageEvent parseSpecialMessageTypes(String message) {
try {
@@ -756,77 +505,6 @@ public class MessageListenerSingleton {
}
}
// public static MessageListenerSingleton getInstance() {
// if (instance == null) {
// instance = new MessageListenerSingleton();
// }
// return instance;
// }
private OnMessageReceivedListener tempGroupJoinListener;
// public void joinGroup(String roomId) {
//
//// if (!mRoomId.isEmpty()){
//// V2TIMManager.getInstance().quitGroup("room"+roomId, new V2TIMCallback() {
//// @Override
//// public void onSuccess() {
//// LogUtils.d("退出群组成功");
//// }
////
//// @Override
//// public void onError(int code, String desc) {
//// LogUtils.d("退出群组失败");
//// }
//// });
//// }
// mRoomId=roomId;
//
// V2TIMManager.getInstance().joinGroup("room" + mRoomId, "申请加入", new V2TIMCallback() {
// @Override
// public void onSuccess() {
// RoomMessageEvent.T t = new RoomMessageEvent.T();
// t.setText("羽声严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
// // 加入群组成功
//// onMessageReceived(new RoomMessageEvent(1000, roomId, t));
//// EventBus.getDefault().post(new RoomMessageEvent(1000, mRoomId, t));
// notifyMessageReceived(new RoomMessageEvent(1000, mRoomId, t));
// }
//
// @Override
// public void onError(int code, String desc) {
// // 加入群组失败
// Log.d("@@@", "加入群组失败：" + code + "=" + desc);
// }
// });
//
// if (tempGroupJoinListener == null) {
// tempGroupJoinListener = new OnMessageReceivedListener() {
// @Override
// public void onMessageReceived(RoomMessageEvent message) {
// // 处理消息
// }
// };
// addOnMessageReceivedListener(tempGroupJoinListener);
// }
// initListeners();
// }
// public static void quitGroup(String mRoomId){
//
// V2TIMManager.getInstance().quitGroup("room"+mRoomId, new V2TIMCallback() {
// @Override
// public void onSuccess() {
// LogUtils.d("退出群组成功");
// removeGroupListeners();
// }
//
// @Override
// public void onError(int code, String desc) {
// LogUtils.d("退出群组失败", code,desc);
// removeGroupListeners();
// }
// });
// }
public void addOnMessageReceivedListener(OnMessageReceivedListener listener) {
listeners.add(listener);
}
@@ -884,16 +562,6 @@ public class MessageListenerSingleton {
}
// public static void reset(String roomId) {
// if (instance != null) {
// instance.listeners.clear();
// V2TIMManager.getInstance().removeSimpleMsgListener(instance.simpleMsgListener);
// V2TIMManager.getInstance().removeGroupListener(instance.groupListener);
// isInitialized = false;
// instance = null;
// quitGroup(roomId);
// }
// }
// RoomFragment.java 中添加
private final V2TIMSendCallback<V2TIMMessage> sendCallback = new V2TIMSendCallback<V2TIMMessage>() {
@Override

227
moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
View File

@@ -1,34 +1,28 @@
package com.xscm.moduleutil.rtc;
import static com.blankj.utilcode.util.SnackbarUtils.getView;
import static io.agora.rtc2.video.VideoEncoderConfiguration.*;
import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_30;
import static io.agora.rtc2.video.VideoEncoderConfiguration.ORIENTATION_MODE.*;
import static io.agora.rtc2.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_FIXED_LANDSCAPE;
import static io.agora.rtc2.video.VideoEncoderConfiguration.STANDARD_BITRATE;
import static io.agora.rtc2.video.VideoEncoderConfiguration.VD_1280x720;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.hardware.SensorManager;
import android.media.projection.MediaProjection;
import android.media.projection.MediaProjectionManager;
import android.os.Handler;
import android.os.Looper;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Display;
import android.view.OrientationEventListener;
import android.view.SurfaceView;
import android.view.WindowManager;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.blankj.utilcode.util.*;
import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.PathUtils;
import com.blankj.utilcode.util.ThreadUtils;
import com.liulishuo.okdownload.DownloadTask;
import com.liulishuo.okdownload.StatusUtil;
import com.liulishuo.okdownload.core.cause.EndCause;
@@ -45,15 +39,12 @@ import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.utils.Md5Utils;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.logger.Logger;
//import com.tencent.bugly.idasc.crashreport.CrashReport;
import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.io.FileInputStream;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -112,8 +103,6 @@ public class AgoraManager {
}
private AgoraManager() {
// this.context = context.getApplicationContext();
// init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
@@ -123,8 +112,6 @@ public class AgoraManager {
if (instance == null) {
instance = new AgoraManager();
context = con.getApplicationContext(); // 使用ApplicationContext避免内存泄漏
// init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
// init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
}
}
@@ -162,7 +149,6 @@ public class AgoraManager {
if (rtcEngine != null) {
return;
}
;
synchronized (AgoraManager.class) {
if (rtcEngine != null) {
@@ -214,51 +200,17 @@ public class AgoraManager {
/*Enable video module*/
rtcEngine.enableVideo();
// Setup video encoding configs
// rtcEngine.setVideoEncoderConfiguration(new VideoEncoderConfiguration(
// VD_640x360,
// FRAME_RATE_FPS_30,
// STANDARD_BITRATE,
// ORIENTATION_MODE_FIXED_PORTRAIT
// ));
/*Set up to play remote sound with receiver*/
rtcEngine.setDefaultAudioRoutetoSpeakerphone(true);
// OrientationEventListener orientationListener = new OrientationEventListener(context,
// SensorManager.SENSOR_DELAY_NORMAL) {
// @Override
// public void onOrientationChanged(int orientation) {
// int angle = calculateScreenAngle(orientation);
// try {
// rtcEngine.setVideoOrientation(angle); // 通知声网引擎调整视频方向
// } catch (Exception e) {
// Log.e("AgoraManager", "Set video orientation failed", e);
// }
// }
// };
// orientationListener.enable(); // 启用监听
} catch (Exception e) {
Log.e("AgoraManager", "Failed to configure RtcEngine", e);
}
}
}
}
public static int calculateScreenAngle(int orientation) {
if (orientation >= 315 || orientation < 45) {
return 0; // 竖屏（0度）
} else if (orientation >= 45 && orientation < 135) {
return 90; // 横屏右（90度）
} else if (orientation >= 135 && orientation < 225) {
return 180; // 倒竖屏（180度）
} else {
return 270; // 横屏左（270度）
}
}
/**
* 加入语音聊天房间
*/
@@ -360,53 +312,13 @@ public class AgoraManager {
}
musicContentCenter = IAgoraMusicContentCenter.create(rtcEngine);
contentCenterConfiguration = new MusicContentCenterConfiguration();
// 已开启音乐内容中心项目的 App ID
// 已开启音乐内容中心项目的 App ID
contentCenterConfiguration.appId = CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId();
// 使用音乐内容中心的用户 ID。该 ID 可以和你加入 RTC 频道时使用的 uid 一致，但不能为 0
// 使用音乐内容中心的用户 ID。该 ID 可以和你加入 RTC 频道时使用的 uid 一致，但不能为 0
contentCenterConfiguration.mccUid = uid;
// 填入用于鉴权的 Token
// 填入用于鉴权的 Token
contentCenterConfiguration.token = SpUtil.getRtmToken();
// 创建 IAgoraMusicContentCenterEventHandler，用于 SDK 向客户端发送音乐内容中心事件通知
// contentCenterConfiguration.eventHandler = new IMusicContentCenterEventHandler() {
// @Override
// public void onPreLoadEvent(String requestId, long songCode, int percent, String lyricUrl, int status, int errorCode) {
// LogUtils.e("@@@1", "requestId: " + requestId + ", songCode: " + songCode + ", percent: " + percent + ", lyricUrl: " + lyricUrl + ", status: " + status + ", errorCode: " + errorCode);
// if (!lyricUrl.isEmpty() && percent == 100 && !isBjMusic) {
// getLyricsInstance(lyricUrl);
// }
//// musicPlayer.open(songCode, 0);
// }
//
// @Override
// public void onMusicCollectionResult(String requestId, int page, int pageSize, int total, Music[] list, int errorCode) {
// LogUtils.e("@@@2", "requestId: " + requestId + ", page: " + page + ", pageSize: " + pageSize + ", total: " + total);
// MusicBean musicBean = new MusicBean();
// musicBean.setMusicList(Arrays.asList(list));
// musicBean.setPage(page);
// EventBus.getDefault().post(musicBean);
// }
//
// @Override
// public void onMusicChartsResult(String requestId, MusicChartInfo[] list, int errorCode) {
// LogUtils.e("@@@", "requestId: " + requestId);
// }
//
// @Override
// public void onLyricResult(String requestId, long songCode, String lyricUrl, int errorCode) {
// LogUtils.e("@@@22", "requestId: " + requestId + ", songCode: " + songCode + ", lyricUrl: " + lyricUrl + ", errorCode: " + errorCode);
// if (lyricUrl != null && !isBjMusic) {
// getLyricsInstance(lyricUrl);
// }
// }
//
// @Override
// public void onSongSimpleInfoResult(String requestId, long songCode, String simpleInfo, int errorCode) {
// LogUtils.e("@@@", "requestId: " + requestId + ", songCode: " + songCode + ", simpleInfo: " + simpleInfo + ", errorCode: " + errorCode);
// }
// };
// 初始化 IAgoraMusicContentCenter
musicContentCenter.initialize(contentCenterConfiguration);
if (musicPlayer != null) {
musicPlayer = null;
@@ -421,12 +333,6 @@ public class AgoraManager {
// getLyricsInstance(lyricUrl);
}
LogUtils.e("AgoraManager", "isPreload2: " + songCode, "percent: " + percent);
// if (!lyricUrl.isEmpty() && percent == 100 && !isBjMusic) {
// musicPlayer.stop();
// musicPlayer.open(songCode, 0);
//// getLyricsInstance(lyricUrl);
// }
}
@Override
@@ -478,13 +384,6 @@ public class AgoraManager {
@Override
public void onUserJoined(int uid, int elapsed) {//远端用户加入频道
// for (IRtcEngineEventHandler handler : eventHandlers) {
// if (handler != null) {
// handler.onUserJoined(uid, elapsed);
//
// }
// }
for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
if (listener != null) {
ThreadUtils.runOnUiThread(() -> {
@@ -505,19 +404,13 @@ public class AgoraManager {
@Override
public void onUserOffline(int uid, int reason) {//远端用户离开频道
// for (IRtcEngineEventHandler handler : eventHandlers) {
// if (handler != null) {
// handler.onUserOffline(uid, reason);
// }
for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
if (listener != null) {
ThreadUtils.runOnUiThread(() -> {
// 远程用户音量变化
listener.userOffline(uid, reason);
// }
});
}
// }
}
SurfaceView renderView = null;
rtcEngine.setupRemoteVideo(new VideoCanvas(null, Constants.RENDER_MODE_FIT, uid));
@@ -743,16 +636,6 @@ public class AgoraManager {
if (rtcEngine != null) {
options.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER;
// options.autoSubscribeVideo = true;
// options.autoSubscribeAudio = true;
//// 不发布摄像头采集的视频
// options.publishCameraTrack = false;
//// 不发布麦克风采集的视频
// options.publishMicrophoneTrack = false;
//// 在频道中发布屏幕采集的视频
// options.publishScreenCaptureVideo = true;
//// 在频道中发布屏幕采集的音频
// options.publishScreenCaptureAudio = true;
rtcEngine.setScreenCaptureScenario(Constants.ScreenScenarioType.SCREEN_SCENARIO_VIDEO);
rtcEngine.updateChannelMediaOptions(options);
}
@@ -760,30 +643,7 @@ public class AgoraManager {
public void post() {
if (rtcEngine != null) {
// rtcEngine.setParameters("{\"che.video.mobile_1080p\":true}");
// rtcEngine.setClientRole(Constants.CLIENT_ROLE_BROADCASTER);
//
// /*Enable video module*/
// rtcEngine.enableVideo();
// // Setup video encoding configs
// rtcEngine.setVideoEncoderConfiguration(new VideoEncoderConfiguration(
// VD_640x360,
// FRAME_RATE_FPS_15,
// STANDARD_BITRATE,
// ORIENTATION_MODE_ADAPTIVE
// ));
// /*Set up to play remote sound with receiver*/
// rtcEngine.setDefaultAudioRoutetoSpeakerphone(true);
ScreenCaptureParameters screenCaptureParameters = new ScreenCaptureParameters();
// screenCaptureParameters.captureVideo = true;
// screenCaptureParameters.videoCaptureParameters.width = 1440;
// screenCaptureParameters.videoCaptureParameters.height = 1940;
// screenCaptureParameters.videoCaptureParameters.framerate = 15;
// screenCaptureParameters.captureAudio = true;
// screenCaptureParameters.audioCaptureParameters.captureSignalVolume = 50;
//// screenCaptureParameters.videoCaptureParameters.bitrate = 500;
// rtcEngine.startScreenCapture(screenCaptureParameters);
WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
Display display = manager.getDefaultDisplay();
@@ -810,26 +670,6 @@ public class AgoraManager {
}
public void setExternalMediaProjection(MediaProjection[] mediaProjection){
rtcEngine.setExternalMediaProjection(mediaProjection[0]);
}
public void isPost(){
if (rtcEngine != null){
ScreenCaptureParameters screenCaptureParameters = new ScreenCaptureParameters();
// 设置新的屏幕共享参数
screenCaptureParameters.captureVideo = true;
screenCaptureParameters.videoCaptureParameters.width = 1280;
screenCaptureParameters.videoCaptureParameters.height = 720;
screenCaptureParameters.videoCaptureParameters.framerate = 30;
// 更新屏幕共享参数
rtcEngine.updateScreenCaptureParameters(screenCaptureParameters);
}
}
public void isMute(int index) {
if (rtcEngine != null) {
}
@@ -841,13 +681,6 @@ public class AgoraManager {
}
}
public void stopMusicPlayer() {
if (musicPlayer != null) {
musicPlayer.stop();
}
}
/**
* 完全销毁实例（只在应用退出时调用）
*/
@@ -900,8 +733,6 @@ public class AgoraManager {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
if (rtcEngine != null) {
// RtcConnection connection = new RtcConnection();
// connection.channelId = mRoomId;
if (connection == null) {
connection = new RtcConnection();
connection.channelId = pkRoomId;
@@ -927,9 +758,6 @@ public class AgoraManager {
* @param uid
*/
public void muteLocalAudioStreamEx(boolean enabled, int uid) {
// RtcConnection connection = new RtcConnection();
// connection.channelId = mRoomId;
// connection.localUid = uid;
if (rtcEngine == null) {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
@@ -968,23 +796,6 @@ public class AgoraManager {
return isLocalAudioEnabled;
}
/**
* 添加事件监听器（用于全局回调）
*/
// public void addEventHandler(IRtcEngineEventHandler handler) {
// if (handler != null && !eventHandlers.contains(handler)) {
// eventHandlers.add(handler);
// }
// }
/**
* 移除事件监听器
*/
// public void removeEventHandler(IRtcEngineEventHandler handler) {
// if (handler != null) {
// eventHandlers.remove(handler);
// }
// }
public void addSoundLevelListener(SoundLevelUpdateListener listener) {
if (soundLevelUpdateListeners != null) {
soundLevelUpdateListeners.add(listener);
@@ -1303,25 +1114,19 @@ public class AgoraManager {
public static void stopMuisc() {
if (musicPlayer != null) {
// if (musicPlayer.getState() == io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_PLAYING) {
musicPlayer.stop();
// }
}
}
public void pauseMusic() {
if (musicPlayer != null) {
// if (musicPlayer.getState() == io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_PLAYING) {
musicPlayer.pause();
// }
}
}
public void resumeMusic() {
if (musicPlayer != null) {
// if (musicPlayer.getState() == io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_PLAYING) {
musicPlayer.resume();
// }
}
}
@@ -1463,7 +1268,6 @@ public class AgoraManager {
@Override
public void retry(@NonNull DownloadTask task, @NonNull ResumeFailedCause cause) {
com.xscm.moduleutil.utils.logger.Logger.e("retry", cause);
// CrashReport.postCatchedException(new RuntimeException("下载文件重试:" + cause == null ? "" : cause.name()));
}
@Override
@@ -1483,18 +1287,11 @@ public class AgoraManager {
MusicFileBean musicFileBean = new MusicFileBean();
musicFileBean.setFileData(convertFileToByteArray(task.getFile()));
EventBus.getDefault().post(musicFileBean);
if (cause != null && cause != EndCause.COMPLETED) {
// CrashReport.postCatchedException(new RuntimeException("下载任务结束:" + cause == null ? "" : cause.name() + "_realCause:" + realCause == null ? "" : realCause.getMessage()));
}
}
});
}
}
public void setmSongCode(long songCode) {
mSongCode = songCode;
}
public void loadLrc(long songCode) {
mSongCode = songCode;
if (musicContentCenter != null) {

4
modulemain/src/main/AndroidManifest.xml
View File

@@ -4,6 +4,8 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 后台定位权限（Android 10+） -->
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.REORDER_TASKS" />
<application
android:theme="@style/AppTheme">
<activity
@@ -31,7 +33,6 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:enableOnBackInvokedCallback="false"
android:exported="false"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustPan" />
@@ -47,7 +48,6 @@
<activity
android:name=".activity.room.activity.RankingListActivity"
android:exported="false" />
<activity
android:name=".activity.room.activity.PopularRoomActivity"

2
modulemain/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
View File

@@ -1012,7 +1012,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
public void singleTaskToActivity(Class<?> clazz){
Intent intent = new Intent(this, clazz);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity( intent);
}

41
modulemain/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
View File

@@ -1,6 +1,7 @@
package com.xscm.modulemain.activity.main.activity;
import android.Manifest;
import android.app.ActivityManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -97,6 +98,24 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if ((intent.getFlags() | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) > 0) {
if (!isTaskRoot()) {
ActivityManager tasksManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
tasksManager.moveTaskToFront(getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
}
}
// 处理新的intent
// setIntent(intent);
// 处理tab切换
// checkTab(intent.getIntExtra("tab", -1));
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -185,28 +204,6 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
MvpPre.address_ip(event);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
// 处理新的intent
setIntent(intent);
// 检查是否需要跳转到房间
// if (shouldRestoreRoom()) {
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
// .withString("form", "首页")
// .withString("roomId", CommonAppContext.getInstance().playId)
// .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP)
// .navigation();
//
//// RoomManager.instance( CommonAppContext.getInstance()).joinRoomWithRoomId(CommonAppContext.getInstance().playId, true);
// return;
// }
// 处理tab切换
checkTab(intent.getIntExtra("tab", -1));
}
private void checkTab(int tab) {
if (tab >= 0) {
selectShow(tab);

15
modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java
View File

@@ -42,14 +42,6 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
@Override
protected void initData() {
// mBinding.topBar.setColor(getResources().getColor(R.color.white));
// mBinding.topBar.getIvBack().setClickable(true);
// mBinding.topBar.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// finish();
// }
// });
mAdapter = new PopularRoomAdapter();
mBinding.rvPopularRoom.setAdapter(mAdapter);
GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
@@ -76,17 +68,13 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
// EventBus.getDefault().post(new BannerRefreshEvent());
page = 1;
mAdapter.setNewData(new ArrayList<>());
MvpPre.getCarousels(1, page, "20", "2", "");
}
});
mAdapter.setOnRoomClickListener(new PopularRoomAdapter.OnRoomClickListener() {
@Override
public void onRoomClick(TopRoom room, int position) {
mAdapter.setOnRoomClickListener((room, position) -> {
if ( ClickUtils.isFastDoubleClick()){
return;
}
@@ -101,7 +89,6 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
MessageListenerSingleton.getInstance().joinGroup(item.getRoom_id());
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(), "",null);
}
}
});
}

15
modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
View File

@@ -6,13 +6,12 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.contacts.RedEnvelopesContacts;
import com.xscm.modulemain.activity.room.fragment.RedViewModel;
import com.xscm.modulemain.activity.room.presenter.RedEnvelopesPresenter;
import com.xscm.modulemain.adapter.RedAdapter;
import com.xscm.modulemain.databinding.FragmentRedBinding;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.moduleutil.bean.RedpacketDetail;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageUtils;
@@ -27,17 +26,9 @@ import org.jetbrains.annotations.NotNull;
@Route(path = ARouteConstants.ROOM_RED_RESULT)
public class RedResultActivity extends BaseMvpActivity<RedEnvelopesPresenter, FragmentRedBinding> implements RedEnvelopesContacts.View {
private RedViewModel mViewModel;
private RedAdapter redAdapter;
private int page = 1;
private String redpacketId;
// public static RedResultActivity newInstance() {
// return new RedResultActivity();
// }
@Override
protected void initData() {
redpacketId = getIntent().getStringExtra("redpacketId");
@@ -73,14 +64,10 @@ public class RedResultActivity extends BaseMvpActivity<RedEnvelopesPresenter, Fr
@Override
public void onRefresh(@NonNull @NotNull RefreshLayout refreshLayout) {
page = 1;
// MvpPre.getRoomHourRanking(page+"", "20");
}
@Override
public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) {
page++;
// MvpPre.getRoomHourRanking(page+"", "20");
}
});
}

240
modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -62,7 +62,7 @@ import com.xscm.modulemain.BaseMvpActivity
import com.xscm.modulemain.R
import com.xscm.modulemain.activity.main.activity.MainActivity
import com.xscm.modulemain.activity.room.contacts.RoomContacts
import com.xscm.modulemain.activity.room.fragment.PublicScreenEaseChatFragment
import com.xscm.modulemain.activity.room.fragment.ChatRoomFragment
import com.xscm.modulemain.activity.room.fragment.RedEnvelopesFragment
import com.xscm.modulemain.activity.room.fragment.RoomCabinFragment
import com.xscm.modulemain.activity.room.fragment.RoomChartsFragment
@@ -91,7 +91,6 @@ import com.xscm.modulemain.manager.RoomManager
import com.xscm.modulemain.service.ForegroundService
import com.xscm.modulemain.service.RoomPlayService
import com.xscm.moduleutil.BaseEvent
import com.xscm.moduleutil.adapter.CommonPageAdapter
import com.xscm.moduleutil.adapter.LikeUserAdapter
import com.xscm.moduleutil.base.AppStateListener
import com.xscm.moduleutil.base.AppStateManager
@@ -114,7 +113,6 @@ import com.xscm.moduleutil.bean.room.FriendInfo.HeartList
import com.xscm.moduleutil.bean.room.FriendUserBean
import com.xscm.moduleutil.bean.room.RoomAuction
import com.xscm.moduleutil.bean.room.RoomAuction.AuctionListBean
import com.xscm.moduleutil.bean.room.RoomAuction.AuctionUserBean
import com.xscm.moduleutil.bean.room.RoomBean
import com.xscm.moduleutil.bean.room.RoomInfoResp
import com.xscm.moduleutil.bean.room.RoomOnline
@@ -182,22 +180,15 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener,
QXRedPacketManager.QXRedPacketManagerDelegate {
private var roomFragment: RoomFragment? = null
var commonPageAdapter: CommonPageAdapter? = null
private var mRoomBean: RoomBean? = null
//房主信息
private var mRoomOwnerBean: RoomOwnerBean? = null
//房间用户信息
private var mRoomUserBean: RoomUserBean? = null
private var mPitList: List<RoomPitBean> = ArrayList()
var password: String? = null
var roomId: String? = null
var mRoomInfoResp: RoomInfoResp? = null
@JvmField
@Autowired
var taskId: String? = null
@@ -217,13 +208,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
var ivQuan: ImageView? = null
private var imYc = false
@JvmField
@Autowired
var isOnline: Boolean = false
private var silentCountDownTimer: SilentCountDownTimer? = null
private var circularProgress: CircularProgressView? = null
private var publicScreenFragment: PublicScreenEaseChatFragment? = null // 添加成员变量
private var publicScreenFragment: ChatRoomFragment? = null // 添加成员变量
// 添加成员变量
private var isLayoutAdjusted = false
@@ -237,12 +226,81 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private var qxRedPacketManager: QXRedPacketManager? = null
override fun doDone() {
isOnline = intent.getBooleanExtra("isOnline", false)
password = intent.getStringExtra("password")
roomId = intent.getStringExtra("roomId")
mRoomInfoResp = intent.getSerializableExtra("roomInfo") as RoomInfoResp?
LogUtils.dTag("RoomActivit", "doDone" + mRoomInfoResp.toString())
taskId = intent.getStringExtra("taskId")
}
override fun onNewIntent(intent: Intent, caller: ComponentCaller) {
super.onNewIntent(intent, caller)
if ((intent.flags or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) > 0) {
if (!isTaskRoot) {
val tasksManager = getSystemService(ACTIVITY_SERVICE) as ActivityManager
tasksManager.moveTaskToFront(getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION)
}
}
LogUtils.e("RoomActivity", "onNewIntent")
}
override fun onCreate(savedInstanceState: Bundle?) {
// 在super.onCreate之前设置主题以避免闪白屏
setTheme(com.xscm.moduleutil.R.style.BaseAppTheme) // 设置你的主主题
super.onCreate(savedInstanceState)
// // 进入房间10s后检查是否显示提示上麦对话框
LogUtils.e("RoomActivity", "onCreate")
isSave = false
sDestroied = false
isMinimized = false
startKeepLiveService() //保活
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
sActivityRef = WeakReference(this)
// 检查是否有保存的最小化状态
checkAndRestoreMinimizeState()
if (onBackPressedDispatcher != null) {
onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
// 拦截返回键，显示退出对话框而不是直接退出
showExitRoomDialog()
}
})
}
// 获取Application实例并设置监听器
val app = application as CommonAppContext
appStateListener = AppStateManager.getInstance()
app.setAppStateListener(appStateListener)
// 通知RoomActivity已创建
if (appStateListener != null) {
appStateListener?.onRoomActivityCreated(this)
}
MessageListenerSingleton.getInstance().joinGroup(roomId)
// 处理房间数据
SpUtil.saveMyRoomId(roomId)
// 检查是否从最小化状态恢复
if (isMinimized) {
// 恢复房间状态
resumeRoomState()
}
V2TIMManager.getInstance().addIMSDKListener(imSdkListener);
// 在 RoomActivity 中获取单例实例
// 在onCreate中初始化红包管理器实例，以便在整个Activity生命周期中使用
qxRedPacketManager = QXRedPacketManager.getInstance()
// 获取单例实例并设置委托
qxRedPacketManager!!.delegate = this;
// 初始化礼物管理器
GiftDisplayManager.getInstance().setupDisplayView(mBinding!!.giftContainer)
initPublicScreenFragment()
}
// 添加弹框到管理列表
fun addActiveDialog(dialog: DialogInterface) {
activeDialogs.add(dialog)
@@ -252,14 +310,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
activeDialogFragments.add(dialogFragment)
}
override fun doDone() {
isOnline = intent.getBooleanExtra("isOnline", false)
password = intent.getStringExtra("password")
roomId = intent.getStringExtra("roomId")
mRoomInfoResp = intent.getSerializableExtra("roomInfo") as RoomInfoResp?
LogUtils.dTag("RoomActivit", "doDone" + mRoomInfoResp.toString())
taskId = intent.getStringExtra("taskId")
}
private var bgEffectView: View? = null
@@ -481,7 +532,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
supportFragmentManager.findFragmentById(R.id.vp_room_pager) // 替换为你实际的容器 ID
if (currentFragment is RoomCabinFragment) {
currentFragment.onConfigurationChanged(newConfig)
initPublicScreenFragment()
}
}
@@ -489,7 +540,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
publicScreenFragment!!.someMethod()
}
/**
* 释放当前房间
*/
@@ -506,68 +556,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
LogUtils.e("RoomActivity", "onDestroy")
}
override fun onCreate(savedInstanceState: Bundle?) {
// 在super.onCreate之前设置主题以避免闪白屏
setTheme(com.xscm.moduleutil.R.style.BaseAppTheme) // 设置你的主主题
super.onCreate(savedInstanceState)
// // 进入房间10s后检查是否显示提示上麦对话框
LogUtils.e("RoomActivity", "onCreate")
isSave = false
sDestroied = false
isMinimized = false
// overridePendingTransition(0, 0) // 关闭转场动画
startKeepLiveService() //保活
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
sActivityRef = WeakReference(this)
// 检查是否有保存的最小化状态
checkAndRestoreMinimizeState()
if (onBackPressedDispatcher != null) {
onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
// 拦截返回键，显示退出对话框而不是直接退出
showExitRoomDialog()
}
})
}
// 获取Application实例并设置监听器
val app = application as CommonAppContext
appStateListener = AppStateManager.getInstance()
app.setAppStateListener(appStateListener)
// 通知RoomActivity已创建
if (appStateListener != null) {
appStateListener?.onRoomActivityCreated(this)
}
MessageListenerSingleton.getInstance().joinGroup(roomId)
// 处理房间数据
SpUtil.saveMyRoomId(roomId)
// 检查是否从最小化状态恢复
if (isMinimized) {
// 恢复房间状态
resumeRoomState()
}
V2TIMManager.getInstance().addIMSDKListener(imSdkListener);
// 在 RoomActivity 中获取单例实例
// 在onCreate中初始化红包管理器实例，以便在整个Activity生命周期中使用
qxRedPacketManager = QXRedPacketManager.getInstance()
// 获取单例实例并设置委托
qxRedPacketManager!!.setDelegate(this);
// 初始化礼物管理器
GiftDisplayManager.getInstance().setupDisplayView(mBinding!!.giftContainer)
}
private val imSdkListener = object : V2TIMSDKListener() {
override fun onConnecting() {}
@@ -602,7 +590,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onSelfInfoUpdated(info: V2TIMUserFullInfo?) {}
}
private fun setview(resp: RoomInfoResp?) {
private fun setView(resp: RoomInfoResp?) {
if (resp == null)
return
AppStateManager.getInstance().roomInfo = resp
@@ -640,7 +628,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
userIds.append(userId)
}
}
initPublicScreenFragment()
// 确保Fragment已完全初始化后再调用getUpRoomInfo
if (publicScreenFragment != null && publicScreenFragment!!.isAdded && publicScreenFragment!!.view != null) {
publicScreenFragment!!.getUpRoomInfo(resp)
@@ -784,9 +771,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
53
)
mBinding!!.roomTop.btnFollow.setTextColor(ColorManager.getInstance().buttonColorInt)
initPublicScreenFragment()
// stub = mBinding.roomTop.stubButtons.getViewStub();
// 为透明 View 设置触摸监听
mBinding!!.roomTop.rlTop.setOnTouchListener { v, event ->
@@ -1021,8 +1005,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val params = layoutParams
params.width = ConstraintLayout.LayoutParams.MATCH_CONSTRAINT
params.height = ConstraintLayout.LayoutParams.MATCH_CONSTRAINT
// params.horizontalBias = 0.5f
// params.verticalBias = 0.5f
floatingMagnetView!!.layoutParams = params
} else {
// 如果不是ConstraintLayout.LayoutParams，创建新的
@@ -1232,18 +1214,14 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
})
mBinding!!.roomTop.root.isClickable = false
setview(mRoomInfoResp)
setView(mRoomInfoResp)
}
private fun initPublicScreenFragment() {
// 检查是否已经存在 Fragment 实例（例如在配置更改后）
publicScreenFragment = supportFragmentManager
.findFragmentById(R.id.ease_container) as PublicScreenEaseChatFragment?
// 如果不存在，则创建新的实例
if (publicScreenFragment == null) {
publicScreenFragment = PublicScreenEaseChatFragment.newInstance(roomId)
publicScreenFragment = ChatRoomFragment.newInstance(roomId)
supportFragmentManager.beginTransaction()
.replace(R.id.ease_container, publicScreenFragment!!)
.commitAllowingStateLoss()
@@ -2348,27 +2326,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
return pitBean
}
// TODO: 2025/8/29 排麦位上麦
private fun getPitBean3(messageEvent: RoomMessageEvent): AuctionUserBean {
val roomAuction = AuctionUserBean()
roomAuction.user_id = messageEvent.text.fromUserInfo.user_id.toString() + ""
roomAuction.avatar = messageEvent.text.fromUserInfo.avatar
roomAuction.nickname = messageEvent.text.fromUserInfo.nickname
roomAuction.sex = messageEvent.text.fromUserInfo.sex.toString() + ""
roomAuction.charm = messageEvent.text.fromUserInfo.charm
return roomAuction
}
fun mus() {
if (mRoomInfoResp!!.user_info.is_mute == "1") {
ToastUtils.show("您已经被禁言")
} else {
switchMic(1)
}
}
private fun querenPk(text: String, pk_id: String) {
// 创建并显示确认对话框
val dialog = ConfirmDialog(
@@ -2408,10 +2365,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (`is`) View.VISIBLE else View.GONE
}
fun setDiany(`is`: Boolean) {
// mBinding.flaoat.setVisibility(is? VISIBLE : GONE);
}
fun setOnlineNumber(number: Int) {
mBinding!!.roomTop.tvNum.text = number.toString() + ""
}
@@ -2633,28 +2586,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
return false
}
private fun quitUpRoom() {
// 清理最小化状态
clearMinimizeState()
isMinimized = false
// 执行退出房间逻辑
CommonAppContext.getInstance().isPlaying = false
CommonAppContext.getInstance().isShow = false
CommonAppContext.getInstance().playId = null
QXGiftPlayerManager.getInstance(this).destroyEffectSvga()
// 停止屏幕捕获和其他资源
// AgoraManager.getInstance(this).stopScreenCapture();
AgoraManager.getInstance(this).leaveRoom()
// AgoraManager.getInstance(this).stopMusicPlayer();
AgoraManager.getInstance(this).cleanup()
MyRoomSingleton.getInstance().onExitRoom()
MessageListenerSingleton.quitGroup(roomId)
cleanupResources()
}
private fun minimizeToBackground() {
isMinimized = true
// 保存最小化状态和房间ID
@@ -2667,6 +2598,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
QXGiftPlayerManager.getInstance(applicationContext).destroyEffectSvga()
val am = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
val tasks = am.appTasks // 获取当前应用的任务栈
tasks.forEach { task ->
Log.d("TaskStack", "任务栈ID：${task.taskInfo.id} currId:${this.getTaskId()}，包含的Activity：${task.taskInfo.baseActivity?.className}")
}
if (ActivityUtils.getActivityList().size <= 1){
singleTaskToActivity(MainActivity::class.java)
}else{
@@ -3092,7 +3029,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
userIds.append(userId)
}
}
initPublicScreenFragment()
if (!isFinishing && !isDestroyed) {
resetFragment()
upHeight()
@@ -3800,13 +3736,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
@SuppressLint("UseCompatLoadingForDrawables")
override fun postRoomInfo(resp: RoomInfoResp?) {
if (resp == null) {
// CommonAppContext.getInstance().isShow = false;
// CommonAppContext.getInstance().isPlaying = false;
// ToastUtils.showShort("您已经掉线，需要重新进入房间！");
// ARouter.getInstance().build(ARouteConstants.ME)
// .navigation();
// 只有在没有房间信息时才重新获取
if (mRoomInfoResp == null) {
cleanupResources()
@@ -3819,9 +3751,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val roomBean = resp.room_info
if (roomBean!!.type_id.equals("6")) {
// upHeight()
initPublicScreenFragment()
if (!isFinishing && !isDestroyed) {
resetFragment()
upHeight()
@@ -3848,7 +3777,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding!!.roomTop.btnFollow.text = ""
}
}
initPublicScreenFragment()
if (!isFinishing && !isDestroyed) {
resetFragment()
upHeight()
@@ -3856,7 +3784,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
Log.e("Fragment", "Fragment transaction skipped due to state loss.")
}
if (mRoomUserBean?.getIs_collect() == 1) {
if (mRoomUserBean?.is_collect == 1) {
mBinding!!.roomTop.btnFollow.background =
resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc)
mBinding!!.roomTop.btnFollow.text = ""

53
modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
View File

@@ -33,6 +33,7 @@ import com.xscm.moduleutil.widget.dialog.CommonDialog;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/*
* 搜索页面
@@ -111,41 +112,29 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
MvpPre.getSearchHistory();
//快捷搜索列表点击
mSearchRecordAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
MvpPre.saveSearchHistory(mSearchRecordAdapter.getItem(position).t);
MvpPre.search(mSearchRecordAdapter.getItem(position).t);
}
mSearchRecordAdapter.setOnItemChildClickListener((adapter, view, position) -> {
MvpPre.saveSearchHistory(Objects.requireNonNull(mSearchRecordAdapter.getItem(position)).t);
MvpPre.search(Objects.requireNonNull(mSearchRecordAdapter.getItem(position)).t);
});
//搜索历史点击
mSearchHistoryAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
mSearchHistoryAdapter.setOnItemClickListener((adapter, view, position) -> {
mBinding.editQuery.setText(mSearchHistoryAdapter.getItem(position));
try {
mBinding.editQuery.setSelection(mSearchHistoryAdapter.getItem(position).length());
} catch (Exception e) {
e.printStackTrace();
}
}
});
//关注或取消关注
mSearchUserResultAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
mSearchUserResultAdapter.setOnItemChildClickListener((adapter, view, position) -> {
UserResultResp item = mSearchUserResultAdapter.getItem(position);
MvpPre.followUser(item.getUser_id(), item.getFollow().equals("0") ? 1 : 2, position);
}
});
//用户列表点击事件
mSearchUserResultAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
UserResultResp item = mSearchUserResultAdapter.getItem(position);
if (item != null) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", item.getUser_id()).navigation();
}
}
});
@@ -154,40 +143,32 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
public void onGnsClick(UserResultResp item) {
if (item.getRoom_id() != null && !item.getRoom_id().isEmpty() && !"0".equals(item.getRoom_id())) {
RoomManager.getInstance().fetchRoomDataAndEnter(SearchActivity.this, item.getRoom_id() + "", "",null);
RoomManager.getInstance().fetchRoomDataAndEnter(SearchActivity.this, item.getRoom_id(), "",null);
} else {
ChatLauncher.getInstance().launchC2CChat(SearchActivity.this, item.getUser_id() + "");
ChatLauncher.getInstance().launchC2CChat(SearchActivity.this, item.getUser_id());
}
}
@Override
public void onHeadImageClick(UserResultResp item) {
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id() + "").navigation();
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id()).navigation();
//
}
});
//房间列表点击时事件
mSearchRoomResultAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
mSearchRoomResultAdapter.setOnItemClickListener((adapter, view, position) -> {
RoomSearchResp item = mSearchRoomResultAdapter.getItem(position);
if (item != null) {
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(), "",null);
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "搜索界面").withString("roomId", item.getId()).navigation();
}
}
});
mBinding.ivDelete.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mBinding.ivDelete.setOnClickListener(v -> {
if (commonDialog == null) {
commonDialog = new CommonDialog(SearchActivity.this);
commonDialog.setmOnClickListener(SearchActivity.this);
}
commonDialog.show();
}
});
mBinding.ivClose.setOnClickListener(v -> {
if (!StringUtils.isEmpty(keyWord)) {
@@ -243,7 +224,6 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
mBinding.recycleViewRoom.setVisibility(View.GONE);
mBinding.rlRoom.setVisibility(View.GONE);
} else {
// roomResultInfoList = room_result.getList();
mBinding.recycleViewRoom.setVisibility(View.VISIBLE);
mBinding.rlRoom.setVisibility(View.VISIBLE);
if (data.getRooms().size() > 2) {
@@ -262,8 +242,6 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
mBinding.recycleViewUser.setVisibility(View.GONE);
}
}
// mSearchRoomResultAdapter.setNewData(data);
}
/**
@@ -290,25 +268,16 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
UserResultResp item = mSearchUserResultAdapter.getItem(postion);
item.setFollow(type == 1 ? "1" : "0");
mSearchUserResultAdapter.notifyItemChanged(postion, item);
// type 1关注 2取消关注
// EventBus.getDefault().post(new FamilyTrendFollowEvent(null, 1, item.getUser_id()));
}
@Override
public void onLeftClick() {
}
@Override
public void onRightClick() {
MvpPre.deleteSearchHistory();
MvpPre.getSearchHistory();
}
@Override
protected void onDestroy() {
super.onDestroy();
// AppLogUtil.reportAppLog(AppLogEvent.A020302);
}
}

2
modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublicScreenEaseChatContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/ChatRoomContacts.java
View File

@@ -6,7 +6,7 @@ import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
public final class PublicScreenEaseChatContacts {
public final class ChatRoomContacts {
public interface View extends IView<Activity> {

728
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java Normal file
View File

@@ -0,0 +1,728 @@
package com.xscm.modulemain.activity.room.fragment;
import android.graphics.Color;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.LogUtils;
import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMMessage;
import com.tencent.imsdk.v2.V2TIMSendCallback;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.room.contacts.ChatRoomContacts;
import com.xscm.modulemain.activity.room.presenter.ChatRoomPresenter;
import com.xscm.modulemain.adapter.EaseChatAdapter;
import com.xscm.modulemain.databinding.RoomFragementTransEaseChatBinding;
import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.RoomInputEvent;
import com.xscm.moduleutil.bean.RoomMessageEvent;
import com.xscm.moduleutil.bean.RoomSettingEvent;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.room.Children;
import com.xscm.moduleutil.bean.room.EMMessageInfo;
import com.xscm.moduleutil.bean.room.EmotionDeatils;
import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.bean.room.RoomUserBean;
import com.xscm.moduleutil.event.RoomJoinMountModel;
import com.xscm.moduleutil.event.RoomTaskEvent;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.rtc.MusicPlayBean;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.logger.Logger;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
/**
* @author qx
* @data 2025/6/17
* @description: 聊天室
*/
public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFragementTransEaseChatBinding>
implements ChatRoomContacts.View {
private final static String TAG = "聊天室";
private boolean isBottom = true;
private int count = 0;
private RoomInfoResp roomInfoResp;
private EaseChatAdapter easeChatAdapter;
private CountDownTimer countDownTimer;
private String roomId;
private MessageListenerSingleton.PublicScreenMessageListener messageListener;
// 清屏
public void someMethod() {
easeChatAdapter.clearData();
}
public static ChatRoomFragment newInstance(String roomId) {
ChatRoomFragment transEaseChatFragment = new ChatRoomFragment();
Bundle bundle = new Bundle();
bundle.putString("roomId", roomId);
transEaseChatFragment.setArguments(bundle);
return transEaseChatFragment;
}
@Override
protected ChatRoomPresenter bindPresenter() {
return new ChatRoomPresenter(this, getActivity());
}
@Override
public void initArgs(Bundle arguments) {
super.initArgs(arguments);
roomId = arguments.getString("roomId");
}
@Override
public void onDestroyView() {
onFragmentShowDestroy();
super.onDestroyView();
}
public void onFragmentShowDestroy() {
if (countDownTimer != null) {
countDownTimer.cancel();
}
if (messageListener != null) {
LogUtils.e("移除监听器");
MessageListenerSingleton.getInstance().removePublicScreenMessageListener(messageListener);
}
}
@Override
protected void initData() {
onChatRoomViewCreation();
}
/**
* 登录聊天室
*/
public void onChatRoomViewCreation() {
// 先移除旧的监听器
if (messageListener != null) {
MessageListenerSingleton.getInstance().removePublicScreenMessageListener(messageListener);
messageListener = null;
}
// 设置消息监听器
setupMessageListener();
// 检查是否有缓存的消息需要处理
checkAndProcessCachedMessages();
}
/**
* 设置消息监听器
*/
private void setupMessageListener() {
// 创建并添加监听器
messageListener = message -> {
// 确保在主线程更新 UI
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
handleRoomMessage(message);
}
});
}
};
MessageListenerSingleton.getInstance().addPublicScreenMessageListener(messageListener);
}
/**
* 检查并处理缓存的消息
*/
private void checkAndProcessCachedMessages() {
if (roomId == null || roomId.isEmpty()) {
return;
}
// 延迟一小段时间，确保监听器已注册
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
// 获取并处理缓存的消息
List<RoomMessageEvent> cachedMessages = MessageListenerSingleton.getInstance().getAndClearCachedMessages(roomId);
if (!cachedMessages.isEmpty()) {
LogUtils.d("PublicScreenEaseChatFragment", "处理缓存消息数量: " + cachedMessages.size());
for (RoomMessageEvent message : cachedMessages) {
handleRoomMessage(message);
}
}
}
}, 300); // 延迟300ms确保监听器已注册
}
@Override
protected void initListener() {
mBinding.recycleViewPublic.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
if (newState == RecyclerView.SCROLL_STATE_IDLE) {
LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
//屏幕中最后一个可见子项的position
int lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition();
//当前屏幕所看到的子项个数
int visibleItemCount = layoutManager.getChildCount();
//当前RecyclerView的所有子项个数
int totalItemCount = layoutManager.getItemCount();
//RecyclerView的滑动状态
if (visibleItemCount > 0 && lastVisibleItemPosition == totalItemCount - 1) {
if (mBinding.tvCount != null) {
mBinding.tvCount.setVisibility(View.GONE);
}
isBottom = true;
count = 0;
} else {
isBottom = false;
}
}
}
});
}
public void getUpRoomInfo(RoomInfoResp resp) {
this.roomInfoResp = resp;
// 确保Fragment视图已创建
if (isAdded() && getActivity() != null && mBinding != null) {
// 确保适配器已初始化
if (easeChatAdapter == null) {
initChatAdapter();
}
if (easeChatAdapter != null) {
easeChatAdapter.clearData();
}
this.roomId = roomInfoResp.getRoom_info().getRoom_id();
RoomMessageEvent.T t = new RoomMessageEvent.T();
t.setText("羽声严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
// 加入群组成功
handleRoomMessage(new RoomMessageEvent(1000, roomId, t));
onChatRoomViewCreation();
} else {
// 如果视图尚未准备好，延迟执行
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
// 使用post延迟执行，确保视图已创建
if (getView() != null) {
getView().post(new Runnable() {
@Override
public void run() {
getUpRoomInfo(resp);
}
});
}
}
});
}
}
}
@Override
protected void initView() {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
mBinding.recycleViewPublic.setLayoutManager(linearLayoutManager);
initChatAdapter();
easeChatAdapter.setOnItemClickListener((adapter, view, position) -> {
EMMessageInfo item = easeChatAdapter.getItem(position);
RoomMessageEvent emMessage = item.getEmMessage();
if (emMessage.getText().getFromUserInfo() != null) {
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), emMessage.getText().getFromUserInfo().getUser_id() != 0 ? emMessage.getText().getFromUserInfo().getUser_id() + "" : emMessage.getText().getFromUserInfo().getId() + "", emMessage.getText().getFromUserInfo().getPit_number(), getHostUser(roomInfoResp.getUser_info()), false, 5, isNumberWhether(), getChildFragmentManager());
}
});
// //判断是否开启公屏
setUpPublicScreen();
mBinding.tvCount.setOnClickListener(this::onClick);
mBinding.tvTabAll.setOnClickListener(this::onClick);
mBinding.tvTabUser.setOnClickListener(this::onClick);
mBinding.tvTabSystem.setOnClickListener(this::onClick);
}
/**
* 初始化聊天适配器
*/
private void initChatAdapter() {
if (easeChatAdapter == null) {
easeChatAdapter = new EaseChatAdapter();
// 添加空值检查，确保mBinding和recycleViewPublic都不为null
if (mBinding != null) {
mBinding.recycleViewPublic.setAdapter(easeChatAdapter);
}
}
}
private int isNumberWhether() {
if (roomInfoResp.getUser_info().getPit_number() == 9) {
return 1;
}
return 0;
}
private int getHostUser(RoomUserBean item) {
if (item.getPit_number() != 0) {
if (item.getIs_room_owner() == 1) {
return 1;
} else if (item.getIs_management() == 1) {
return 2;
} else if (item.getIs_host() == 1) {
return 3;
} else {
return 4;
}
} else {
if (item.getIs_room_owner() == 1) {
return 1;
} else if (item.getIs_management() == 1) {
return 2;
} else if (item.getIs_host() == 1) {
return 3;
}
return 4;
}
}
private void setUpPublicScreen() {
if (mBinding.recycleViewPublic.getChildCount() > 0) {
mBinding.recycleViewPublic.removeAllViews();
}
mBinding.recycleViewPublic.setVisibility(View.VISIBLE);//开启消息列表
mBinding.llHeadTab.setVisibility(View.GONE);
mBinding.tvClose.setVisibility(View.GONE);
count = 0;//未读数0
isBottom = true;
}
@Override
protected int getLayoutId() {
return R.layout.room_fragement_trans_ease_chat;
}
public void onClick(View view) {
int view_id = view.getId();
if (view_id == R.id.tv_tab_all) {
easeChatAdapter.setShowType(EaseChatAdapter.SHOW_TYPE_ALL);
mBinding.tvTabAll.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabAll.setTextSize(14);
mBinding.tvTabUser.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabSystem.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabSystem.setBackgroundResource(0);
mBinding.tvTabUser.setBackgroundResource(0);
mBinding.tvTabUser.setTextSize(12);
mBinding.tvTabSystem.setTextSize(12);
} else if (view_id == R.id.tv_tab_user) {
easeChatAdapter.setShowType(EaseChatAdapter.SHOW_TYPE_USER);
mBinding.tvTabUser.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabUser.setTextSize(14);
mBinding.tvTabAll.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabSystem.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabSystem.setBackgroundResource(0);
mBinding.tvTabAll.setBackgroundResource(0);
mBinding.tvTabAll.setTextSize(12);
mBinding.tvTabSystem.setTextSize(12);
} else if (view_id == R.id.tv_tab_system) {
easeChatAdapter.setShowType(EaseChatAdapter.SHOW_TYPE_SYSTEM);
mBinding.tvTabSystem.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabSystem.setTextSize(14);
mBinding.tvTabAll.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabUser.setTextColor(Color.parseColor("#FFFFFF"));
mBinding.tvTabUser.setBackgroundResource(0);
mBinding.tvTabAll.setBackgroundResource(0);
mBinding.tvTabAll.setTextSize(12);
mBinding.tvTabUser.setTextSize(12);
} else if (view_id == R.id.tv_count) {
mBinding.recycleViewPublic.scrollToPosition(easeChatAdapter.getItemCount() - 1);
mBinding.tvCount.setVisibility(View.GONE);
}
}
public void fasong(RoomInputEvent roomInputEvent) {
String message = roomInputEvent.text;
RoomMessageEvent.T t = new RoomMessageEvent.T();
t.setText(message);
t.setFromUserInfo(SpUtil.getUserInfo());
RoomMessageEvent roomMessageEvent = new RoomMessageEvent(1, roomInfoResp.getRoom_info().getRoom_id(), t);
handleRoomMessage(roomMessageEvent);
String json = GsonUtils.toJson(roomMessageEvent);
// 转换为 byte[]
byte[] binaryData = json.getBytes(StandardCharsets.UTF_8);
// 创建自定义消息
V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(binaryData);
// 发送消息
V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, null, "room" + roomInfoResp.getRoom_info().getRoom_id(), V2TIMMessage.V2TIM_PRIORITY_NORMAL, false, null, new V2TIMSendCallback<V2TIMMessage>() {
@Override
public void onProgress(int progress) {
// 自定义消息不会回调进度
}
@Override
public void onSuccess(V2TIMMessage message) {
// 发送群聊自定义消息成功
EventBus.getDefault().post(new RoomTaskEvent());
}
@Override
public void onError(int code, String desc) {
// 发送群聊自定义消息失败
}
});
}
public void sendChatEmoji(EmotionDeatils emotionDeatils) {
EmotionDeatils event = new EmotionDeatils();
if (emotionDeatils != null && emotionDeatils.getChildren() != null && !emotionDeatils.getChildren().isEmpty() && !emotionDeatils.getChildren().isEmpty()) {
int position = new Random().nextInt(emotionDeatils.getChildren().size());
Children children = emotionDeatils.getChildren().get(position);
event.setImage(children.getImage());
event.setAnimate_image(emotionDeatils.getAnimate_image());
} else {
event = emotionDeatils;
}
RoomMessageEvent roomMessageEvent = new RoomMessageEvent();
roomMessageEvent.setRoomId(roomId);
roomMessageEvent.setMsgType(2);//这是表情类型，1：单发文本消息 2：单发表情消息
UserInfo userInfo = SpUtil.getUserInfo();
RoomMessageEvent.T t = new RoomMessageEvent.T();
t.setFromUserInfo(userInfo);
t.setEmoji(event);
roomMessageEvent.setText(t);
handleRoomMessage(roomMessageEvent);
String json = GsonUtils.toJson(roomMessageEvent);
// 转换为 byte[]
byte[] binaryData = json.getBytes(StandardCharsets.UTF_8);
// 创建自定义消息
V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(binaryData);
// 发送消息
V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, null, "room" + roomId, V2TIMMessage.V2TIM_PRIORITY_NORMAL, false, null, new V2TIMSendCallback<V2TIMMessage>() {
@Override
public void onProgress(int progress) {
// 自定义消息不会回调进度
}
@Override
public void onSuccess(V2TIMMessage message) {
// 发送群聊自定义消息成功
}
@Override
public void onError(int code, String desc) {
// 发送群聊自定义消息失败
}
});
}
public void handleRoomMessage(RoomMessageEvent message) {
if (message == null) return;
if (easeChatAdapter == null) {
easeChatAdapter = new EaseChatAdapter();
}
if (message.getRoomId() == null) {
return;
}
if (roomId == null || !message.getRoomId().contains(roomId)) {
return;
}
// 使用Handler将消息处理放到消息队列中，避免阻塞
if (messageHandler.hasMessages(MSG_HANDLE_ROOM_MESSAGE)) {
// 如果队列中已有待处理消息，将当前消息加入队列
Message msg = Message.obtain();
msg.what = MSG_HANDLE_ROOM_MESSAGE;
msg.obj = message;
messageHandler.sendMessage(msg);
} else {
// 立即处理第一条消息
processRoomMessage(message);
// 标记有待处理消息
messageHandler.sendEmptyMessageDelayed(MSG_HANDLE_ROOM_MESSAGE, 100);
}
}
private static final int MSG_HANDLE_ROOM_MESSAGE = 1001;
private final Handler messageHandler = new Handler(Looper.getMainLooper()) {
private List<RoomMessageEvent> messageQueue = new ArrayList<>();
@Override
public void handleMessage(@NonNull Message msg) {
if (msg.what == MSG_HANDLE_ROOM_MESSAGE) {
if (!messageQueue.isEmpty()) {
// 批量处理消息
processBatchMessages(messageQueue);
messageQueue.clear();
} else if (msg.obj instanceof RoomMessageEvent) {
// 处理单条消息
processRoomMessage((RoomMessageEvent) msg.obj);
}
}
}
};
private void processBatchMessages(List<RoomMessageEvent> messages) {
if (messages.isEmpty() || easeChatAdapter == null) return;
List<EMMessageInfo> messageInfos = new ArrayList<>();
for (RoomMessageEvent message : messages) {
EMMessageInfo info = createMessageInfoIfNeeded(message);
if (info != null) {
messageInfos.add(info);
}
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
}
if (!messageInfos.isEmpty()) {
easeChatAdapter.addData(messageInfos);
scrollToBottomIfNeed();
}
}
private void processRoomMessage(RoomMessageEvent message) {
if (message == null) return;
int msgType = message.getMsgType();
RoomMessageEvent.T text = message.getText();
switch (msgType) {
case 1001:
if (text != null) {
RoomJoinMountModel roomJoinMountModel = new RoomJoinMountModel(
message.getRoomId(), text.getJia_jia(), 2);
EventBus.getDefault().post(roomJoinMountModel);
}
postAndAddMessage(message);
break;
case 123:
easeChatAdapter.clearData();
postAndAddMessage(message);
break;
case 1002:
case 1012:
case 1011:
case 1014:
case 1013:
case 1026:
case 1015:
case 1021:
case 1034:
case 1035:
case 1050:
case 1054:
case 1051:
case 1052:
case 1053:
case 1055:
case 1056:
case 1057:
case 1059:
case 1060:
case 1061:
case 1025:
case 1058:
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
break;
case 124:
if (text != null && text.getText() != null) {
try {
RoomMessageEvent.text parsedText = GsonUtils.fromJson(
text.getText(), RoomMessageEvent.text.class);
if (parsedText != null) {
MusicPlayBean musicPlayBean = new MusicPlayBean();
musicPlayBean.setPosition(parsedText.getPosition());
EventBus.getDefault().post(musicPlayBean);
}
} catch (Exception e) {
LogUtils.e("解析音乐播放消息失败", e);
}
}
break;
case 1007:
case 1018:
case 1006:
case 1017:
case 1016:
if (text != null && text.getFromUserInfo() != null &&
text.getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
EMMessageInfo info = new EMMessageInfo(message);
easeChatAdapter.addData(info);
scrollToBottomIfNeed();
}
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
break;
case 1003:
case 1004:
case 1000:
case 1:
case 2:
case 1030:
case 1033:
case 1032:
case 1039:
postAndAddMessage(message);
break;
case 1038:
addSingleMessage(message);
break;
case 1049:
// if (text != null && text.getStep() != 3) {
postAndAddMessage(message);
// }
break;
case 1005:
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
if (text != null && text.getText() != null) {
addSingleMessage(message);
}
break;
default:
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
break;
}
}
private EMMessageInfo createMessageInfoIfNeeded(RoomMessageEvent message) {
int msgType = message.getMsgType();
RoomMessageEvent.T text = message.getText();
switch (msgType) {
case 1001:
case 1002:
case 123:
case 1003:
case 1004:
case 1000:
case 1:
case 2:
case 1030:
case 1033:
case 1032:
case 1039:
case 1049:
return new EMMessageInfo(message);
case 1005:
if (text != null && text.getText() != null) {
return new EMMessageInfo(message);
}
break;
case 1038:
return new EMMessageInfo(message);
}
return null;
}
private void addSingleMessage(RoomMessageEvent message) {
if (easeChatAdapter != null) {
if (message.getMsgType() == 1049) {
if (message.getText().getStep() != 3) {
easeChatAdapter.addData(new EMMessageInfo(message));
scrollToBottomIfNeed();
}
} else {
easeChatAdapter.addData(new EMMessageInfo(message));
scrollToBottomIfNeed();
}
}
}
private void postAndAddMessage(RoomMessageEvent message) {
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
addSingleMessage(message);
}
// 优化 scrollToBottomIfNeed 方法
private void scrollToBottomIfNeed() {
if (isBottom && easeChatAdapter != null) {
int itemCount = easeChatAdapter.getItemCount();
if (itemCount > 0) {
mBinding.recycleViewPublic.scrollToPosition(itemCount - 1);
}
} else {
count++;
mBinding.tvCount.setText(count + "条新消息");
mBinding.tvCount.setVisibility(View.VISIBLE);
// 当未读消息过多时，限制数量显示
if (count > 99) {
mBinding.tvCount.setText("99+条新消息");
}
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void roomJoinMount(RoomSettingEvent roomSetting) {
if (roomSetting == null) {
easeChatAdapter.clearData();
}
}
/**
* 房间信息
*
* @param resp
*/
@Subscribe(threadMode = ThreadMode.MAIN)
public void roomInfo(RoomInfoResp resp) {
this.roomInfoResp = resp;
}
}

474
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
View File

@@ -71,7 +71,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
CountDownTimer mCountDownTimer;//倒计时
private RoomInfoResp roomInfoResp;
private String roomId;
private long remainingTime;
private int myPitNumber;//自己的麦位
private PopupWindow popupWindow;
protected String pitNumber;//当前点击的麦序
@@ -79,10 +78,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
private FriendshipPartType currentPartType = FriendshipPartType.WAIT;
private List<RoomFriendshipWheatView> mWheatViews = new ArrayList<>();
private boolean topIsAnimate = false;//定义是否在播放svga，顶部俄
private boolean centerIsAnimate = false;
/// 中间的
private boolean bottomIsAnimate = false;
RoomConcernDialogFragment dialogFragment;
private Map<String, RoomFriendshipWheatView> userViewMap = new HashMap<>();
@@ -108,7 +103,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
public void createRelation() {
if (dialogFragment != null && dialogFragment.isAdded()) {
dialogFragment.dismiss();
return;
}
}
@@ -123,30 +117,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
for (RoomFriendshipWheatView roomFriendshipWheatView : mWheatViews) {
if (roomFriendshipWheatView != null) {
RoomPitBean pitBean = roomFriendshipWheatView.pitBean;
roomFriendshipWheatView.setOnlineStatus();
}
}
}
private SharedViewModel sharedViewModel;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup
container, @Nullable Bundle savedInstanceState) {
// sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
//
// // 观察专门给子Fragment的数据
// sharedViewModel.getChildFragmentData().observe(getViewLifecycleOwner(), data -> {
// if (data != null) {
// // 处理数据
// roomInfoUpdate(data);
// }
// });
return super.onCreateView(inflater, container, savedInstanceState);
}
@Override
public void onConcernSelected(RoomRelationBean selectedDean, FriendUserBean
relationshipList) {
@@ -176,11 +151,8 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
return type;
}
}
// 默认返回 WAIT 或者抛出异常
return WAIT;
// 或者 throw new IllegalArgumentException("Invalid value: " + value);
}
}
@@ -286,8 +258,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
RoomFriendshipWheatView object = mWheatViews.get(Integer.parseInt(roomPitBean.getPit_number()) - 1);
if (object != null) {
object.setData(roomPitBean);
} else {
continue;
}
}
@@ -306,8 +276,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
protected void tzblChanged() {
// mBinding.dhv9.updateTzbl(SpUtil.getTzbl(roomId));
StringBuilder userIds = new StringBuilder();
if (roomInfoResp != null && roomInfoResp.getRoom_info() != null && roomInfoResp.getRoom_info().getPit_list() != null) {
for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
@@ -326,8 +294,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
MvpPre = new FriendshipRoomPresenter(this, getActivity());
}
MvpPre.userOnlineStatus(userIds.toString(), roomId);
} else {
// updateWheatData();
}
}
@@ -335,10 +301,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
this.roomInfoResp = roomInfoResp;
}
public void upRoomId(RoomInfoResp roomInfoResp) {
}
/**
* 麦位视图点击事件处理
*
@@ -346,16 +308,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
* @param wheatView 被点击的麦位视图
*/
private void onWheatViewClick(int position, RoomFriendshipWheatView wheatView) {
// 处理麦位点击事件
int pitNumber = position + 1; // 麦位编号（1-10）
// 示例处理逻辑
// if (roomInfoResp != null && roomInfoResp.getRoom_info() != null) {
// if (position < roomInfoResp.getRoom_info().getPit_list().size()) {
if (wheatView.pitBean != null) {
RoomPitBean pitBean = wheatView.pitBean;
// RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(position);
// 根据麦位状态处理点击事件
if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
// 麦位上有人，可以查看用户信息等操作
@@ -371,8 +326,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
handleEmptyPitClick(wheatView, pitBean);
}
}
// }
// }
}
/**
@@ -394,25 +347,18 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
mBinding.wheatView1.setCharm("0");
mBinding.wheatView2.pitBean.setCharm("0");
mBinding.wheatView2.setCharm("0");
// mBinding.wheatView2.setData(mBinding.wheatView2.pitBean);
mBinding.wheatView3.pitBean.setCharm("0");
mBinding.wheatView3.setCharm("0");
// mBinding.wheatView3.setData(mBinding.wheatView3.pitBean);
mBinding.wheatView4.pitBean.setCharm("0");
mBinding.wheatView4.setCharm("0");
// mBinding.wheatView4.setData(mBinding.wheatView4.pitBean);
mBinding.wheatView5.pitBean.setCharm("0");
mBinding.wheatView5.setCharm("0");
// mBinding.wheatView5.setData(mBinding.wheatView5.pitBean);
mBinding.wheatView6.pitBean.setCharm("0");
mBinding.wheatView6.setCharm("0");
// mBinding.wheatView6.setData(mBinding.wheatView6.pitBean);
mBinding.wheatView9.pitBean.setCharm("0");
mBinding.wheatView9.setCharm("0");
// mBinding.wheatView9.setData(mBinding.wheatView9.pitBean);
mBinding.wheatView10.pitBean.setCharm("0");
mBinding.wheatView10.setCharm("0");
// mBinding.wheatView10.setData(mBinding.wheatView10.pitBean);
}
/**
@@ -499,7 +445,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (pitBean7.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean7.setCharm("");
mBinding.wheatView6.setCardiac(pitBean7.getCharm(), 1f);
return;
}
}
@@ -509,10 +454,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
String pitNumber = messageEvent.getText().getPit_number();
int userId = fromUserInfo.getUser_id();
// List<RoomPitBean> pitList = roomInfoResp.getRoom_info().getPit_list();
// if (pitList != null && !pitList.isEmpty()) {
// try {
// RoomPitBean pitBean = pitList.get(Integer.parseInt(pitNumber) - 1);
RoomPitBean pitBean = mWheatViews.get(Integer.parseInt(pitNumber) - 1).pitBean;
pitBean.setUser_id(userId + "");
pitBean.setAvatar(fromUserInfo.getAvatar());
@@ -520,14 +461,10 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
pitBean.setSex(fromUserInfo.getSex() + "");
pitBean.setCharm(fromUserInfo.getCharm());
pitBean.setDress(fromUserInfo.getDress());
// pitList.set(Integer.parseInt(pitNumber) - 1, pitBean);
mWheatViews.get(Integer.parseInt(pitNumber) - 1).pitBean = pitBean;
if (userId == SpUtil.getUserId() && pitNumber.equals("9")) {
myPitNumber = 9;
configGameOptionBtn();
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(true);
// }
}
for (int i = 0; i < mWheatViews.size(); i++) {
if (i == Integer.parseInt(pitNumber) - 1) {
@@ -535,22 +472,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
break;
}
}
// } catch (NumberFormatException e) {
// // Handle exception
// }
// }
initUserViewMap();
}
public void event1004(RoomMessageEvent messageEvent) {
String pitNumber = messageEvent.getText().getPit_number();
// List<RoomPitBean> pitList = roomInfoResp.getRoom_info().getPit_list();
// if (pitList != null && !pitList.isEmpty()) {
// try {
// RoomPitBean pitBean = pitList.get(Integer.parseInt(pitNumber) - 1);
RoomPitBean pitBean = mWheatViews.get(Integer.parseInt(pitNumber) - 1).pitBean;
pitBean.setUser_id("");
pitBean.setAvatar("");
@@ -562,19 +488,12 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (pitNumber.equals("9")) {
myPitNumber = 0;
configGameOptionBtn();
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(false);
// }
}
for (int i = 0; i < mWheatViews.size(); i++) {
if (i == Integer.parseInt(pitNumber) - 1) {
mWheatViews.get(i).setData(pitBean);
break;
}
// }
// } catch (NumberFormatException e) {
// // Handle exception
// }
}
initUserViewMap();
}
@@ -612,7 +531,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
RoomPitBean toPitBean = toWheatView.pitBean;
String tmpNumber = fromPitBean.getPit_number();
fromPitBean.setPit_number(toPitBean.getPit_number());
// roomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(fromPit) - 1, fromPitBean);
toPitBean.setPit_number(tmpNumber);
toWheatView.setData(fromPitBean);
fromWheatView.setData(toPitBean);
@@ -633,34 +551,12 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
bean.setUser_code("");
bean.setDress_picture("");
view.setData(bean);
// roomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(view.pitBean.getPit_number()) - 1, bean);
}
}
}
}
}
// for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
// RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
// if (roomPitBean.getPit_number().equals("7") || roomPitBean.getPit_number().equals("8")) {
// continue;
// }
// if (Integer.parseInt(!roomPitBean.getPit_number().isEmpty() ? roomPitBean.getPit_number() : "0") > 10) {
// continue;
// }
//
// RoomFriendshipWheatView object = mWheatViews.get(Integer.parseInt(roomPitBean.getPit_number()) - 1);
//
// if (object != null) {
// object.setData(roomPitBean);
// } else {
// continue;
// }
// }
}
// 在 initData() 方法中初始化映射关系
//初始化对应的map
private void initUserViewMap() {
userViewMap.clear();
// 注意：这里需要确保 pitBean 和 getUser_id() 在初始化时已经设置
@@ -713,71 +609,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
updateCharmForUserOptimized(toUserInfo);
}
}
// if (messageEvent.getText().getToUserInfos()!=null && messageEvent.getText().getToUserInfos().size()>0){
// for (int i = 0; i < messageEvent.getText().getToUserInfos().size(); i++) {
// UserInfo toUserInfo = messageEvent.getText().getToUserInfos().get(i);
//
// }
// }else {
//
//
// RoomPitBean pitBean = mBinding.wheatView9.pitBean;
// if (pitBean.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.wheatView9.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// RoomPitBean pitBean1 = mBinding.wheatView10.pitBean;
// if (pitBean1.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean1.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.wheatView10.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView10.setData(pitBean1);
// return;
// }
// RoomPitBean pitBean2 = mBinding.wheatView1.pitBean;
// if (pitBean2.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean2.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView1.setData(pitBean2);
// mBinding.wheatView1.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// RoomPitBean pitBean3 = mBinding.wheatView2.pitBean;
// if (pitBean3.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean3.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView2.setData(pitBean3);
// mBinding.wheatView2.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// RoomPitBean pitBean4 = mBinding.wheatView3.pitBean;
// if (pitBean4.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean4.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView3.setData(pitBean4);
// mBinding.wheatView3.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// RoomPitBean pitBean5 = mBinding.wheatView4.pitBean;
// if (pitBean5.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean5.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView4.setData(pitBean5);
// mBinding.wheatView4.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// RoomPitBean pitBean6 = mBinding.wheatView5.pitBean;
// if (pitBean6.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean6.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView5.setData(pitBean6);
// mBinding.wheatView5.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// RoomPitBean pitBean7 = mBinding.wheatView6.pitBean;
// if (pitBean7.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// pitBean7.setCharm(messageEvent.getText().getToUserInfo().getCharm());
//// mBinding.wheatView6.setData(pitBean7);
// mBinding.wheatView6.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// return;
// }
// }
}
public void event1058(RoomMessageEvent messageEvent) {
@@ -833,6 +664,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
/// 抱麦、锁麦
@SuppressLint("UseCompatLoadingForDrawables")
private void initPopupWindow() {
// 加载弹出视图布局
View popupView = LayoutInflater.from(requireContext()).inflate(R.layout.popup_menu, null);
@@ -863,7 +695,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
// 设置弹出视图中的点击事件
setPopupMenuClickListener(popupView, null);
}
@SuppressLint("UseSwitchCompatOrMaterialCode")
private void setPopupMenuClickListener(View popupView, View view) {
TextView tvHugMic = popupView.findViewById(R.id.tv_hug_mic);
@@ -956,12 +788,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
//点击延时按钮
MvpPre.delay(String.valueOf(roomInfoResp.getFriend_info().getFriend_id()), roomId, "10");
});
// // 为TextView添加点击事件
// tvWait.setOnClickListener(v -> updateFriendshipState(FriendshipPartType.WAIT));
// tvHeart.setOnClickListener(v -> updateFriendshipState(FriendshipPartType.HEART));
// tvHand.setOnClickListener(v -> updateFriendshipState(FriendshipPartType.HAND));
}
private void queren() {
@@ -1051,30 +877,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
// 可以根据需要更新其他UI元素
}
/**
* 清除魅力值
*/
public void clearCharm() {
// 清除魅力值显示
}
/**
* 设置座位魅力值
*
* @param model 用户数据模型
*/
public void setSeatCharmWithUser(Object model) { // 使用实际的用户模型类
// 设置魅力值显示
}
// 用户信息改变
public void roomUserInfoDidChanged(UserInfo userInfo) {
}
/**
* 心动数值变化
*/
@@ -1127,7 +929,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).setrlMic(true);
((RoomActivity) getActivity()).ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up);
// AgoraManager.getInstance(getActivity()).setLocalAudioEnabled( false,SpUtil.getUserId()+"");
}
}
configPowerBtn();
@@ -1153,8 +954,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
RoomFriendshipWheatView object = mWheatViews.get(Integer.parseInt(roomPitBean.getPit_number()) - 1);
if (object != null) {
object.setData(roomPitBean);
} else {
continue;
}
}
@@ -1184,119 +983,37 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
heartList2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
heartList3 = roomInfoResp.getFriend_info().getHeart_list().get(2);
}
// if (roomInfoResp.getFriend_info().getHeart_list().size() == 2) {
// heartList1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
// heartList2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
// }
// if (roomInfoResp.getFriend_info().getHeart_list().size() == 1) {
// heartList1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
// }
if (heartList1 != null && heartList1.getHeartNum() > 0) {
Logger.d("显示 iv_22 动画 - 心动值: " + heartList1.getHeartNum());
// mBinding.iv22.setVisibility(View.VISIBLE);
mBinding.imX2.setVisibility(View.VISIBLE);
mBinding.tv2.setVisibility(View.VISIBLE);
mBinding.tv2.setText(heartList1.getHeartNum() + "");
// 添加回调确认动画是否加载成功
// mBinding.iv22.setCallback(new SVGACallback() {
// @Override
// public void onRepeat() {
// Logger.d("SVGA onRepeat");
// }
//
// @Override
// public void onStep(int i, double v) {
// // 每一步的回调
// }
//
// @Override
// public void onPause() {
// Logger.d("SVGA onPause");
// }
//
// @Override
// public void onFinished() {
// Logger.d("SVGA onFinished");
// // 如果需要循环播放，可以在这里重新开始
// if (mBinding.iv22.getVisibility() == View.VISIBLE) {
// mBinding.iv22.startAnimation();
// }
// }
// });
// if (!centerIsAnimate) {
// // 强制刷新视图
// mBinding.iv22.requestLayout();
// mBinding.iv22.invalidate();
//
// ImageUtils.loadDecorationAvatar2(0, mBinding.iv22);
// mBinding.iv22.startAnimation();
// centerIsAnimate = true;
// }
} else {
mBinding.imX2.setVisibility(View.GONE);
// mBinding.iv22.setVisibility(View.GONE);
mBinding.tv2.setVisibility(View.GONE);
// mBinding.iv22.stopAnimation();
centerIsAnimate = false;
}
if (heartList2 != null && heartList2.getHeartNum() > 0) {
mBinding.imX1.setVisibility(View.VISIBLE);
// mBinding.iv11.setVisibility(View.VISIBLE);
mBinding.tv1.setVisibility(View.VISIBLE);
mBinding.tv1.setText(StringUtil.toWan2(heartList2.getHeartNum() + "", 1));
// mBinding.tv1.setText(heartList2.getHeartNum() + "");
// if (!topIsAnimate) {
// // 强制刷新视图
// mBinding.iv11.requestLayout();
// mBinding.iv11.invalidate();
//
// mBinding.iv11.startAnimation();
// topIsAnimate = true;
// ImageUtils.loadDecorationAvatar2(0, mBinding.iv11);
// }
} else {
mBinding.imX1.setVisibility(View.GONE);
// mBinding.iv11.setVisibility(View.GONE);
mBinding.tv1.setVisibility(View.GONE);
// mBinding.iv11.stopAnimation();
topIsAnimate = false;
}
if (heartList3 != null && heartList3.getHeartNum() > 0) {
mBinding.imX3.setVisibility(View.VISIBLE);
// mBinding.iv33.setVisibility(View.VISIBLE);
mBinding.tv3.setVisibility(View.VISIBLE);
mBinding.tv3.setText(StringUtil.toWan2(heartList3.getHeartNum() + "", 2));
// if (!bottomIsAnimate) {
// // 强制刷新视图
// mBinding.iv33.requestLayout();
// mBinding.iv33.invalidate();
//
// mBinding.iv33.startAnimation();
// bottomIsAnimate = true;
// ImageUtils.loadDecorationAvatar2(0, mBinding.iv33);
// }
} else {
mBinding.imX3.setVisibility(View.GONE);
// mBinding.iv33.setVisibility(View.GONE);
mBinding.tv3.setVisibility(View.GONE);
// mBinding.iv33.stopAnimation();
bottomIsAnimate = false;
}
} else {
mBinding.imX2.setVisibility(GONE);
mBinding.imX1.setVisibility(GONE);
mBinding.imX3.setVisibility(GONE);
// mBinding.iv22.setVisibility(GONE);
// mBinding.iv11.setVisibility(GONE);
// mBinding.iv33.setVisibility(GONE);
// mBinding.iv22.stopAnimation();
// mBinding.iv11.stopAnimation();
// mBinding.iv33.stopAnimation();
topIsAnimate = false;
centerIsAnimate = false;
bottomIsAnimate = false;
mBinding.tv1.setVisibility(GONE);
mBinding.tv2.setVisibility(GONE);
mBinding.tv3.setVisibility(GONE);
@@ -1308,19 +1025,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
mBinding.imX1.setVisibility(GONE);
mBinding.imX3.setVisibility(GONE);
// mBinding.iv22.setVisibility(GONE);
// mBinding.iv11.setVisibility(GONE);
// mBinding.iv33.setVisibility(GONE);
// mBinding.iv22.stopAnimation();
// mBinding.iv11.stopAnimation();
// mBinding.iv33.stopAnimation();
topIsAnimate = false;
centerIsAnimate = false;
bottomIsAnimate = false;
mBinding.tv1.setVisibility(GONE);
mBinding.tv2.setVisibility(GONE);
mBinding.tv3.setVisibility(GONE);
return;
}
}
@@ -1366,96 +1073,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
}
private void songGift(RoomPitBean pitBean) {
UserInfo userInfo = new UserInfo();
userInfo.setAvatar(pitBean.getAvatar());
userInfo.setNickname(pitBean.getNickname());
userInfo.setUser_id(Integer.parseInt(pitBean.getUser_id()));
userInfo.setPit_number("0");
RoomGiftDialogFragment.show(null, userInfo, roomId, 0, pitBean.getHeartId() + "", getParentFragmentManager());
}
private void configPower(RoomPitBean pitBean) {
FriendInfo.HeartList md1 = null; //中心的集合
FriendInfo.HeartList md2 = null; //顶部的集合
FriendInfo.HeartList md3 = null; //底部的集合
if (roomInfoResp.getFriend_info().getHeart_list() != null && !roomInfoResp.getFriend_info().getHeart_list().isEmpty()) {
if (roomInfoResp.getFriend_info().getHeart_list().size() >= 3) {
md1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
md2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
md3 = roomInfoResp.getFriend_info().getHeart_list().get(2);
}
if (pitBean != null && pitBean.getUser_id() != null && pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
ToastUtils.showShort("不能给自己助力哦");
return;
}
if (pitBean.getPit_number().equals("1")) {
if (md2 != null && md2.getHeartNum() > 0 && mBinding.wheatView6.pitBean != null) {
// 弹出礼物视图
songGift(pitBean);
} else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("2")) {
if (md1 != null && md1.getHeartNum() > 0 && mBinding.wheatView5.pitBean != null) {
songGift(pitBean);
} else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("3")) {
if (md3 != null && md3.getHeartNum() > 0 && mBinding.wheatView4.pitBean != null) {
songGift(pitBean);
} else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("4")) {
if (md3 != null && md3.getHeartNum() > 0 && mBinding.wheatView3.pitBean != null) {
songGift(pitBean);
} else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("5")) {
if (md1 != null && md1.getHeartNum() > 0 && mBinding.wheatView2.pitBean != null) {
songGift(pitBean);
} else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("6")) {
if (md2 != null && md2.getHeartNum() > 0 && mBinding.wheatView1.pitBean != null) {
songGift(pitBean);
} else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
}
}
private void setVisibilityZL() {
FriendInfo.HeartList md1 = null; //中心的集合
FriendInfo.HeartList md2 = null; //顶部的集合
FriendInfo.HeartList md3 = null; //底部的集合
if (roomInfoResp.getFriend_info().getHeart_list() != null && !roomInfoResp.getFriend_info().getHeart_list().isEmpty()) {
if (roomInfoResp.getFriend_info().getHeart_list().size() >= 3) {
md1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
md2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
md3 = roomInfoResp.getFriend_info().getHeart_list().get(2);
}
}
}
/// 设置中线展示
private void configPowerBtn() {
@@ -1469,14 +1086,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
md3 = roomInfoResp.getFriend_info().getHeart_list().get(2);
}
// if (roomInfoResp.getFriend_info().getHeart_list().size() == 2) {
// md1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
// md2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
// }
// if (roomInfoResp.getFriend_info().getHeart_list().size() == 1) {
// md1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
// }
// assert md1 != null;
if (md1 != null && md1.getHeartNum() > 0) {
if (mBinding.wheatView2.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.wheatView2.setLockZl(false);
@@ -1493,21 +1103,10 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
mBinding.wheatView2.pitBean.setHeartId(md1.getHeartId());
mBinding.wheatView5.pitBean.setHeartNum(md1.getHeartNum());
mBinding.wheatView5.pitBean.setHeartId(md1.getHeartId());
// RoomPitBean pitBean2 = mBinding.wheatView2.pitBean;
// pitBean2.setHeartNum(md1.getHeartNum());
// pitBean2.setHeartId(md1.getHeartId());
// mBinding.wheatView2.setData(pitBean2);
// RoomPitBean pitBean5 = mBinding.wheatView5.pitBean;
// pitBean5.setHeartNum(md1.getHeartNum());
// pitBean5.setHeartId(md1.getHeartId());
// mBinding.wheatView2.setData(pitBean5);
} else {
mBinding.wheatView2.setLockZl(false);
mBinding.wheatView5.setLockZl(false);
}
// assert md2 != null;
if (md2 != null && md2.getHeartNum() > 0) {
if (mBinding.wheatView1.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.wheatView1.setLockZl(false);
@@ -1525,14 +1124,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
mBinding.wheatView6.pitBean.setHeartNum(md2.getHeartNum());
mBinding.wheatView6.pitBean.setHeartId(md2.getHeartId());
// RoomPitBean pitBean1 = mBinding.wheatView1.pitBean;
// pitBean1.setHeartNum(md2.getHeartNum());
// pitBean1.setHeartId(md2.getHeartId());
// mBinding.wheatView1.setData(pitBean1);
// RoomPitBean pitBean6 = mBinding.wheatView6.pitBean;
// pitBean6.setHeartNum(md2.getHeartNum());
// pitBean6.setHeartId(md2.getHeartId());
// mBinding.wheatView6.setData(pitBean6);
} else {
mBinding.wheatView1.setLockZl(false);
mBinding.wheatView6.setLockZl(false);
@@ -1554,15 +1145,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
mBinding.wheatView3.pitBean.setHeartId(md3.getHeartId());
mBinding.wheatView4.pitBean.setHeartNum(md3.getHeartNum());
mBinding.wheatView4.pitBean.setHeartId(md3.getHeartId());
// RoomPitBean pitBean4 = mBinding.wheatView4.pitBean;
// pitBean4.setHeartNum(md3.getHeartNum());
// pitBean4.setHeartId(md3.getHeartId());
// mBinding.wheatView4.setData(pitBean4);
// RoomPitBean pitBean3 = mBinding.wheatView3.pitBean;
// pitBean3.setHeartNum(md3.getHeartNum());
// pitBean3.setHeartId(md3.getHeartId());
// mBinding.wheatView3.setData(pitBean3);
} else {
mBinding.wheatView3.setLockZl(false);
mBinding.wheatView4.setLockZl(false);
@@ -1600,11 +1182,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
return;
}
mCountDownTimer = new CountDownTimer(countDownTime * 1000L, 1000L) {
@SuppressLint("SetTextI18n")
@Override
public void onTick(long millisUntilFinished) {
int time1 = (int) (millisUntilFinished / 1000);
setTime(time1);
remainingTime = time1;
if (time1 <= 10) {
mBinding.tvJsq.setVisibility(VISIBLE);
@@ -1620,8 +1202,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
@Override
public void onFinish() {
setTime(0);
remainingTime = 0;
}
};
mCountDownTimer.start();
@@ -1630,6 +1210,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
}
@SuppressLint("DefaultLocale")
private String formatTime(int totalSeconds) {
int hours = totalSeconds / 3600;
int minutes = (totalSeconds % 3600) / 60;
@@ -1638,7 +1219,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
return String.format("%02d:%02d:%02d", hours, minutes, seconds);
}
@SuppressLint("DefaultLocale")
@SuppressLint({"DefaultLocale", "SetTextI18n"})
public void setTime(int seconds) {
if (seconds == 0) {
mBinding.tvJsq.setVisibility(GONE);
@@ -1662,10 +1243,6 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
// TODO: 2025/8/21 交友房阶段发生变化
public void upDataFriendship(FriendshipPartType type, int friend_id,
long end_time, FriendUserBean userBean) {
// updateFriendshipState(type);
// countDownTime(end_time);
if (type == FriendshipPartType.WAIT) {
roomInfoResp.getFriend_info().setHeart_list(new ArrayList<>());
}
@@ -1689,17 +1266,12 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
}
///这里需要补充东西if(step.intValue ==3&& relationModel != nil){if(self.myPitNumber ==9){
/// if(self.cpView.dataArray.count ==0){[self.cpView getRelationShipList];
/// self.cpView.model=relationModel;[self.cpView showInView:KEYWINDOW];
}
public void clearDialog() {
dialogFragment = (RoomConcernDialogFragment) getChildFragmentManager().findFragmentByTag("RoomConcernDialogFragment");
if (dialogFragment != null && dialogFragment.isAdded()) {
dialogFragment.dismiss();
return;
}
}
@@ -1723,13 +1295,8 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
* 销毁视图和资源
*/
public void releaseResources() {
// 重置动画状态标志
topIsAnimate = false;
centerIsAnimate = false;
bottomIsAnimate = false;
// 停止倒计时器
releaseCountDownTimer();
// 清理PopupWindow
if (popupWindow != null && popupWindow.isShowing()) {
popupWindow.dismiss();
@@ -1741,35 +1308,8 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
dialogFragment.dismissAllowingStateLoss();
dialogFragment = null;
}
// // 将磁盘缓存清理放在后台线程执行
// new Thread(() -> {
// if (getActivity() != null) {
// ImageUtils.clearDiskCache(getActivity());
// }
// }).start();
}
/**
* 安全地停止并释放SVGA资源
*
* @param svgaView SVGAImageView实例
*/
private void stopAndReleaseSVGA(com.opensource.svgaplayer.SVGAImageView svgaView) {
if (svgaView != null) {
try {
// 停止动画
svgaView.stopAnimation();
// 清除回调
svgaView.setCallback(null);
// 释放资源
svgaView.clear();
} catch (Exception e) {
LogUtils.e("Error releasing SVGA: " + e.getMessage());
}
}
}
@Override
public void onDestroyView() {
// 在视图销毁前释放资源

21
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java
View File

@@ -106,17 +106,13 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
// EventBus.getDefault().post(new BannerRefreshEvent());
page = 1;
mAdapter.setNewData(new ArrayList<>());
MvpPre.getRoomList(2, page+"", "20", "1", label_id);
}
});
mAdapter.setOnRoomClickListener(new HotAdapter.OnRoomClickListener() {
@Override
public void onRoomClick(TopRoom room, int position) {
mAdapter.setOnRoomClickListener((room, position) -> {
if ( ClickUtils.isFastDoubleClick()){
return;
}
@@ -127,19 +123,8 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
}
TopRoom item = mAdapter.getItem(position);
if (item != null ) {
// MessageListenerSingleton.getInstance().joinGroup(item.getRoom_id());
// RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), item.getRoom_id() +"","");
MessageListenerSingleton.getInstance().joinGroup(item.getRoom_id());
// 等待一段时间确保退出完成
// try {
// Thread.sleep(500);
// } catch (InterruptedException e) {
// Thread.currentThread().interrupt();
// }
RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), item.getRoom_id(), "",null);
// MvpPre.getRoomIn(item.getRoom_id(), "");
}
}
});
}
@@ -151,14 +136,14 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
@Override
public void roomList(List<TopRoom> data, int type) {
if (data != null && data.size() > 0) {
if (data != null && !data.isEmpty()) {
if (page == 1) {
mAdapter.setNewData(data); // 刷新时替换数据
} else {
// 检查是否有重复数据
boolean hasDuplicate = false;
List<TopRoom> currentData = mAdapter.getData();
if (!currentData.isEmpty() && data.size() > 0) {
if (!currentData.isEmpty() && !data.isEmpty()) {
// 检查第一条数据是否已经存在
TopRoom firstNewData = data.get(0);
for (TopRoom item : currentData) {

15
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
View File

@@ -45,10 +45,6 @@ import io.agora.musiccontentcenter.Music;
* @description: 点唱已点歌曲
*/
public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, FragmentMuiscSongBinding> implements RequestContacts.View {
public static final int TYPE_DATA = 1;//点歌
public static final int TYPE_WEEK = 2;//已点
private int type;
private String roomId;
private RoomInfoResp roomInfoResp;
BaseQuickAdapter<MusicSongBean, BaseViewHolder> adapter;
@@ -130,7 +126,6 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
public void onAttach(@NonNull Context context) {
super.onAttach(context);
roomId = getArguments().getString("roomId");
type = getArguments().getInt("type");
roomInfoResp = (RoomInfoResp) getArguments().getSerializable("roomInfoResp");
}
@@ -170,14 +165,12 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
page++;
// AgoraManager.getInstance(getContext()).searchMusic( mBinding.editQuery.getText().toString(),page);
MvpPre.songList(roomId);
}
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1;
// AgoraManager.getInstance(getContext()).searchMusic( mBinding.editQuery.getText().toString(),page);
MvpPre.songList(roomId);
}
});
@@ -234,13 +227,7 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
}
});
helper.getView(R.id.muis_sy).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
MvpPre.upSong(item.getDid(), "1");
}
});
helper.getView(R.id.muis_sy).setOnClickListener(v -> MvpPre.upSong(item.getDid(), "1"));
if (item.getIs_hot() == 1) {
helper.setVisible(R.id.muis_sy, true);

1443
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/PublicScreenEaseChatFragment.java
View File

File diff suppressed because it is too large Load Diff

43
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingChildFragment.java
View File

@@ -37,14 +37,11 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
private static final String TAG = "RankingChildFragment";
public static final int TYPE_DATA = 1;//日榜
public static final int TYPE_WEEK = 2;//周榜
public static final int TYPE_MON = 3;//月榜
private String roomId;
private int dataType;
private int rankType = 1;
private RankingCharmListAdapter cAdapter;//魅力适配器
private RankingCharmListAdapter wAdapter;//财富适配器
// private RankingWealthListAdapter wAdapter;//财富适配器
private CommonEmptyView commonEmptyView;
private RoomInfoResp roomInfoResp;
@@ -99,11 +96,6 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
@Override
protected void initView() {
if (rankType == 1) {
setSexBg(mBinding.roomHeadTop1Label, "1");
setSexBg(mBinding.roomHeadTop2Label, "1");
setSexBg(mBinding.roomHeadTop3Label, "1");
}
commonEmptyView = new CommonEmptyView(getContext());
commonEmptyView.setEmptyText("暂无上榜");
}
@@ -115,29 +107,17 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
protected void initListener() {
super.initListener();
if (rankType == 1) {
cAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
cAdapter.setOnItemChildClickListener((adapter, view, position) -> {
if (view.getId() == R.id.room_item_head) {
CharmRankingResp item = cAdapter.getItem(position);
RoomUserInfoFragment.show(roomId,item.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
// ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id()).withBoolean("returnRoom", true).navigation();
}
}
});
} else {
wAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
wAdapter.setOnItemChildClickListener((adapter, view, position) -> {
if (view.getId() == R.id.room_item_head) {
CharmRankingResp item = wAdapter.getItem(position);
RoomUserInfoFragment.show(roomId,item.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
// WealthRankingResp.ListsBean item = wAdapter.getItem(position);
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", item.getUser_id()).withBoolean("returnRoom", true).navigation();
}
}
});
}
@@ -192,8 +172,6 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
@Override
public void onClick(View v) {
RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
}
});
}
@@ -208,8 +186,6 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
@Override
public void onClick(View v) {
RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
}
});
}
@@ -246,8 +222,6 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
@Override
public void onClick(View v) {
RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
}
});
}
@@ -273,19 +247,6 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
}
}
/**
* 设置头像男神女神热度背景
*/
private void setSexBg(View view, String sex) {
// view.setBackgroundResource(UserBean.MALE.equals(sex) ? R.mipmap.room_bg_wheat_charm_gg_sr : R.mipmap.room_bg_wheat_charm_mm_sr);
}
/**
* 根据性别设置字体颜色
*/
private void setSexColor(TextView view, String sex) {
// view.setTextColor(UserBean.MALE.equals(sex) ? getContext().getResources().getColor(R.color.color_FF0091FF) : getContext().getResources().getColor(R.color.color_FFFA447D));
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

1
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingParentFragment.java
View File

@@ -27,7 +27,6 @@ public class RankingParentFragment extends BaseMvpFragment<IPresenter, RoomRanki
public static final int TYPE_MON = 3;//月榜
private static String mRoomId;//房间ID
private static int rankType = 1;//统计类型（魅力 / 财富）
// private static int dataType = 1;//统计周期（日/周/月）
private RoomInfoResp roomInfoResp;
public static RankingParentFragment newInstance(String roomId,int rankType,RoomInfoResp roomInfoResp) {

37
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedEnvelopesFragment.java
View File

@@ -5,6 +5,7 @@ import static com.xscm.moduleutil.enumType.RedEnvelopeStatus.QXRedBagDrawTypeOpe
import static com.xscm.moduleutil.enumType.RedEnvelopeStatus.QXRedBagDrawTypePwdSend;
import static com.xscm.moduleutil.enumType.RedEnvelopeStatus.QXRedBagDrawTypeTimeDown;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.CountDownTimer;
import android.view.View;
@@ -80,23 +81,15 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
setCancelable(false);
setCanceledOnTouchOutside(false);
Window window = getWindow();
// window.setLayout(345, 454);
// window.setLayout((int) (ScreenUtils.getScreenWidth() * 345.f / 345), WindowManager.LayoutParams.WRAP_CONTENT);
window.setLayout((int) (ScreenUtils.getScreenWidth() * 0.8), WindowManager.LayoutParams.WRAP_CONTENT);
mBinding.imRedClose.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.ROOM_RED_RESULT).navigation();
mBinding.imRedClose.setOnClickListener(v -> {
QXRedBagSendView redBagView = new QXRedBagSendView(getContext());
redBagView.showInView((ViewGroup) getWindow().getDecorView());
dismiss();
}
});
mBinding.imRedK.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mBinding.imRedK.setOnClickListener(v -> {
RetrofitClient.getInstance().grab(mRedPacketInfo.getRedpacket_id(), new BaseObserver<RedPackGrab>() {
@Override
@@ -106,7 +99,6 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
@Override
public void onNext(@NotNull RedPackGrab redPackGrab) {
if (redPackGrab != null) {
if (redPackGrab.getCode() == 1) {
mRedPacketInfo.setIs_qiang(1);
ARouter.getInstance().build(ARouteConstants.ROOM_RED_RESULT).withString("redpacketId", mRedPacketInfo.getRedpacket_id()).navigation();
@@ -120,24 +112,10 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
}
}
}
});
// QXRedBagSendView redBagView = new QXRedBagSendView(getContext());
// redBagView.showInView((ViewGroup) getWindow().getDecorView());
}
});
mBinding.tvCk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ARouter.getInstance().build(ARouteConstants.ROOM_RED_RESULT).withString("redpacketId", mRedPacketInfo.getRedpacket_id()).navigation();
}
});
mBinding.textPl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mBinding.tvCk.setOnClickListener(v -> ARouter.getInstance().build(ARouteConstants.ROOM_RED_RESULT).withString("redpacketId", mRedPacketInfo.getRedpacket_id()).navigation());
mBinding.textPl.setOnClickListener(v -> {
if (drawType == RedEnvelopeStatus.QXRedBagDrawTypeCollect){
RetrofitClient.getInstance().followRoom(mRedPacketInfo.getRoom_id()+"","1", new BaseObserver<String>() {
@Override
@@ -165,8 +143,6 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
EventBus.getDefault().post(userInfo);
dismiss();
}
// ARouter.getInstance().build(ARouteConstants.ROOM_RED_RESULT).withString("redpacketId", mRedPacketInfo.getRedpacket_id()).navigation();
}
});
}
@@ -186,6 +162,7 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
return R.layout.fragment_red_envelopes;
}
@SuppressLint("SetTextI18n")
public void setRedPacket(RedPacketInfo redPacketInfo) {
this.mRedPacketInfo = redPacketInfo;
setType(getDrawTypeWithRedpacktModel(redPacketInfo));
@@ -226,6 +203,7 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
}
}
@SuppressLint("SetTextI18n")
public void setNeedTime(long needTimes){
this.needTime = needTimes;
if (needTime > 0) {
@@ -234,7 +212,6 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
}
private RedEnvelopeStatus getDrawTypeWithRedpacktModel(RedPacketInfo redPacketInfo) {
drawType = QXRedBagDrawTypeOpen;
if (redPacketInfo.getType() == 1) {//普通红包
drawType = QXRedBagDrawTypeOpen;
if (redPacketInfo.getCountdown() > 0) {

7
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedViewModel.java
View File

@@ -1,7 +0,0 @@
package com.xscm.modulemain.activity.room.fragment;
import androidx.lifecycle.ViewModel;
public class RedViewModel extends ViewModel {
// TODO: Implement the ViewModel
}

29
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RelationshipFragment.java
View File

@@ -64,28 +64,6 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
protected void initData() {
MvpPre.relationCard(userId);
// List<RelationshipBean> list=new ArrayList<>();
// for (int i = 0; i < 3; i++){
//// RelationshipBean relationshipBean=new RelationshipBean();
//// relationshipBean.setAvatar("https://img2.baidu.com/it/u=3879116093,1671048885&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500");
//// relationshipBean.setAvatar2("https://img2.baidu.com/it/u=3879116093,1671048885&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500");
//// relationshipBean.setNickname("名称1");
//// relationshipBean.setNickname2("名称2");
//// relationshipBean.setRelation("兄弟");
//// relationshipBean.setTime("5天");
//// list.add(relationshipBean);
// }
// adapter=new RelationshipAdapter();
// mBinding.bannerViewPager
// .setScrollDuration(0)
// .setOrientation(ViewPager2.ORIENTATION_VERTICAL)
// .setAutoPlay(false)
// .setAdapter(adapter);
//
// mBinding.bannerViewPager.setIndicatorVisibility(View.GONE);
// mBinding.bannerViewPager.create(list);
}
@Override
@@ -93,15 +71,12 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.rvHostList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
adapter = new RelationshipAdapter();
mBinding.rvHostList.setAdapter(adapter);
adapter.setOnItemClickListener(new RelationshipAdapter.OnItemClickListener() {
@Override
public void onItemClick(View view, RelationshipBean data, int position) {
adapter.setOnItemClickListener((RelationshipAdapter.OnItemClickListener) (view, data, position) -> {
if (view.getId() == R.id.im_zhid) {
queren(1, data.getId(), "");
} else if (view.getId() == R.id.im_shanchu) {
queren(2, data.getId(), data.getDelete_me_coin());
}
}
});
}
@@ -116,7 +91,6 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
"取消",
v -> {
// 点击“确认”按钮时执行删除操作
// MvpPre.applySong(roomId);
MvpPre.topRelationCard(id + "");
dismiss();
},
@@ -132,7 +106,6 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
"取消",
v -> {
// 点击“确认”按钮时执行删除操作
// MvpPre.applySong(roomId);
MvpPre.deleteRelationCard(id + "");
dismiss();
},

25
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
View File

@@ -50,7 +50,6 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
public static final int TYPE_DATA = 1;//点歌
public static final int TYPE_WEEK = 2;//已点
private int type;
private String roomId;
BaseQuickAdapter<Music, BaseViewHolder> adapter;
private int page = 1;
@@ -111,22 +110,11 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
public void onAttach(@NonNull Context context) {
super.onAttach(context);
roomId = getArguments().getString("roomId");
type = getArguments().getInt("type");
status = getArguments().getInt("status");
}
@Override
protected void initData() {
// mBinding.editQuery.setOnFocusChangeListener((v, hasFocus) ->{
// if (hasFocus) {
// new Handler(Looper.getMainLooper()).postDelayed(() -> {
// if ( mBinding.scrollView != null) {
// mBinding.scrollView.post(() -> mBinding.scrollView.fullScroll(View.FOCUS_DOWN)); // 滚动到底部
// }
// }, 200);
// }
// });
mBinding.editQuery.setText(SpUtil.getMusicName());
mBinding.editQuery.addTextChangedListener(new TextWatcher() {
@@ -137,9 +125,6 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
// SharedViewModel viewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
// onMusicSearchResultEvent(viewModel.getMusicBean());
}
@Override
@@ -151,14 +136,6 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
});
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);/**/
}
@Override
protected void initView() {
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
@@ -191,7 +168,6 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
@Override
public void onClick(View v) {
if (status==1) {
// if (!AgoraManager.getInstance(getContext()).isBjMusic()) {
MvpPre.song(roomId, SpUtil.getUserId() + "", item.getSongCode() + "", item.getName(), item.getSinger(), item.getPoster(), String.valueOf(item.getDurationS()));
} else {
if (AgoraManager.getInstance(getContext()).getMusicList()==null) {
@@ -207,7 +183,6 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
music.add(item);
AgoraManager.getInstance(getContext()).setMusicList(music);
}
// AgoraManager.getInstance(getContext()).isPreload(item.getSongCode(), 1);
}
ToastUtils.show("添加成功");

394
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
View File

@@ -68,19 +68,14 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
implements RoomAuctionContacts.View {
private RoomInfoResp roomInfoResp;
private RoomAuction roomAuction;
private RoomBean roomBean;
RoomMakeWheatView wheatView;
RoomMakeWheatView wheatView2;
CountDownTimer mCountDownTimer;
private long remainingTime;
private String auctionId = "";
private RoomAuction.AuctionUserBean auctionUserBean;
private List<RoomAuction.AuctionListBean> auctionList;
// private ImageView imActionJs, imActionYs;
// private LinearLayout stub;
private boolean isButtonsInflated = false;
private int type;
RoomFragment parentFragment;
@@ -99,31 +94,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
return fragment;
}
private SharedViewModel sharedViewModel;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
// sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
//
// // 观察专门给子Fragment的数据
// sharedViewModel.getChildFragmentData().observe(getViewLifecycleOwner(), data -> {
// if (data != null) {
// // 处理数据
// roomInfoUpdate(data);
// }
// });
return super.onCreateView(inflater, container, savedInstanceState);
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
// roomInfoResp = (RoomInfoResp) getArguments().getSerializable("roomInfo");
// type = getArguments().getInt("type");
}
public void upRoomInfo(RoomInfoResp roomInfoResp) {
this.roomInfoResp = roomInfoResp;
}
@@ -154,10 +124,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (roomPitBean.getUser_id() != null && !roomPitBean.getUser_id().isEmpty() && !roomPitBean.getUser_id().equals("0")) {
roomPitBean.setIs_pm(1);
wheatView.setData(roomPitBean);
// if (imActionJs != null)
// imActionJs.setVisibility(VISIBLE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upYs(true);
}
@@ -205,37 +171,25 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
} else {
if (wheatView.pitBean != null) {
if (wheatView.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
// if (imActionJs != null && imActionYs != null) {
// imActionJs.setVisibility(VISIBLE);
// imActionYs.setVisibility(VISIBLE);
// }
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upVisibility(true);
}
} else {
// if (imActionJs != null && imActionYs != null) {
// imActionJs.setVisibility(INVISIBLE);
// imActionYs.setVisibility(INVISIBLE);
// }
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upVisibility(false);
}
}
} else {
// if (imActionJs != null && imActionYs != null) {
// imActionJs.setVisibility(INVISIBLE);
// imActionYs.setVisibility(INVISIBLE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upVisibility(false);
}
// }
}
mBinding.ivJp.setVisibility(VISIBLE);
}
}
if (roomAuction.getAuction_list() != null && roomAuction.getAuction_list().size() > 0) {
if (roomAuction.getAuction_list() != null && !roomAuction.getAuction_list().isEmpty()) {
auctionList = roomAuction.getAuction_list();
gexList();
}
@@ -262,19 +216,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upVisibility(true);
}
// if (imActionJs != null && imActionYs != null) {
//
//
//
// imActionJs.setVisibility(VISIBLE);
// imActionYs.setVisibility(VISIBLE);
// }
} else {
// if (imActionJs != null && imActionYs != null) {
// imActionJs.setVisibility(INVISIBLE);
// imActionYs.setVisibility(INVISIBLE);
// }
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upVisibility(false);
}
@@ -291,27 +233,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
/// 主持上麦
public void initOverlayButtons() {
// if (isButtonsInflated) return;
// stub= getActivity().findViewById(R.id.stub_buttons2);
// if (stub != null) {
//// View inflated = stub.getRootView();
// stub.setVisibility(VISIBLE);
// imActionJs = stub.findViewById(R.id.im_action_ys);
// imActionYs = stub.findViewById(R.id.im_action_js);
//
// if (imActionJs != null && imActionYs != null) {
// // 设置点击事件
// imActionJs.setOnClickListener(this::onChock);
// imActionYs.setOnClickListener(this::onChock);
//
//// isButtonsInflated = true;
// } else {
// // 报错提示：说明 top_overlay_buttons.xml 中没有定义这些 id
// throw new IllegalStateException("im_action_js or im_action_ys not found in overlay layout");
// }
// }
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).tob();
}
@@ -323,22 +244,15 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
private void getvjs() {
// if (imActionJs == null) {
// initOverlayButtons();
// }
// if (imActionJs != null) {
if (roomInfoResp.getUser_info().getIs_room_owner() == 1 || roomInfoResp.getUser_info().getIs_management() == 1 || roomInfoResp.getUser_info().getIs_host() == 1) {
// imActionJs.setVisibility(VISIBLE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upJs(true);
}
} else {
// imActionJs.setVisibility(INVISIBLE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upJs(false);
}
}
// }
}
protected void tzblChanged() {
@@ -374,17 +288,12 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.roomMakeWheat.setOnClickListener(this::onChock);
mBinding.roomMakeWheat2.setOnClickListener(this::onChock);
mBinding.bangdan.setOnClickListener(this::onChock);
// mBinding.ivAuction1.setOnClickListener(this::onChock);
// mBinding.ivAuction2.setOnClickListener(this::onChock);
// mBinding.ivAuction3.setOnClickListener(this::onChock);
mBinding.user4.setOnClickListener(this::onChock);
mBinding.user5.setOnClickListener(this::onChock);
mBinding.user6.setOnClickListener(this::onChock);
mBinding.tvPB.setOnClickListener(this::onChock);
mBinding.questionMark.setOnClickListener(this::onChock);
getTextView();
// initOverlayButtons();
// steView(type);
mBinding.qinmi.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
@@ -397,17 +306,13 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
});
mBinding.ivAuction1.setmOnCharmClickListener(new RoomMakeWheatView.onCharmClickListener() {
@Override
public void onCharmClick(RoomMakeWheatView view, RoomPitBean pitBean) {
mBinding.ivAuction1.setmOnCharmClickListener((view, pitBean) -> {
if (ClickUtils.isFastDoubleClick()) {
return;
}
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
});
mBinding.ivAuction2.setOnClickListener(view -> {
@@ -418,17 +323,13 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), mBinding.ivAuction2.getUserId(), mBinding.ivAuction2.pitNumber, getHostUser(), false, 1, 0, getChildFragmentManager());
}
});
mBinding.ivAuction2.setmOnCharmClickListener(new RoomMakeWheatView.onCharmClickListener() {
@Override
public void onCharmClick(RoomMakeWheatView view, RoomPitBean pitBean) {
mBinding.ivAuction2.setmOnCharmClickListener((view, pitBean) -> {
if (ClickUtils.isFastDoubleClick()) {
return;
}
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
});
mBinding.ivAuction3.setOnClickListener(view -> {
if (ClickUtils.isFastDoubleClick()) {
@@ -508,11 +409,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
}
}
// else if (id == R.id.im_action_js) {//延时
// MvpPre.auctionDelay(SpUtil.getauctionId());
// } else if (id == R.id.im_action_ys) {//结束
// dialogEnd();
// }
else if (id == R.id.bangdan) {//出价榜单
BidListDialogFragment.newInstance(SpUtil.getauctionId()).show(getChildFragmentManager(), "BidListDialogFragment");
} else if (id == R.id.iv_auction1) {
@@ -546,23 +442,17 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), wheatView2.pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
} else if (id == R.id.question_mark) {
// Bundle bundle = new Bundle();
// bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"api/Page/page_show?id=22");
// WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
// dialog.show();
if (type == 1) {
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=23");
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
dialog.show();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=23").withString("title", "真爱拍规则").navigation();
} else {
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=22");
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
dialog.show();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=22").withString("title", "亲密拍规则").navigation();
}
}
}
@@ -646,16 +536,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
"确认",
"取消",
v -> {
// steView(newType);
// // 根据新的type更新TextView样式
// int defaultColor = ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_0DFFB9); // 绿色
// int selectedColor = ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_white); // 白色
// int clickedColor = ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_BB8BE2); // 蓝色
// float defaultSize = 16f;
// float selectedSize = 24f;
//
// toggleTextStyles(mBinding.qinmi, mBinding.zhenai, defaultColor, selectedColor, clickedColor, defaultSize, selectedSize, type);
// 点击“确认”按钮时执行
MvpPre.auctionMode(roomInfoResp.getRoom_info().getRoom_id(), newType == 1 ? "1" : "2");
},
@@ -690,7 +570,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (wheatView.getUserId() == null || wheatView.getUserId().isEmpty() || wheatView.getUserId().equals("") || wheatView.getUserId().equals("0")) {
wheatView.setImageResource(com.xscm.moduleutil.R.mipmap.za_m, 0, "0");
}
// wheatView2.pitImageVId=com.qxcm.moduleutil.R.mipmap.za_p;
wheatView2.setImageResource(com.xscm.moduleutil.R.mipmap.za_p, 0, "0");
mBinding.ivAuction1.setImageResource(com.xscm.moduleutil.R.mipmap.za_m, 0, "0");
mBinding.ivAuction2.setImageResource(com.xscm.moduleutil.R.mipmap.za_m, 0, "0");
@@ -735,7 +614,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
private void setparams() {
ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) wheatView2.getLayoutParams();
// ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) wheatView2.getLayoutParams();
layoutParams.setMargins(0, 30, 0, 0);
wheatView2.setLayoutParams(layoutParams);
@@ -817,204 +695,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void roomInfoEvent(RoomMessageEvent messageEvent) {
// boolean b = false;
//// if (messageEvent.getMsgType() == 1003) {//上麦
//// if (messageEvent.getText().getPit_number().equals("9")) {
//// wheatView.setData(getPitBean(messageEvent));
//// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
//// imActionJs.setVisibility(View.VISIBLE);
//// imActionYs.setVisibility(View.VISIBLE);
////
//// parentFragment.updateWheatStatus(getPitBean(messageEvent), 9, true, true);
//// } else {
//// getvjs();
//// imActionYs.setVisibility(INVISIBLE);
//// }
//// }
//// } else
//// if (messageEvent.getMsgType() == 1004) {
//// if (messageEvent.getText().getPit_number().equals("9")) {
//// wheatView.setData(getPitBean2(messageEvent, "9"));
//// getvjs();
//// imActionYs.setVisibility(GONE);
////
////
//// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
//// RoomPitBean pitBean = wheatView.pitBean;
//// pitBean.setUser_id("");
//// pitBean.setAvatar("");
//// pitBean.setNickname("");
//// pitBean.setSex("");
//// pitBean.setCharm("");
//// parentFragment.updateWheatStatus(pitBean, Integer.parseInt(messageEvent.getText().getPit_number()), false, true);
////// parentFragment.setRoleType(0, 0);
////// parentFragment.switchMic(2);
//// }
////
//// } else if (messageEvent.getText().getPit_number().equals("888")) {
//// wheatView2.setData(getPitBean2(messageEvent, "888"));
//// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
//// if (getActivity() instanceof RoomActivity) {
//// ((RoomActivity) getActivity()).setRoleType(0, 0);
//// ((RoomActivity) getActivity()).switchMic(2);
//// }
////// parentFragment.setRoleType(0, 0);
////// parentFragment.switchMic(2);
//// }
//// }
////
////// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
////// parentFragment.setRoleType(0, 0);
////// parentFragment.switchMic(2);
////// }
//// } else
// if (messageEvent.getMsgType() == 1022) {
//
// if (messageEvent.getText().getType() == 1) {//拍卖位上麦
// if (messageEvent.getText().getPit_number().equals("888")) {
// wheatView2.setData(getPitBean(messageEvent));
// getvjs();
// imActionYs.setVisibility(GONE);
// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).setRoleType(3, 888);
// ((RoomActivity) getActivity()).switchMic(2);
// }
//// parentFragment.setRoleType(3, 888);
//// parentFragment.switchMic(2);
// }
// }
//
// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
// CardRelationshipFragment.show(roomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type + "", getActivity().getSupportFragmentManager());
// }
// } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
// if (messageEvent.getText().getPit_number().equals("9")) {
// wheatView.setData(getPitBean2(messageEvent, "9"));
//// assert parentFragment != null;
//// parentFragment.setRoleType(0, 0);
//// parentFragment.switchMic(2);
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).setRoleType(0, 0);
// ((RoomActivity) getActivity()).switchMic(2);
// }
// } else if (messageEvent.getText().getPit_number().equals("888")) {
// wheatView2.setData(getPitBean2(messageEvent, "888"));
//// if (parentFragment != null) {
// if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
//// parentFragment.setRoleType(0, 0);
//// parentFragment.switchMic(2);
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).setRoleType(0, 0);
// ((RoomActivity) getActivity()).switchMic(2);
// }
// }
/// / }
// }
// yinc();
// }
//
// } else
// if (messageEvent.getMsgType() == 1023) {//开始竞拍
// mBinding.ivJp.setVisibility(VISIBLE);
// if (wheatView.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
// imActionYs.setVisibility(VISIBLE);
// imActionJs.setVisibility(VISIBLE);
// } else {
// getvjs();
// imActionYs.setVisibility(GONE);
// }
// if (messageEvent.getText().getAuction_user().getUser_id().equals(SpUtil.getUserId() + "")) {
// mBinding.ivJp.setVisibility(INVISIBLE);
// }
// roomInfoResp.getRoom_auction().setAuction_user(messageEvent.getText().getAuction_user());
// auctionId = messageEvent.getText().getAuction_user().getAuction_id();
// SpUtil.setAuctionId(auctionId);
// countDownTime(messageEvent.getText().getAuction_user().getDuration());
// auctionUserBean = messageEvent.getText().getAuction_user();
// gengv();
// } else if (messageEvent.getMsgType() == 1024) {//竞拍，拍卖列表变化
// auctionList = messageEvent.getText().getAuction_list();
// gexList();
// } else if (messageEvent.getMsgType() == 1025) {//结束
// if (messageEvent.getText().getRecipient() != null) {//成功
// CustomCenterDialogFragment.showWithAutoDismiss(messageEvent.getText().getRecipient(), messageEvent.getText().getAuction_user(), getActivity().getSupportFragmentManager());
// } else {//失败
// showCountDownDialog(getContext());
// }
// SpUtil.setAuctionId("");
// mBinding.ivJp.setVisibility(INVISIBLE);
// imActionYs.setVisibility(INVISIBLE);
// getvjs();
// releaseCountDownTimer();
// auctionList = null;
// gexList();
// steView(type);
// isButtonsInflated = false;
// } else if (messageEvent.getMsgType() == 1012) {
// stub.setVisibility(GONE);
// } else if (messageEvent.getMsgType() == 1026) {//主持延迟
// countDownTime(messageEvent.getText().getDuration());
// } else if (messageEvent.getMsgType() == 1027) {//拍卖类型变化
// type = messageEvent.getText().getType();
// getTextView();
// steView(type);
// } else if (messageEvent.getMsgType() == 1005) {
// if (mBinding.roomMakeWheat2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// mBinding.tvPB.setText(messageEvent.getText().getToUserInfo().getCharm() + "");
// } else {
// if (mBinding.ivAuction1 != null && mBinding.ivAuction1.getUserId() != null) {
// if (mBinding.ivAuction1.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// RoomMakeWheatView wheatView = mBinding.ivAuction1;
// wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// wheatView.setData(wheatView.pitBean);
// } else if (mBinding.ivAuction2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// RoomMakeWheatView wheatView = mBinding.ivAuction2;
// wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// wheatView.setData(wheatView.pitBean);
// } else if (mBinding.ivAuction3.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// RoomMakeWheatView wheatView = mBinding.ivAuction3;
// wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// wheatView.setData(wheatView.pitBean);
// }
// }
// }
// } else if (messageEvent.getMsgType() == 1035) {
// RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
// if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
// mBinding.roomMakeWheat.setData(pitBean);
// }
// RoomPitBean pitBean2 = mBinding.roomMakeWheat2.pitBean;
// if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
// mBinding.roomMakeWheat2.setData(pitBean2);
// }
//
// if (auctionList != null && auctionList.size() > 0) {
// for (int i = 0; i < auctionList.size(); i++) {
// if (auctionList.get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// auctionList.get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
// auctionList.get(i).setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// auctionList.get(i).setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// auctionList.get(i).setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// gexList();
// }
// }
//
// }
// }
//
// }
private void gengv() {
if (auctionUserBean != null) {
mBinding.tvRelation.setText(auctionUserBean.getRelation_name());
@@ -1144,16 +824,12 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (messageEvent.getText().getPit_number().equals("9")) {
wheatView.setData(getPitBean(messageEvent));
if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
// imActionJs.setVisibility(View.VISIBLE);
// imActionYs.setVisibility(View.VISIBLE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upVisibility(true);
}
// 用户上麦，根据权限显示按钮
} else {
getvjs();
// imActionYs.setVisibility(INVISIBLE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upYs(false);
}
@@ -1181,7 +857,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (messageEvent.getText().getPit_number().equals("888")) {
wheatView2.setData(getPitBean(messageEvent));
getvjs();
// imActionYs.setVisibility(GONE);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upYs(false);
}
@@ -1210,7 +885,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
auctionList = null;
gexList();
steView(type);
isButtonsInflated = false;
mBinding.tvPB.setText("0");
}
@@ -1235,7 +909,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
public void event1027(RoomMessageEvent messageEvent) {
type = messageEvent.getText().getType();
// getTextView();
steView(type);
// 更新TextView样式
int defaultColor = ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_0DFFB9); // 绿色
@@ -1336,27 +1009,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (toUserInfo != null) {
updateCharmForUser(toUserInfo);
}
// if (mBinding.roomMakeWheat2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// mBinding.tvPB.setText(messageEvent.getText().getToUserInfo().getCharm() + "");
// } else {
// if (mBinding.ivAuction1 != null && mBinding.ivAuction1.getUserId() != null) {
// if (mBinding.ivAuction1.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// RoomMakeWheatView wheatView = mBinding.ivAuction1;
// wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// wheatView.setData(wheatView.pitBean);
// } else if (mBinding.ivAuction2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// RoomMakeWheatView wheatView = mBinding.ivAuction2;
// wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// wheatView.setData(wheatView.pitBean);
// } else if (mBinding.ivAuction3.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// RoomMakeWheatView wheatView = mBinding.ivAuction3;
// wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// wheatView.setData(wheatView.pitBean);
// }
// }
// }
}
/**
@@ -1456,29 +1108,11 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.nickName3.setText(pitBean.getNickname());
wheatView.setData(pitBean);
} else if (j == 4) {
// if (auctionListBean.getUser_id().equals(SpUtil.getUserId() + "")){
// if (parentFragment != null) {
// parentFragment.setRoleType(3, 444);
// parentFragment.switchMic(2);
// }
// }
ImageUtils.loadHeadCC(auctionListBean.getAvatar(), mBinding.avatar4);
} else if (j == 5) {
// if (auctionListBean.getUser_id().equals(SpUtil.getUserId() + "")){
// if (parentFragment != null) {
// parentFragment.setRoleType(3, 555);
// parentFragment.switchMic(2);
// }
// }
ImageUtils.loadHeadCC(auctionListBean.getAvatar(), mBinding.avatar5);
} else if (j == 6) {
// if (auctionListBean.getUser_id().equals(SpUtil.getUserId() + "")){
// if (parentFragment != null) {
// parentFragment.setRoleType(3, 666);
// parentFragment.switchMic(2);
// }
// }
ImageUtils.loadHeadCC(auctionListBean.getAvatar(), mBinding.avatar6);
}
@@ -1500,16 +1134,10 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.avatar4.setImageResource(com.xscm.moduleutil.R.mipmap.room_ic_wheat_default);
mBinding.avatar5.setImageResource(com.xscm.moduleutil.R.mipmap.room_ic_wheat_default);
mBinding.avatar6.setImageResource(com.xscm.moduleutil.R.mipmap.room_ic_wheat_default);
// mBinding.ivAuction1.setData(getPitBean2(null));
// mBinding.ivAuction2.setData(getPitBean2(null));
// mBinding.ivAuction3.setData(getPitBean2(null));
}
if (parentFragment != null) {
parentFragment.getVoiceStatus(auctionUserBean, auctionList, mBinding.roomMakeWheat.pitBean.getUser_id());
// parentFragment.setRoleType(3, 0);
// parentFragment.switchMic(2);
}
}
@@ -1551,13 +1179,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
lp.copyFrom(dialog.getWindow().getAttributes());
lp.width = (int) (context.getResources().getDisplayMetrics().widthPixels * 0.9f); // 80% 屏幕宽度
int maxHeightDp = 200; // 最大高度 200dp
int maxHeightPx = (int) (maxHeightDp * context.getResources().getDisplayMetrics().density);
// lp.height = Math.min(
// maxHeightPx,
// context.getResources().getDisplayMetrics().heightPixels * 3 / 5
// ); // 取较小值
dialog.getWindow().setAttributes(lp);
}
@@ -1585,14 +1206,11 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
public void onTick(long millisUntilFinished) {
int time1 = (int) (millisUntilFinished / 1000);
setTime(time1);
remainingTime = time1;
}
@Override
public void onFinish() {
setTime(0);
remainingTime = 0;
}
};
mCountDownTimer.start();
@@ -1663,10 +1281,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
@Override
public void onDestroyView() {
super.onDestroyView();
// if (EventBus.getDefault().isRegistered(this)) {
// EventBus.getDefault().unregister(this);
// }
// stub.setVisibility(GONE);
releaseResources();
}
@@ -1676,9 +1290,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).upTop();
// ImageUtils.clearDiskCache(getActivity());
}
isButtonsInflated = false;
releaseCountDownTimer();
closeCardRelationshipFragment();
}

33
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
View File

@@ -65,7 +65,6 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
protected void initData() {
mBinding.recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 3));
mAdapter = new MyAdapter();
mAdapter.setCheckedPicture(picture);
mBinding.recyclerView.setAdapter(mAdapter);
mAdapter.setOnItemClickListener(new MyAdapter.OnItemClickListener() {
@@ -189,8 +188,6 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
// 设置固定高度为 500dp
int screenHeight = getResources().getDisplayMetrics().heightPixels;
int heightInDp = (int) (screenHeight * 0.6f);
;
// int heightInPx = (int) (heightInDp * getResources().getDisplayMetrics().density);
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, heightInDp);
// 可选：设置动画样式（从底部弹出）
@@ -202,7 +199,6 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
protected void initDialogStyle(Window window) {
super.initDialogStyle(window);
window.setGravity(Gravity.BOTTOM);
// window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
setCancelable(true);
}
@@ -259,7 +255,6 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
mAdapter.setNewData(publicBgList);
}
// MvpPre.setBg(roomId, mAdapter.getCheckedPicture());
}
@Override
@@ -298,17 +293,6 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
super(R.layout.room_rv_item_room_bg);
}
private String checkedPicture;
public void setCheckedPicture(String checkedPicture) {
this.checkedPicture = checkedPicture;
}
String getCheckedPicture() {
return checkedPicture;
}
@Override
protected void convert(BaseViewHolder helper, RoomBgBean.RoomBg item) {
if (item.isAddButton()) {
@@ -329,24 +313,7 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
});
}
// // 设置点击事件
// helper.itemView.setOnClickListener(v -> {
// if (item.isAddButton()) {
// // 跳转选择图片（比如打开系统相册）
// chooseImage();
// } else {
// // 选择某张图片作为背景
// checkedPicture = item.getImage_url();
// EventBus.getDefault().post(new RoomBgBean());
// notifyDataSetChanged();
// }
// });
}
}
public void closeDialog(View view) {
dismiss();
}
}

286
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomCabinFragment.java
View File

@@ -4,34 +4,23 @@ import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.provider.Settings;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.SurfaceView;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.core.app.NotificationManagerCompat;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ObjectUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.hjq.toast.ToastUtils;
import com.orhanobut.logger.Logger;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.room.contacts.RoomCabinContacts;
import com.xscm.modulemain.activity.room.presenter.RoomCabinPresenter;
import com.xscm.modulemain.databinding.RoomCabinFragmentBinding;
import com.xscm.modulemain.dialog.ExitRoomBottomSheet;
import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
import com.hjq.toast.ToastUtils;
import com.orhanobut.logger.Logger;
import com.xscm.modulemain.activity.room.contacts.RoomCabinContacts;
import com.xscm.modulemain.activity.room.presenter.RoomCabinPresenter;
import com.xscm.moduleutil.base.BaseRoomFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RoomMessageEvent;
@@ -40,14 +29,10 @@ import com.xscm.moduleutil.bean.room.RoomCpUserBean;
import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.bean.room.RoomPitBean;
import com.xscm.moduleutil.event.CabinEvent;
import com.xscm.moduleutil.event.RoomBeckoningEvent;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.rtc.AgoraManager;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.SharedViewModel;
import com.xscm.moduleutil.widget.dialog.CommonDialog;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -69,10 +54,8 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
private static final String LABEL_ID_MOVIE = "5";
protected String roomId;
protected String pitNumber;//当前点击的麦序
protected CommonDialog commonDialog;
CountDownTimer mCountDownTimer;
private RoomInfoResp roomInfoResp;
private int remainingTime;
private boolean isShow = false;
private RoomCpUserBean cpUserBean;
private boolean isMicPlace = false;
@@ -96,23 +79,11 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
@Override
public void initArgs(Bundle arguments) {
super.initArgs(arguments);
// roomInfoResp = (RoomInfoResp) arguments.getSerializable("roomInfoResp");
// if (roomInfoResp != null) {
// roomId = roomInfoResp.getRoom_info().getRoom_id();
// cpUserBean = roomInfoResp.getCp_user();
// label_id = roomInfoResp.getRoom_info().getLabel_id();
// }
}
private boolean isLandscape;
@Override
public void onResume() {
super.onResume();
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).changeBackground(com.xscm.moduleutil.R.mipmap.cabin_bj);
// ((RoomActivity) getActivity()).setvisibTop(false);
// }
if (CommonAppContext.getInstance().lable_id.equals("6") && CommonAppContext.getInstance().isMicPlace){
joinChannel();
isMicPlace = true;
@@ -121,29 +92,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
}
}
private void enableNotifications() {
if (NotificationManagerCompat.from(requireContext()).areNotificationsEnabled()) {
Log.d("RoomCabinFragment", "Notifications enable!");
return;
}
Log.d("RoomCabinFragment", "Notifications not enable!");
new AlertDialog.Builder(getActivity())
.setTitle("提示")
.setMessage("请打开通知权限，防止后台共享屏幕中断")
.setPositiveButton("设置", (dialog, which) -> {
Intent intent = new Intent();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
intent.putExtra(Settings.EXTRA_APP_PACKAGE, getActivity().getPackageName());
intent.putExtra(Settings.EXTRA_CHANNEL_ID, getActivity().getApplicationInfo().uid);
} else {
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
}
startActivity(intent);
dialog.dismiss();
})
.show();
}
@Override
protected RoomCabinPresenter bindPresenter() {
@@ -153,33 +101,14 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
@Override
protected void initData() {
if (roomInfoResp == null) return;
}
private SharedViewModel sharedViewModel;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
// sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
//
// // 观察专门给子Fragment的数据
// sharedViewModel.getChildFragmentData().observe(getViewLifecycleOwner(), data -> {
// if (data != null) {
// // 处理数据
// roomInfoUpdate(data);
// }
// });
return super.onCreateView(inflater, container, savedInstanceState);
}
@Override
protected void initView() {
super.initView();
mBinding.im1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mBinding.im1.setOnClickListener(v -> {
if (!isShow) {
switchMic(2);
isMute(1);
@@ -187,11 +116,8 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
switchMic(1);
}
}
});
mBinding.im2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mBinding.im2.setOnClickListener(v -> {
RoomPitBean roomPitBean = mBinding.roomMakeWheat2.pitBean;
UserInfo userInfo = new UserInfo();
userInfo.setUser_id(Integer.parseInt(roomPitBean.getUser_id()!=null ? roomPitBean.getUser_id() : "0"));
@@ -200,7 +126,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
userInfo.setPit_number("");
RoomGiftDialogFragment.show(null, userInfo, roomInfoResp.getRoom_info().getRoom_id(),0,"", getParentFragmentManager());
}
});
if (!CommonAppContext.getInstance().isShowAg){
switchMic(2);
@@ -209,11 +134,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
switchMic(2);
}
mBinding.im3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// requestScreenCapture();
mBinding.im3.setOnClickListener(v -> {
if (!isMicPlace) {
joinChannel();
isMicPlace = true;
@@ -226,45 +147,17 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
mBinding.im3.setImageResource(com.xscm.moduleutil.R.mipmap.gongxiang);
CommonAppContext.getInstance().isMicPlace = false;
}
}
});
if (roomInfoResp != null && roomInfoResp.getRoom_owner().getUser_id().equals(SpUtil.getUserId()+"")){
mBinding.im3.setVisibility(VISIBLE);
// setvkk(false);
}else {
mBinding.im3.setVisibility(GONE);
}
// if (label_id!=null&& label_id.equals(LABEL_ID_MOVIE)){
// mBinding.im3.setVisibility(GONE);
// }
}
// 获取 MediaProjectionManager
// MediaProjectionManager mediaProjectionManager = (MediaProjectionManager) getSelfActivity().getSystemService(Context.MEDIA_PROJECTION_SERVICE);
// private MediaProjection[] mediaProjection = new MediaProjection[1];
// private final ActivityResultLauncher<Intent> mediaProjectionLauncher = registerForActivityResult(
// new ActivityResultContracts.StartActivityForResult(), result -> {
// if (result.getResultCode() == Activity.RESULT_OK) {
// try {
// // 获取申请到的 MediaProjection
// mediaProjection[0] = mediaProjectionManager
// .getMediaProjection(result.getResultCode(), result.getData());
// // r MediaProjection，需要在 startScreenCapture 之前调用
//
// AgoraManager.getInstance(getActivity()).setExternalMediaProjection(mediaProjection);
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
// }
// );
// 请求屏幕捕获
private void requestScreenCapture() {
// Intent intent = mediaProjectionManager.createScreenCaptureIntent();
// mediaProjectionLauncher.launch(intent);
}
public void handleMsgType1028(RoomMessageEvent messageEvent){
if (messageEvent.getMsgType()==1028){
mBinding.tvHeartValue2.setText(messageEvent.getText().getHot_value());
@@ -272,90 +165,13 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
}
public void upRoomInfo(RoomInfoResp roomInfoResp){
this.roomInfoResp = roomInfoResp;
// if (roomInfoResp != null) {
// roomId = roomInfoResp.getRoom_info().getRoom_id();
// cpUserBean = roomInfoResp.getCp_user();
// label_id = roomInfoResp.getRoom_info().getLabel_id();
// }
// if (roomInfoResp != null && roomInfoResp.getRoom_owner().getUser_id().equals(SpUtil.getUserId()+"")){
// mBinding.im3.setVisibility(VISIBLE);
//// setvkk(false);
// }else {
// mBinding.im3.setVisibility(GONE);
// }
//
// mBinding.ivExit.setOnClickListener(this::onHeartLineClicked);
//
// // 获取当前用户 ID
// String currentUserId = SpUtil.getUserId() + "";
//
//// 定义两个 RoomPitBean 对象，分别用于显示在 roomMakeWheat1 和 roomMakeWheat2
// RoomPitBean selfBean = new RoomPitBean(); // 自己的 bean
// RoomPitBean otherBean = new RoomPitBean(); // 另一个用户的 bean
//
// boolean isSelfFirst = false;
//
//// 判断当前用户是 user_id 还是 user_id1
// if (cpUserBean != null) {
// if (currentUserId.equals(cpUserBean.getUser_id())) {
// // 当前用户是 user_id
// selfBean.setUser_id(cpUserBean.getUser_id());
// selfBean.setUser_code(cpUserBean.getUser_code());
// selfBean.setNickname(cpUserBean.getNickname());
// selfBean.setAvatar(cpUserBean.getAvatar());
// selfBean.setDress(cpUserBean.getDress());
// selfBean.setPit_number("000");
//
// otherBean.setUser_id(cpUserBean.getUser_id1());
// otherBean.setUser_code(cpUserBean.getUser_code1());
// otherBean.setNickname(cpUserBean.getNickname1());
// otherBean.setAvatar(cpUserBean.getAvatar1());
// otherBean.setDress(cpUserBean.getDress1());
// otherBean.setPit_number("000");
//
//
// } else if (currentUserId.equals(cpUserBean.getUser_id1())) {
// // 当前用户是 user_id1，则交换位置
// selfBean.setUser_id(cpUserBean.getUser_id1());
// selfBean.setUser_code(cpUserBean.getUser_code1());
// selfBean.setNickname(cpUserBean.getNickname1());
// selfBean.setAvatar(cpUserBean.getAvatar1());
// selfBean.setDress(cpUserBean.getDress1());
// selfBean.setPit_number("000");
//
// otherBean.setUser_id(cpUserBean.getUser_id());
// otherBean.setUser_code(cpUserBean.getUser_code());
// otherBean.setNickname(cpUserBean.getNickname());
// otherBean.setAvatar(cpUserBean.getAvatar());
// otherBean.setDress(cpUserBean.getDress());
// otherBean.setPit_number("000");
// }
// }
//// 不论谁是自己，始终将自己放在 roomMakeWheat1
// mBinding.roomMakeWheat1.setData(selfBean);
//// 将另一个用户的数据放在 roomMakeWheat2
// mBinding.roomMakeWheat2.setData(otherBean);
// mBinding.tvMainTitle.setText(roomInfoResp.getRoom_info().getRoom_name());
// mBinding.tvHeartValue2.setText(roomInfoResp.getRoom_info().getHot_value());
// if (cpUserBean != null) {
// countDownTime(Long.parseLong(cpUserBean.getTime_day()));
// }
// mediaProjectionManager = (MediaProjectionManager) getContext().getSystemService(Context.MEDIA_PROJECTION_SERVICE);
}
public void upCabinFragment(long time){
countDownTime( time);
}
private void setvkk(boolean isShow){
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).setDiany(isShow);
}
}
private boolean isFullscreen = false;
public void switchMic(int type) {
if (type == 1) {
@@ -395,43 +211,14 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
);
}
public void roomInfoEvent(RoomMessageEvent messageEvent) {
if (messageEvent.getMsgType() == 1028) {
mBinding.tvHeartValue2.setText(messageEvent.getText().getHot_value());
}
}
private void onHeartLineClicked(View view) {
if (view.getId() == R.id.iv_exit) {
// EventBus.getDefault().post(new RoomOutEvent());
// ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getRoom_id()).navigation();
ExitRoomBottomSheet bottomSheet = ExitRoomBottomSheet.newInstance(false,true,true);
bottomSheet.setOnOptionSelectedListener(new ExitRoomBottomSheet.OnOptionSelectedListener() {
@Override
public void onMinimize() {
// 处理最小化逻辑，比如不销毁 Activity，仅移至后台
// CommonAppContext.getInstance().isShow = false;
// ARouter.getInstance().build(ARouteConstants.ME).navigation();//栈顶复用
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).moveTaskToBack(true);
// }
// 在Activity中
// Intent serviceIntent = new Intent(getContext(), FloatingWindowService.class);
// 判断是否已有浮窗正在显示
// if (!EasyFloat.isShow("testFloat")) {
// // 启动前台服务以维持浮窗
// Context context = requireContext();
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// // Android 12+ 需要指定 foregroundServiceType
// Intent serviceIntent = new Intent(context, FloatingWindowService.class);
// serviceIntent.setAction("ACTION_START_FLOAT");
// context.startForegroundService(serviceIntent);
// }
//
// }
}
@Override
@@ -440,7 +227,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
// 调用退出房间方法
if (label_id!=null && label_id.equals(LABEL_ID_MOVIE)){
MvpPre.quitRoom(roomId, SpUtil.getUserId() + "");
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", AgoraManager.getInstance(getActivity()).getLastRoomId()).navigation();
return;
}
if (roomInfoResp != null) {
@@ -480,15 +266,12 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
@Override
public void onTick(long millisUntilFinished) {
int time1 = (int) (millisUntilFinished / 1000);
// pitBean.setCount_down(time1);
setTime(time1);
remainingTime = time1;
}
@Override
public void onFinish() {
setTime(0);
remainingTime = 0;
}
};
mCountDownTimer.start();
@@ -548,18 +331,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
}
}
protected void updateWheatData() {
if (roomInfoResp != null && !ObjectUtils.isEmpty(roomInfoResp.getRoom_info().getPit_list())) {
for (RoomPitBean bean : roomInfoResp.getRoom_info().getPit_list()) {
EventBus.getDefault().post(bean);
}
}
if (roomInfoResp != null) {
RoomBeckoningEvent event = new RoomBeckoningEvent(roomId, roomInfoResp.getRoom_info().getCardiac() == 1);
EventBus.getDefault().post(event);
}
}
@Override
protected int getLayoutId() {
@@ -569,8 +340,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
@Override
public void roomInfoUpdate(RoomInfoResp resp) {
roomInfoResp = resp;
// updateWheatData();
if (roomInfoResp != null) {
roomId = roomInfoResp.getRoom_info().getRoom_id();
cpUserBean = roomInfoResp.getCp_user();
@@ -592,8 +361,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
RoomPitBean selfBean = new RoomPitBean(); // 自己的 bean
RoomPitBean otherBean = new RoomPitBean(); // 另一个用户的 bean
boolean isSelfFirst = false;
// 判断当前用户是 user_id 还是 user_id1
if (cpUserBean != null) {
if (currentUserId.equals(cpUserBean.getUser_id())) {
@@ -639,7 +406,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
if (cpUserBean != null) {
countDownTime(Long.parseLong(cpUserBean.getTime_day()));
}
// mediaProjectionManager = (MediaProjectionManager) getContext().getSystemService(Context.MEDIA_PROJECTION_SERVICE);
}
@Override
@@ -672,37 +438,11 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
((RoomActivity) getActivity()).quitRoom2(roomId);
if (label_id!=null && label_id.equals(LABEL_ID_MOVIE)){
((RoomActivity) getActivity()).jiaR();
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", AgoraManager.getInstance(getActivity()).getLastRoomId()).navigation();
return;
}else {
((RoomActivity) getActivity()).performExitRoom(1);
}
}
}
// private MediaProjection[] mediaProjection = new MediaProjection[1];
// private MediaProjectionManager mediaProjectionManager;
// private final ActivityResultLauncher<Intent> mediaProjectionLauncher = registerForActivityResult(
// new ActivityResultContracts.StartActivityForResult(),
// result -> {
// if (result.getResultCode() == Activity.RESULT_OK) {
// try {
// mediaProjection[0] = mediaProjectionManager
// .getMediaProjection(result.getResultCode(), result.getData());
// joinChannel();
// } catch (Exception e) {
// Log.e("RoomCabinFragment", "error msg: " + e.getMessage());
// }
// }
// }
// );
private void isConfig() {
enableNotifications();
}
private void joinChannel() {
AgoraManager.getInstance(getActivity()).updateChannelMediaOptions();
@@ -838,11 +578,5 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
public void releaseResources(){
releaseCountDownTimer();
// ImageUtils.clearDiskCache(getActivity());
// if (mediaProjection[0] != null) {
// mediaProjection[0].stop();
// mediaProjection[0] = null;
// }
}
}

11
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomChartsFragment.java
View File

@@ -93,17 +93,6 @@ public class RoomChartsFragment extends BaseMvpDialogFragment<RoomChartsPresente
tabItems.add(new TabItem("日榜"));
tabItems.add(new TabItem("周榜"));
mBinding.slidingTabLayout.setTabData(tabItems);
String[] title = new String[]{"小时榜", "日榜", "周榜"};
// mBinding.slidingTabLayout.setViewPager(mBinding.vpRankChild, title);
// List<Fragment> fragments = new ArrayList<>();
// fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
// fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
// fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
// MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(fragments, getChildFragmentManager());
// mBinding.vpRankChild.setAdapter(myFragmentPagerAdapter);
// mBinding.vpRankChild.setCurrentItem(0);
// mBinding.slidingTabLayout.setViewPager(mBinding.vpRankChild, title);
mBinding.tvCharm.setOnClickListener(this::onViewClicked);
mBinding.tvWealth.setOnClickListener(this::onViewClicked);

2
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
View File

@@ -1129,7 +1129,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
public void roomInfoEvent(RoomMessageEvent messageEvent) {
if (messageEvent.getMsgType() == 123) {
// // 获取 PublicScreenEaseChatFragment 实例
PublicScreenEaseChatFragment publicScreenEaseChatFragment = (PublicScreenEaseChatFragment) getChildFragmentManager()
ChatRoomFragment publicScreenEaseChatFragment = (ChatRoomFragment) getChildFragmentManager()
.findFragmentByTag("PublicScreenEaseChatFragment");
if (publicScreenEaseChatFragment != null) {

388
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -66,11 +66,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
private KaraokeView mKaraokeView;
private boolean isRotate = true;
private String did;
private String duration;
private MusicSongBean musicSongBean;
RoomFragment parentFragment;
BaseQuickAdapter<RoomPitBean, BaseViewHolder> adapter;
private RoomOnline online;
public RoomKtvFragment() {}
public RoomKtvFragment(RoomInfoResp roomInfoResp) {
@@ -84,47 +82,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
return fragment;
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
// roomInfoResp = (RoomInfoResp) getArguments().getSerializable("roomInfo");
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// 设置触摸委托以扩大点击区域
// view.post(() -> {
// View muZc = view.findViewById(R.id.mu_zc);
// ViewGroup parent = (ViewGroup) muZc.getParent();
//
// Rect bounds = new Rect();
// muZc.getHitRect(bounds);
// // 扩展点击区域
// bounds.top -=55;
// bounds.bottom += 50;
// bounds.left -= 30;
// bounds.right += 30;
//
// parent.setTouchDelegate(new TouchDelegate(bounds, muZc));
// });
}
private SharedViewModel sharedViewModel;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
// sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
//
// // 观察专门给子Fragment的数据
// sharedViewModel.getChildFragmentData().observe(getViewLifecycleOwner(), data -> {
// if (data != null) {
// // 处理数据
// roomInfoUpdate(data);
// }
// });
return super.onCreateView(inflater, container, savedInstanceState);
}
public View getNegativeMarginView() {
return mBinding.muZc;
@@ -175,7 +132,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
((RoomActivity) getActivity()).setRoleType(0, 0);
}
}
// AgoraManager.getInstance(getActivity()).stopMuisc()
if (roomInfoResp.getSong_user_info().getUser_id().equals(SpUtil.getUserId() + "")) {
did = roomInfoResp.getSong_user_info().getDid();
AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()), 1);
@@ -183,10 +139,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (AgoraManager.getInstance(getActivity()).isOnJoin()) {
AgoraManager.getInstance(getActivity()).loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()));
}
// AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()), 2);
}
musicSongBean = roomInfoResp.getSong_user_info();
duration = roomInfoResp.getSong_user_info().getDuration();
mBinding.muName.setText(roomInfoResp.getSong_user_info().getSong_name());
ImageUtils.loadHeadCC(roomInfoResp.getSong_user_info().getPoster(), mBinding.muBj);
ImageUtils.loadHeadCC(roomInfoResp.getSong_user_info().getPoster(), mBinding.musicPoster);
@@ -252,17 +206,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void roomAgoraIsOPen(AgoraIsOPen isOPen) {
// if (isOPen.isOpen()) {
// mKaraokeView.reset();
// AgoraManager.getInstance(getActivity()).stopMusicPlayer();
// AgoraManager.getInstance(getActivity()).setmSongCode(0);
// AgoraManager.getInstance(getActivity()).loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()));
// }
// }
@Override
public void onStart() {
super.onStart();
@@ -346,7 +289,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
@Override
protected void initView() {
mBinding.lyricsView.setStartOfVerseIndicatorColor(getResources().getColor(com.xscm.moduleutil.R.color.color_0DFFB9));
// mBinding.lyricsView.setStartOfVerseIndicatorPaddingTop(20f);
mBinding.lyricsView.setStartOfVerseIndicatorRadius(6f);
mBinding.lyricsView.enableStartOfVerseIndicator(true);
mBinding.lyricsView.setActiveLineUpcomingTextColor(getResources().getColor(com.xscm.moduleutil.R.color.color_0DFFB9));
@@ -365,14 +307,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
@Override
protected void convert(BaseViewHolder helper, RoomPitBean item) {
// RoomPitBean bean = new RoomPitBean();
// bean.setUser_id(item.getUser_id());
// bean.setRoom_id(roomInfoResp.getRoom_info().getRoom_id());
// bean.setNickname(item.getNickname());
// bean.setAvatar(item.getAvatar());
// bean.setDress(item.getDress());
// bean.setCharm(item.getCharm());
// bean.setPit_number("0");
RoomKtvWheatView mu_rank = helper.getView(R.id.mu_rank);
mu_rank.setData(item);
mu_rank.setOnClickListener(new View.OnClickListener() {
@@ -400,11 +334,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
};
mBinding.recyclerView.setAdapter(adapter);
// if (mBinding.llBz.getVisibility()== View.VISIBLE){
// AgoraManager.getInstance(getActivity()).selectAudioTrack(1);
// mBinding.imBz.setImageResource(com.xscm.moduleutil.R.mipmap.accompany_off);
// mBinding.tvBz.setText("伴奏");
// }
isRotate = false;
RoomKtvWheatView muYc = mBinding.muYc;
@@ -471,10 +400,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
});
muJb.setmOnCharmClickListener(new RoomKtvWheatView.onCharmClickListener() {
@Override
public void onCharmClick(RoomKtvWheatView view, RoomPitBean pitBean) {
muJb.setmOnCharmClickListener((view, pitBean) -> {
if (ClickUtils.isFastDoubleClick()) {
return;
}
@@ -482,17 +408,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
});
// 设置透明覆盖层的点击事件
// View touchOverlay = mBinding.getRoot().findViewById(R.id.mu_zc_touch_overlay);
//
// touchOverlay.setOnClickListener(v -> {
// // 转发点击事件给实际的 mu_zc 视图
// muZc.performClick();
// });
}
private int isNumberWhether() {
@@ -641,8 +557,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
mBinding.lyricsView.setVisibility(View.GONE);
mBinding.tvJz.setVisibility(View.VISIBLE);
}
// mBinding.muName.setText(mLyricsModel.title);
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -688,7 +602,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (messageEvent.getText().getSongInfo() != null) {
musicSongBean = messageEvent.getText().getSongInfo();
did = messageEvent.getText().getSongInfo().getDid();
duration = messageEvent.getText().getSongInfo().getDuration();
mBinding.muName.setText(messageEvent.getText().getSongInfo().getSong_name());
ImageUtils.loadHeadCC(messageEvent.getText().getSongInfo().getPoster(), mBinding.musicPoster);
ImageUtils.loadHeadCC(messageEvent.getText().getSongInfo().getPoster(), mBinding.muBj);
@@ -703,10 +616,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
roomDefaultWheatView.setData(pitBean);
roomInfoResp.setSong_user_info(musicSongBean);
// mKaraokeView.reset();
// AgoraManager.getInstance(getActivity()).stopMusicPlayer();
// AgoraManager.getInstance(getActivity()).setmSongCode(0);
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
AgoraManager.getInstance(getActivity());
AgoraManager.stopMuisc();
@@ -714,12 +623,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
} else {
// AgoraManager.getInstance(getActivity()).stopMuisc();
if (AgoraManager.getInstance(getActivity()).isOnJoin()) {
AgoraManager.getInstance(getActivity()).loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()));
}
// AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 2);
}
if (getActivity() instanceof RoomActivity) {
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
@@ -731,15 +637,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (roomInfoResp.getUser_info().getPit_number() > 0) {
} else {
// if (mBinding.muZc.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
// ((RoomActivity) getActivity()).setRoleType(2, -1);
// ((RoomActivity) getActivity()).switchMic(2);
// } else {
((RoomActivity) getActivity()).setRoleType(0, 0);
((RoomActivity) getActivity()).switchMic(2);
// }
}
}
}
@@ -827,9 +726,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (pitBean.getPit_number().equals("9")) {
RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
roomDefaultWheatView.setData(pitBean);
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(false);
// }
} else if (pitBean.getPit_number().equals("10")) {
RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
roomDefaultWheatView.setData(pitBean);
@@ -841,7 +737,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
} else {
b = false;
}
// AgoraManager.getInstance(getActivity()).setEnableAudio(b);
if (parentFragment != null) {
parentFragment.updateWheatStatus(pitBean, Integer.parseInt(messageEvent.getText().getPit_number()), false, b);
}
@@ -895,29 +790,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
// 更新麦位列表数据
adapter.setNewData(roomInfoResp.getSong_pit_list());
// RoomPitBean pitBean = mBinding.muYc.pitBean;
// if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(pitBean.getUser_id())) {
// pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.muYc.setCharm(pitBean.getCharm());
// }
//
// if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muZc.pitBean.getUser_id())) {
// mBinding.muZc.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.muZc.setCharm(mBinding.muZc.pitBean.getCharm());
// return;
// }
// if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muJb.pitBean.getUser_id())) {
// mBinding.muJb.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.muJb.setCharm(mBinding.muJb.pitBean.getCharm());
// return;
// }
// for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
// if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// roomInfoResp.getSong_pit_list().get(i).setCharm(messageEvent.getText().getToUserInfo().getCharm());
// }
// }
// adapter.setNewData(roomInfoResp.getSong_pit_list());
}
/**
@@ -1059,261 +931,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
adapter.setNewData(roomInfoResp.getSong_pit_list());
}
// public void roomInfoEvent(RoomMessageEvent messageEvent) {
// boolean b = false;
// RoomFragment parentFragment = (RoomFragment) getParentFragment();
// if (messageEvent.getMsgType() == 1013) {
// LogUtils.e("@@", messageEvent);
// if (messageEvent.getText().getAction() == 3) {//下一首变化
// if (messageEvent.getText().getNextInfo() != null) {
// mBinding.muXName.setText(messageEvent.getText().getNextInfo().getSong_name());
// } else {
// mBinding.muXName.setText("暂无歌曲");
// }
// } else if (messageEvent.getText().getAction() == 2) {//切歌
// if (messageEvent.getText().getSongInfo() != null) {
// musicSongBean = messageEvent.getText().getSongInfo();
// did = messageEvent.getText().getSongInfo().getDid();
// duration = messageEvent.getText().getSongInfo().getDuration();
// mBinding.muName.setText(messageEvent.getText().getSongInfo().getSong_name());
// ImageUtils.loadHeadCC(messageEvent.getText().getSongInfo().getPoster(), mBinding.musicPoster);
// ImageUtils.loadHeadCC(messageEvent.getText().getSongInfo().getPoster(), mBinding.muBj);
// RoomKtvWheatView roomDefaultWheatView = mBinding.muYc;
// RoomPitBean pitBean = new RoomPitBean();
// pitBean.setPit_number("-1");
// pitBean.setAvatar(messageEvent.getText().getSongInfo().getAvatar());
// pitBean.setNickname(messageEvent.getText().getSongInfo().getNickname());
// pitBean.setUser_id(messageEvent.getText().getSongInfo().getUser_id());
// pitBean.setCharm(messageEvent.getText().getSongInfo().getCharm());
// roomDefaultWheatView.setData(pitBean);
// roomInfoResp.setSong_user_info(musicSongBean);
//
// if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
// AgoraManager.getInstance(getActivity()).stopMuisc();
// LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code());
// AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
//
// } else {
// AgoraManager.getInstance(getActivity()).stopMuisc();
// AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 2);
// }
// if (getActivity() instanceof RoomActivity) {
//// if (parentFragment != null) {
// if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
//// parentFragment.setRoleType(3, -1);
//// parentFragment.switchMic(1);
//
// ((RoomActivity) getActivity()).setRoleType(3, -1);
// ((RoomActivity) getActivity()).switchMic(1);
//
// } else {
// if (mBinding.muZc.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
//// parentFragment.setRoleType(2, -1);
//// parentFragment.switchMic(2);
// ((RoomActivity) getActivity()).setRoleType(2, -1);
// ((RoomActivity) getActivity()).switchMic(2);
// } else {
//// parentFragment.setRoleType(0, 0);
//// parentFragment.switchMic(2);
// ((RoomActivity) getActivity()).setRoleType(0, 0);
// ((RoomActivity) getActivity()).switchMic(2);
// }
// }
// }
//
//// if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
//// setVisibilityView(1);
//// } else if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "") && roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
//// setVisibilityView(1);
//// } else if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
//// setVisibilityView(2);
//// } else if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
//// setVisibilityView(1);
//// } else {
//// setVisibilityView(3);
//// }
//
// } else {
// did = "";
// mBinding.muName.setText("无");
// }
// if (messageEvent.getText().getNextInfo() != null) {
// mBinding.muXName.setText(messageEvent.getText().getNextInfo().getSong_name());
// } else {
// mBinding.muXName.setText("无");
// }
//// if (parentFragment != null) {
//// parentFragment.mus();
//// }
// }
// sv();
// } else if (messageEvent.getMsgType() == 1003) {
//
// if (messageEvent.getText().getPit_number().equals("9") || messageEvent.getText().getPit_number().equals("10")) {
//
// RoomPitBean pitBean = new RoomPitBean();
// pitBean.setPit_number(messageEvent.getText().getPit_number());
// pitBean.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
// pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
// pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
//
// if (pitBean.getPit_number().equals("9")) {
// RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
// roomDefaultWheatView.setData(pitBean);
// } else if (pitBean.getPit_number().equals("10")) {
// RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
// roomDefaultWheatView.setData(pitBean);
// }
// if (SpUtil.getUserId() == messageEvent.getText().getFromUserInfo().getUser_id()) {
// b = true;
// AgoraManager.getInstance(getActivity()).ClientRole(true);
// AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
// } else {
// b = false;
// }
// if (parentFragment != null) {
// parentFragment.updateWheatStatus(pitBean, Integer.parseInt(pitBean.getPit_number()), true, b);
// }
// } else {
// RoomPitBean pitBean = new RoomPitBean();
// pitBean.setPit_number(messageEvent.getText().getPit_number());
// pitBean.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
// pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
// pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
// roomInfoResp.getSong_pit_list().add(pitBean);
// }
// adapter.setNewData(roomInfoResp.getSong_pit_list());
// sv();
// } else if (messageEvent.getMsgType() == 1004) {
//
// if (messageEvent.getText().getPit_number().equals("9") || messageEvent.getText().getPit_number().equals("10")) {
// RoomPitBean pitBean = new RoomPitBean();
// pitBean.setPit_number(messageEvent.getText().getPit_number());
// pitBean.setUser_id("");
// pitBean.setAvatar("");
// pitBean.setNickname("");
// pitBean.setSex("");
// pitBean.setCharm("");
// if (pitBean.getPit_number().equals("9")) {
// RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
// roomDefaultWheatView.setData(pitBean);
// } else if (pitBean.getPit_number().equals("10")) {
// RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
// roomDefaultWheatView.setData(pitBean);
// }
// if (SpUtil.getUserId() == messageEvent.getText().getFromUserInfo().getUser_id()) {
// b = true;
// AgoraManager.getInstance(getActivity()).ClientRole(false);
// AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
// } else {
// b = false;
// }
//// AgoraManager.getInstance(getActivity()).setEnableAudio(b);
// if (parentFragment != null) {
// parentFragment.updateWheatStatus(pitBean, Integer.parseInt(messageEvent.getText().getPit_number()), false, b);
// }
// } else {
// for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
// if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// roomInfoResp.getSong_pit_list().remove(i);
// break;
// }
// }
// adapter.setNewData(roomInfoResp.getSong_pit_list());
// }
// sv();
// } else if (messageEvent.getMsgType() == 1019) {
//// RoomCharmRankBean charmRankBean=messageEvent.getText().getUserCharmList().get(0);
//// RoomPitBean pitBean=mBinding.muYc.pitBean;
//// pitBean.setCharm(charmRankBean.getCharm());
//// mBinding.muYc.setData(pitBean);
// LogUtils.e("1019", messageEvent);
//// adapter.setNewData(messageEvent.getText().getUserCharmList());
// } else if (messageEvent.getMsgType() == 1021) {
// RoomPitBean pitBean = mBinding.muYc.pitBean;
// pitBean.setCharm("0");
// mBinding.muYc.setData(pitBean);
// pitBean = mBinding.muZc.pitBean;
// pitBean.setCharm("0");
// mBinding.muZc.setData(pitBean);
// pitBean = mBinding.muJb.pitBean;
// pitBean.setCharm("0");
// mBinding.muJb.setData(pitBean);
//
// for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
// roomInfoResp.getSong_pit_list().get(i).setCharm("0");
// }
// adapter.setNewData(roomInfoResp.getSong_pit_list());
//
// } else if (messageEvent.getMsgType() == 1005) {
// RoomPitBean pitBean = mBinding.muYc.pitBean;
// if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(pitBean.getUser_id())) {
// pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.muYc.setData(pitBean);
// }
//
// if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muZc.pitBean.getUser_id())) {
// mBinding.muZc.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.muZc.setData(mBinding.muZc.pitBean);
// return;
// }
// if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muJb.pitBean.getUser_id())) {
// mBinding.muJb.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
// mBinding.muJb.setData(mBinding.muJb.pitBean);
// return;
// }
// for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
// if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
// roomInfoResp.getSong_pit_list().get(i).setCharm(messageEvent.getText().getToUserInfo().getCharm());
// }
// }
// adapter.setNewData(roomInfoResp.getSong_pit_list());
// } else if (messageEvent.getMsgType() == 1035) {
// RoomPitBean pitBean = mBinding.muZc.pitBean;
// if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
// pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
// mBinding.muZc.setData(pitBean);
// }
// RoomPitBean pitBean1 = mBinding.muJb.pitBean;
// if (pitBean1.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// pitBean1.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
// pitBean1.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean1.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean1.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean1.setDress(messageEvent.getText().getFromUserInfo().getDress());
// mBinding.muJb.setData(pitBean1);
// }
// RoomPitBean pitBean2 = mBinding.muYc.pitBean;
// if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// pitBean2.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
// pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
// mBinding.muYc.setData(pitBean2);
// }
// for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
// if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
// roomInfoResp.getSong_pit_list().get(i).setCharm(messageEvent.getText().getFromUserInfo().getCharm());
// roomInfoResp.getSong_pit_list().get(i).setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
// roomInfoResp.getSong_pit_list().get(i).setNickname(messageEvent.getText().getFromUserInfo().getNickname());
// roomInfoResp.getSong_pit_list().get(i).setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
// roomInfoResp.getSong_pit_list().get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
// }
// }
// adapter.setNewData(roomInfoResp.getSong_pit_list());
// }
// }
@Override
public void roomInfo(RoomInfoResp resp) {
@@ -1333,7 +950,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
@Override
public void getRoomOnline(RoomOnline onlineBean) {
this.online = onlineBean;
}
@@ -1359,12 +975,10 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
@Override
public void postRoomInfo(RoomInfoResp resp) {
// AgoraManager.getInstance(getActivity()).destroy();
}
@Override
public void getCharmRank(List<RoomCharmRankBean> list) {
// adapter.setNewData(list);
}
@Override

19
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
View File

@@ -132,17 +132,16 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
@Override
protected void initData() {
Observable.timer(10, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> {
upDtaView(true);
});
Observable.timer(60, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> {
upDtaView(false);
// Observable.timer(20, TimeUnit.MILLISECONDS)
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(aLong -> {
// upDtaView(true);
// });
// Observable.timer(100, TimeUnit.MILLISECONDS)
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(aLong -> {
// upDtaView(false);
// });
});
}
public void upRoomInfo(RoomInfoResp roomInfoResp) {

18
modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java
View File

@@ -95,12 +95,6 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
super.onDestroyView();
}
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void bannerRefresh(BannerRefreshEvent event) {
//// MvpPre.getBanners();
// MvpPre.getCarousels();//顶部推荐
// }
@Override
protected VoiceCategoryPresenter bindPresenter() {
return new VoiceCategoryPresenter(this, getActivity());
@@ -127,10 +121,6 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
mBinding.banner.setOnItemClickListener(new XBanner.OnItemClickListener() {
@Override
public void onItemClick(XBanner banner, Object model, View view, int position) {
// if (ProxyChecker.isProxySet(context)) {
// ToastUtils.show("使用代理禁止访问");
// return;
// }
/**
* 1房间2文章3链接 其他详情图
*
@@ -146,12 +136,10 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
});
DisplayMetrics displayMetrics = new DisplayMetrics();
requireActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
int screenWidth = displayMetrics.widthPixels;
carouselBannerAdapter = new CarouselBannerAdapter();
mBinding.bannerViewPager
.setAdapter(carouselBannerAdapter)
// .setPageStyle(PageStyle.MULTI_PAGE_OVERLAP, 0.6f)
.create();
mBinding.bannerViewPager.setIndicatorVisibility(GONE);
@@ -185,12 +173,6 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
if (roomId != null && !roomId.isEmpty()) { // 检查 roomId 是否有效
showLoading();
RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), roomId,"",null);
// ARouter.getInstance()
// .build(ARouteConstants.ROOM_DETAILS)
// .withString("form", "首页热门列表")
// .withString("roomId", roomId)
// .navigation();
} else {
// Log.d(TAG, "Room ID is null or empty for item at position: " + position);
}

23
modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/ChatRoomPresenter.java Normal file
View File

@@ -0,0 +1,23 @@
package com.xscm.modulemain.activity.room.presenter;
import android.content.Context;
import com.xscm.modulemain.activity.room.contacts.ChatRoomContacts;
import com.xscm.moduleutil.presenter.BasePresenter;
public class ChatRoomPresenter extends BasePresenter<ChatRoomContacts.View> implements ChatRoomContacts.IPublicScreenEaseChatPre {
public ChatRoomPresenter(ChatRoomContacts.View view, Context context) {
super(view, context);
}
@Override
public void logEmchat(int code, String msg, String toChatUsername) {
}
@Override
public void switchPublicScreen(String room_id, String status) {
}
}

71
modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublicScreenEaseChatPresenter.java
View File

@@ -1,71 +0,0 @@
package com.xscm.modulemain.activity.room.presenter;
import android.content.Context;
import com.xscm.modulemain.activity.room.contacts.PublicScreenEaseChatContacts;
import com.xscm.moduleutil.presenter.BasePresenter;
public class PublicScreenEaseChatPresenter extends BasePresenter<PublicScreenEaseChatContacts.View> implements PublicScreenEaseChatContacts.IPublicScreenEaseChatPre {
public PublicScreenEaseChatPresenter(PublicScreenEaseChatContacts.View view, Context context) {
super(view, context);
}
@Override
public void logEmchat(int code, String msg, String toChatUsername) {
// ApiClient.getInstance().logEmchat(code, msg, toChatUsername, new BaseObserver<String>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(String s) {
//
// }
//
// @Override
// public void onComplete() {
//
// }
// });
}
@Override
public void switchPublicScreen(String room_id, String status) {
// ApiClient.getInstance().switchPublicScreen(room_id, status, new BaseObserver<String>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(String s) {
//
// }
//
// @Override
// public void onComplete() {
//
// }
// });
}
public void sendFace(String roomId, String face_id, String pit, int type) {
// ApiClient.getInstance().sendFace(roomId, face_id, pit, type, new BaseObserver<String>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(String s) {
//
// }
//
// @Override
// public void onComplete() {
//
// }
// });
}
}

1
modulemain/src/main/java/com/xscm/modulemain/manager/RoomManager.java
View File

@@ -254,6 +254,7 @@ public class RoomManager {
LogUtils.dTag("RoomActivity", "navigateToRoom:房间信息获取存在问题");
return;
}
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
ActivityUtils.getTopActivity().startActivity(intent);
} catch (Exception e) {
Logger.e(TAG, "跳转房间页面失败: " + e.getMessage());