From a5ebc83dea5fb4954f1e5747849af1ac8657f1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 30 Oct 2025 09:07:35 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9pk=E6=88=BF=202=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 26 +- app/releas/release/output-metadata.json | 10 +- gradle.properties | 4 +- .../com/xscm/moduleutil/base/RoomManager.java | 39 +- .../moduleutil/bean/RoomMessageEvent.java | 1 + .../xscm/moduleutil/bean/room/PkRoomInfo.java | 1 + .../xscm/moduleutil/http/RetrofitClient.java | 3 +- .../com/xscm/moduleutil/rtc/AgoraManager.java | 83 +- .../xscm/moduleutil/rtc/AgoraManagerEx.java | 354 +++++++++ .../utils/config/EnvironmentEnum.java | 2 +- .../widget/RoomDefaultWheatView.java | 26 +- .../moduleutil/widget/WheatLayoutManager.java | 62 +- .../res/layout/room_view_default_wheat.xml | 10 +- .../main/res/layout/room_view_ktv_wheat.xml | 4 +- moduleroom/src/main/AndroidManifest.xml | 1 - .../moduleroom/activity/RoomActivity.kt | 707 ++++++++++-------- .../moduleroom/contacts/SingSongContacts.java | 3 + .../dialog/RoomPkDialogFragment.java | 8 +- .../fragment/FriendshipRoomFragment.java | 2 +- .../PublicScreenEaseChatFragment.java | 14 +- .../fragment/RoomCabinFragment.java | 69 +- .../moduleroom/fragment/RoomFragment.java | 4 +- .../moduleroom/fragment/SingSongFragment.java | 488 ++++++------ .../presenter/SingSongPresenter.java | 27 +- .../src/main/res/layout/fragment_room_ktv.xml | 513 ++++++------- .../main/res/layout/fragment_sing_song.xml | 2 +- .../main/res/layout/item_room_charm_rank.xml | 2 +- moduleroom/src/main/res/layout/popup_menu.xml | 2 +- moduleroom/src/main/res/layout/room_top.xml | 15 + .../activity/CreatedRoomActivity.java | 4 +- .../modulevocal/activity/MyRoomActivity.java | 40 + .../fragment/VoiceCategoryFragment.java | 15 +- .../modulevoice/fragment/VoiceFragment.java | 2 +- 33 files changed, 1575 insertions(+), 968 deletions(-) create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java diff --git a/app/build.gradle b/app/build.gradle index 7f38f5ff..22d00d55 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,19 +66,19 @@ android { // // 测试版配置 beta { -// dimension "environment" -// // 测试版包名：基础包名 + .beta（com.example.myapp.beta） -// applicationIdSuffix ".beta" -// // 测试版版本名：1.0-beta -// versionNameSuffix "-beta" -// -// // 【测试版应用名称】动态生成带标识的名称 -// resValue "string", "app_name", "羽声-测试版" -// -// // 【测试版图标】替换为测试专用图标 -// manifestPlaceholders = [ -// appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标 -// ] + dimension "environment" + // 测试版包名：基础包名 + .beta（com.example.myapp.beta） + applicationIdSuffix ".beta" + // 测试版版本名：1.0-beta + versionNameSuffix "-beta" + + // 【测试版应用名称】动态生成带标识的名称 + resValue "string", "app_name", "羽声-测试版" + + // 【测试版图标】替换为测试专用图标 + manifestPlaceholders = [ + appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标 + ] } } diff --git a/app/releas/release/output-metadata.json b/app/releas/release/output-metadata.json index e350501c..bb4b1f5f 100644 --- a/app/releas/release/output-metadata.json +++ b/app/releas/release/output-metadata.json @@ -11,9 +11,9 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 43, - "versionName": "1.0.5.3", - "outputFile": "羽声_1.0.5.3_43.apk" + "versionCode": 45, + "versionName": "1.0.5.5", + "outputFile": "羽声_1.0.5.5_45.apk" } ], "elementType": "File", @@ -22,14 +22,14 @@ "minApi": 28, "maxApi": 30, "baselineProfiles": [ - "baselineProfiles/1/羽声_1.0.5.3_43.dm" + "baselineProfiles/1/羽声_1.0.5.5_45.dm" ] }, { "minApi": 31, "maxApi": 2147483647, "baselineProfiles": [ - "baselineProfiles/0/羽声_1.0.5.3_43.dm" + "baselineProfiles/0/羽声_1.0.5.5_45.dm" ] } ], diff --git a/gradle.properties b/gradle.properties index 90b7bb32..1921c172 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.5.3 -APP_VERSION_CODE=43 +APP_VERSION_NAME=1.0.5.5 +APP_VERSION_CODE=45 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/RoomManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/RoomManager.java index c72f432b..5feb32d3 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/RoomManager.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/RoomManager.java @@ -246,24 +246,28 @@ public class RoomManager { @Override public void onNext(RoomInfoResp resp) { - String appId = CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId(); - String token = resp.getUser_info().getAgora_token(); // 如果启用了鉴权才需要 - String roomId = resp.getRoom_info().getRoom_id(); // 房间 ID - String rtm_token = resp.getUser_info().getAgora_rtm_token(); - SpUtil.setRtmToken(rtm_token); - int uid = SpUtil.getUserId(); // 0 表示由 Agora 自动生成 UID - boolean enableMic = false; // 是否开启麦克风 - boolean enableJs = false; // 是否开启角色 - if (resp.getUser_info().getPit_number() != 0) { - enableJs = true; - } - LogUtils.e("token", token); - LogUtils.e("roomId:", roomId); + if (resp!=null) { + String appId = CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId(); + String token = resp.getUser_info().getAgora_token(); // 如果启用了鉴权才需要 + String roomId = resp.getRoom_info().getRoom_id(); // 房间 ID + String rtm_token = resp.getUser_info().getAgora_rtm_token(); + SpUtil.setRtmToken(rtm_token); + int uid = SpUtil.getUserId(); // 0 表示由 Agora 自动生成 UID + boolean enableMic = false; // 是否开启麦克风 + boolean enableJs = false; // 是否开启角色 + if (resp.getUser_info().getPit_number() != 0) { + enableJs = true; + } + LogUtils.e("token", token); + LogUtils.e("roomId:", roomId); // 初始化 Agora 并加入房间 - AgoraManager.getInstance(context) - .joinRoom(token, roomId, uid, enableMic, enableJs); - cacheRoomData(roomId, resp); - navigateToRoom(context, roomId, password, resp, false,taskId); + AgoraManager.getInstance(context) + .joinRoom(token, roomId, uid, enableMic, enableJs); + cacheRoomData(roomId, resp); + navigateToRoom(context, roomId, password, resp, false, taskId); + }else { + + } } @Override @@ -328,6 +332,7 @@ public class RoomManager { ARouter.getInstance() .build(ARouteConstants.ROOM_DETAILS) .with(bundle) + .withFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) .navigation(context); } catch (Exception e) { Logger.e(TAG, "跳转房间页面失败: " + e.getMessage()); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java index 19238090..af1964d0 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java @@ -96,6 +96,7 @@ public class RoomMessageEvent { private String redpacket_id; private EmotionDeatils emoji; + private String is_pk;//是否是pk } @Data diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/PkRoomInfo.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/PkRoomInfo.java index 85f56500..8c493019 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/PkRoomInfo.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/PkRoomInfo.java @@ -18,4 +18,5 @@ public class PkRoomInfo implements Serializable { private String pk_room_value;//对方房间的pk值 private String pk_part;;//2：等待开始、3：进行中、4：惩罚阶段 private String pk_end_times; + private String receive_pk_user_id;//接受pk的用户id } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 188129be..382920ed 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -2246,8 +2246,7 @@ public class RetrofitClient { }); } - public void getRoomUserInfo(String room_id, String - user_id, BaseObserver observer) { + public void getRoomUserInfo(String room_id, String user_id, BaseObserver observer) { sApiServer.getRoomUserInfo(room_id, user_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java index 2c69251b..d946711d 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java @@ -83,7 +83,7 @@ import io.agora.rtc2.video.VideoEncoderConfiguration; public class AgoraManager { private static volatile AgoraManager instance; - private static RtcEngineEx rtcEngine; + public static RtcEngineEx rtcEngine; // private RtcEngineEx rtcEngineEx; private static Context context; private boolean isLocalAudioEnabled = true; // 默认开启麦克风 @@ -102,6 +102,16 @@ public class AgoraManager { private String pkRoomId = ""; private static String lastRoomId; + public int pkUserId; + + public int getPkUserId() { + return pkUserId; + } + + public void setPkUserId(int pkUserId) { + this.pkUserId = pkUserId; + } + public void setLastRoomId(String value) { lastRoomId = value; } @@ -212,36 +222,8 @@ public class AgoraManager { Log.w("AgoraManager", "Failed to set parameters", e); } - /*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); } @@ -349,6 +331,19 @@ public class AgoraManager { */ private static IRtcEngineEventHandler getDefaultEventHandler() { return new IRtcEngineEventHandler() { + + @Override + public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapsed) { + super.onRemoteAudioStateChanged(uid, state, reason, elapsed); + LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed); + } + + @Override + public void onUserMuteAudio(int uid, boolean muted) { + super.onUserMuteAudio(uid, muted); + LogUtils.e("onUserMuteAudio", "uid------>" + uid, "muted------>" + muted); + } + @Override public void onJoinChannelSuccess(String channel, int uid, int elapsed) { @@ -710,7 +705,7 @@ public class AgoraManager { } } - public void joinChannelEx(String token, String channelId, int uid) { + public void joinChannelEx(String token, String channelId, int uid,String pkUserIds) { if (rtcEngine == null) { init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); } @@ -722,10 +717,12 @@ public class AgoraManager { options.autoSubscribeAudio = true; connection = new RtcConnection(); connection.channelId = channelId; - connection.localUid = uid; + connection.localUid = SpUtil.getUserId(); pkRoomId = channelId; - rtcEngine.joinChannelEx(token, connection, options, getDefaultEventHandler()); - + pkUserId = Integer.parseInt(pkUserIds); +// rtcEngine.joinChannelEx(token, connection, options, getDefaultEventHandler()); +// muteAllRemoteAudioStreamsEx(true); +// muteAllRemoteAudioStreamsExUserId(false); } } @@ -735,7 +732,7 @@ public class AgoraManager { RtcConnection connection = new RtcConnection(); connection.channelId = mRoomId; connection.localUid = uid; - rtcEngine.leaveChannelEx(connection); +// rtcEngine.leaveChannelEx(connection); } } @@ -894,7 +891,7 @@ public class AgoraManager { } } } - + //关闭对方的所有推流 public void muteAllRemoteAudioStreamsEx(boolean enabled) { if (rtcEngine == null) { init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); @@ -906,7 +903,13 @@ public class AgoraManager { connection = new RtcConnection(); connection.channelId = pkRoomId; } - rtcEngine.muteAllRemoteAudioStreamsEx(enabled, connection); +// rtcEngine.muteAllRemoteAudioStreamsEx(enabled, connection); + } + } + //打开对方支持的推流 + public void muteAllRemoteAudioStreamsExUserId(boolean enabled){ + if (rtcEngine != null){ +// rtcEngine.muteRemoteAudioStreamEx(pkUserId,enabled,connection); } } @@ -924,17 +927,13 @@ public class AgoraManager { * 启用或者关闭远端音频流 * * @param enabled - * @param uid */ - public void muteLocalAudioStreamEx(boolean enabled, int uid) { -// RtcConnection connection = new RtcConnection(); -// connection.channelId = mRoomId; -// connection.localUid = uid; + public void muteLocalAudioStreamEx(boolean enabled) { if (rtcEngine == null) { init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); } // 正确做法 - rtcEngine.muteLocalAudioStreamEx(enabled, connection); +// rtcEngine.muteLocalAudioStreamEx(enabled, connection); } /** diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java new file mode 100644 index 00000000..d76c14ef --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java @@ -0,0 +1,354 @@ +package com.xscm.moduleutil.rtc; + +import android.content.Context; +import android.util.Log; +import android.view.SurfaceView; +import com.blankj.utilcode.util.LogUtils; +import com.blankj.utilcode.util.ThreadUtils; +import com.xscm.moduleutil.base.CommonAppContext; +import com.xscm.moduleutil.event.CabinEvent; +import com.xscm.moduleutil.event.ColoseCardEvent; +import com.xscm.moduleutil.event.SurfaceEvent; +import com.xscm.moduleutil.interfaces.SoundLevelUpdateListener; +import com.xscm.moduleutil.utils.SpUtil; +import io.agora.musiccontentcenter.*; +import io.agora.rtc2.*; +import io.agora.rtc2.video.VideoCanvas; +import org.greenrobot.eventbus.EventBus; + +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +/** + * com.xscm.moduleutil.rtc + * qx + * 2025/10/29 + */ +public class AgoraManagerEx { + + private static volatile AgoraManagerEx instance; + private static RtcEngineEx rtcEngineEx; + // private RtcEngineEx rtcEngineEx; + private static Context context; + private boolean isLocalAudioEnabled = true; // 默认开启麦克风 + // private final List eventHandlers = new ArrayList<>(); + private static IAgoraMusicContentCenter musicContentCenter; + private static IAgoraMusicPlayer musicPlayer; + private static MusicContentCenterConfiguration contentCenterConfiguration; + private static String mRoomId = ""; + private static long mSongCode; + + private static List musicList; + private static boolean isBjMusic = false; + private static List soundLevelUpdateListeners = new CopyOnWriteArrayList<>(); + private static ChannelMediaOptions options; + private static RtcConnection connection; + private String pkRoomId = ""; + private static String lastRoomId; + + public int pkUserId; + + public int getPkUserId() { + return pkUserId; + } + + public void setPkUserId(int pkUserId) { + this.pkUserId = pkUserId; + } + private static boolean isOnJoin = false; + public void setLastRoomId(String value) { + lastRoomId = value; + } + + public String getLastRoomId() { + LogUtils.e("上次的房间id:" + lastRoomId); + return lastRoomId; + } + + private AgoraManagerEx() { + + } + + public static AgoraManagerEx getInstance(Context con) { + if (instance == null) { + synchronized (AgoraManagerEx.class) { + if (instance == null) { + instance = new AgoraManagerEx(); + context = con.getApplicationContext(); // 使用ApplicationContext避免内存泄漏 + } + } + } + // 确保引擎已初始化 + if (rtcEngineEx == null) { + synchronized (AgoraManagerEx.class) { + if (rtcEngineEx == null) { + init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); + } + + } + } + return instance; + } + + public static void init(String appId) { + if (rtcEngineEx != null) { + return; + }; + + synchronized (AgoraManager.class) { + if (rtcEngineEx != null) { + return; + } + rtcEngineEx =AgoraManager.getInstance( context).rtcEngine; + +// try { +// RtcEngineConfig config = new RtcEngineConfig(); +// config.mContext = context; +// config.mAppId = appId; +// config.mEventHandler = getDefaultEventHandler(); +// config.mChannelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING; +// config.mAudioScenario = Constants.AUDIO_SCENARIO_CHORUS; +// config.mAreaCode = 1; +// +// rtcEngineEx = (RtcEngineEx) RtcEngineEx.create(config); +// } catch (Exception e) { +// Log.e("AgoraManager", "Failed to create RtcEngine", e); +// return; +// } +// +// if (rtcEngineEx != null) { +// try { +// rtcEngineEx.setAudioProfile(Constants.AUDIO_PROFILE_MUSIC_HIGH_QUALITY_STEREO, +// Constants.AUDIO_SCENARIO_GAME_STREAMING); +// rtcEngineEx.enableAudioVolumeIndication(200, 3, true); +// rtcEngineEx.setClientRole(Constants.CLIENT_ROLE_BROADCASTER); +// rtcEngineEx.muteLocalAudioStream(true); // 默认静音 +// rtcEngineEx.muteAllRemoteAudioStreams(false); // 监听远端的音频 +// +// // 设置参数时添加异常处理 +// try { +// rtcEngineEx.setParameters("{\"che.audio.custom_payload_type\":73}"); +// rtcEngineEx.setParameters("{\"che.audio.custom_bitrate\":128000}"); +// rtcEngineEx.setParameters("{\"rtc.enable_nasa2\": true}"); +// rtcEngineEx.setParameters("{\"rtc.use_audio4\": true}"); +// rtcEngineEx.setParameters("{" + +// "\"rtc.report_app_scenario\":" + +// "{" + +// "\"appScenario\":" + 100 + "," + +// "\"serviceType\":" + 11 + "," + +// "\"appVersion\":\"" + rtcEngineEx.getSdkVersion() + "\"" + +// "}" + +// "}"); +// rtcEngineEx.setParameters("{\"che.video.mobile_1080p\":true}"); +// } catch (Exception e) { +// Log.w("AgoraManager", "Failed to set parameters", e); +// } +// /*Enable video module*/ +// rtcEngineEx.enableVideo(); +// /*Set up to play remote sound with receiver*/ +// rtcEngineEx.setDefaultAudioRoutetoSpeakerphone(true); +// +// } catch (Exception e) { +// Log.e("AgoraManager", "Failed to configure rtcEngineEx", e); +// } +// } + } + } + + private static IRtcEngineEventHandler getDefaultEventHandler() { + return new IRtcEngineEventHandler() { + + @Override + public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapsed) { + super.onRemoteAudioStateChanged(uid, state, reason, elapsed); + LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed); + } + + @Override + public void onUserMuteAudio(int uid, boolean muted) { + super.onUserMuteAudio(uid, muted); + LogUtils.e("onUserMuteAudio", "uid------>" + uid, "muted------>" + muted); + } + + @Override + public void onJoinChannelSuccess(String channel, int uid, int elapsed) { + LogUtils.e("onJoinChannelSuccess", "channel------>" + channel, "uid------>" + uid, "elapsed------>" + elapsed); + if (!isOnJoin) { + AgoraIsOPen isOPen = new AgoraIsOPen(); + isOPen.setOpen(true); + EventBus.getDefault().post(isOPen); + isOnJoin = true; + } + + } + + @Override + public void onUserJoined(int uid, int elapsed) {//远端用户加入频道 + + for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) { + if (listener != null) { + ThreadUtils.runOnUiThread(() -> { + // 远程用户音量变化 + listener.userJoined(uid, elapsed); +// } + }); + } + } + + } + + @Override + public void onUserOffline(int uid, int reason) {//远端用户离开频道 + for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) { + if (listener != null) { + ThreadUtils.runOnUiThread(() -> { + // 远程用户音量变化 + listener.userOffline(uid, reason); +// } + }); + } +// } + } + } + + @Override + public void onAudioVolumeIndication(AudioVolumeInfo[] speakers, int totalVolume) { + super.onAudioVolumeIndication(speakers, totalVolume); + + if (speakers == null || speakers.length == 0) return; + + for (final AudioVolumeInfo info : speakers) { + final int uid = info.uid; + final int volume = info.volume; + + // 回调所有监听器 + for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) { + if (listener != null) { + ThreadUtils.runOnUiThread(() -> { + // 远程用户音量变化 + listener.onRemoteSoundLevelUpdate(uid > 0 ? String.valueOf(uid) : SpUtil.getUserId() + "", volume); +// } + }); + } + } + } + } + + @Override + public void onLocalVideoStateChanged(Constants.VideoSourceType source, int state, int reason) { + super.onLocalVideoStateChanged(source, state, reason); + if (state == Constants.LOCAL_VIDEO_STREAM_STATE_CAPTURING && source.getValue() == Constants.VIDEO_SOURCE_SCREEN_PRIMARY) { + options.publishScreenCaptureAudio = true; + options.publishScreenCaptureVideo = true; + options.publishCameraTrack = false; + rtcEngineEx.updateChannelMediaOptions(options); + } + } + + @Override + public void onFirstRemoteAudioFrame(int uid, int elapsed) { + super.onFirstRemoteAudioFrame(uid, elapsed); + Log.i("RoomCabinFragment", "onFirstRemoteAudioFrame: uid->" + uid); + + + } + // 可继续扩展其他回调... + + + @Override + public void onFirstRemoteVideoFrame(int uid, int width, int height, int elapsed) { + super.onFirstRemoteVideoFrame(uid, width, height, elapsed); + SurfaceView renderView = new SurfaceView(context); + SurfaceEvent surfaceEvent = new SurfaceEvent(); + surfaceEvent.setSurfaceView(renderView); + surfaceEvent.setType(2); + rtcEngineEx.setupRemoteVideo(new VideoCanvas(renderView, Constants.RENDER_MODE_FIT, uid)); + EventBus.getDefault().post(surfaceEvent); + } + + @Override + public void onRemoteVideoStateChanged(int uid, int state, int reason, int elapsed) { + super.onRemoteVideoStateChanged(uid, state, reason, elapsed); + Log.i("RoomCabinFragment", "onRemoteVideoStateChanged:uid->" + uid + ", state->" + state); + if (state == Constants.REMOTE_AUDIO_STATE_STOPPED) { + ColoseCardEvent renderView = new ColoseCardEvent(); + EventBus.getDefault().post(renderView); + } else if (state == Constants.REMOTE_AUDIO_STATE_STARTING) { + + SurfaceView renderView = new SurfaceView(context); + rtcEngineEx.setupRemoteVideo(new VideoCanvas(renderView, Constants.RENDER_MODE_FIT, uid)); + SurfaceEvent surfaceEvent = new SurfaceEvent(); + surfaceEvent.setSurfaceView(renderView); + surfaceEvent.setType(2); + EventBus.getDefault().post(surfaceEvent); + } + } + + @Override + public void onError(int err) { + super.onError(err); + } + }; + } + public void joinChannelEx(String token, String channelId, String pkUserIds) { +// if (rtcEngineEx == null) { +// init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); +// }00602f7339ec98947deaeab173599891932IAAe1VwQOurJj57ZCxEJ3SO8VCK6MPKfAjdo5v/oOHPd5BTK+bCVBxwwIgDobHEAn5cDaQQAAQCflwNpAwCflwNpAgCflwNpBACflwNp + if (rtcEngineEx != null) { + options = new ChannelMediaOptions(); + options.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER; + options.channelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING; + options.publishMicrophoneTrack = true; // 是否发布麦克风音频 + options.enableAudioRecordingOrPlayout = true; + options.autoSubscribeAudio = true; + connection = new RtcConnection(); + connection.channelId = channelId; + connection.localUid = SpUtil.getUserId(); + pkRoomId = channelId; + pkUserId = Integer.parseInt(pkUserIds); + rtcEngineEx.joinChannelEx(token, connection, options, getDefaultEventHandler()); + muteAllRemoteAudioStreamsEx(true); + muteAllRemoteAudioStreamsExUserId(false); + + } + } + + public void muteAllRemoteAudioStreamsEx(boolean enabled) { + if (rtcEngineEx == null) { + init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); + } + if (rtcEngineEx != null) { +// RtcConnection connection = new RtcConnection(); +// connection.channelId = mRoomId; +// if (connection == null) { +// connection = new RtcConnection(); +// connection.channelId = pkRoomId; +// } + rtcEngineEx.muteAllRemoteAudioStreamsEx(enabled, connection); + } + } + + public void muteLocalAudioStreamEx(boolean enabled) { + if (rtcEngineEx == null) { + init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId()); + } + // 正确做法 + rtcEngineEx.muteLocalAudioStreamEx(enabled, connection); + } + + public void muteAllRemoteAudioStreamsExUserId(boolean enabled){ + if (rtcEngineEx != null){ + rtcEngineEx.muteRemoteAudioStreamEx(pkUserId,enabled,connection); + } + } + + public void leaveChannelEx(String mRoomId, int uid) { + if (rtcEngineEx != null) { + RtcConnection connection = new RtcConnection(); + connection.channelId = mRoomId; + connection.localUid = uid; + rtcEngineEx.leaveChannelEx(connection); + } + } +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java index e0884499..4c9b8a1b 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java @@ -16,7 +16,7 @@ public enum EnvironmentEnum { "tcp://81.70.45.221", "https://vespa.qxyushen.top/h5"), TEST(//测试环境 - "http://tmd.xscmmidi.site/", + "https://test.vespa.qxyushen.top/", "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=", "https://oss-cn-beijing.aliyuncs.com/", "LTAI5tKgrfcFQxH46ZwWYgFW", diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java index 3c0b178a..30886b4c 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java @@ -133,8 +133,28 @@ public class RoomDefaultWheatView extends BaseWheatView { } // setCardiac(pitBean.getPit_number(), 0.0f); - } + updatePkState(bean); + } + private void updatePkState(RoomPitBean bean) { + if (bean.is_pk()) { + String userId = bean.getUser_id(); + if (userId != null && !userId.equals("0") && !userId.isEmpty()) { + tv_time_pk.setVisibility(VISIBLE); + setSex(bean.getCharm(), false); + mCharmView.setVisibility(GONE); + } else { + tv_time_pk.setVisibility(GONE); + } + } else { + tv_time_pk.setVisibility(GONE); + if (isOn()) { + mCharmView.setVisibility(VISIBLE); + }else { + mCharmView.setVisibility(GONE); + } + } + } public void setSex(String value, boolean format) { if (format) { tv_time_pk.setText(value); @@ -153,6 +173,10 @@ public class RoomDefaultWheatView extends BaseWheatView { } } + public void setTv_time_pk(boolean show){ + tv_time_pk.setVisibility(show?VISIBLE:GONE); + } + private boolean showSexIcon = false; private String sex; diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java index 28a36109..86c8a582 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java @@ -9,6 +9,7 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; import com.xscm.moduleutil.R; +import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomPitBean; @@ -170,6 +171,9 @@ public class WheatLayoutManager { private void addWheatViewItem(LinearLayout row, int pitNumber, int itemWidth, int layoutType) { RoomDefaultWheatView wheatView = createWheatView(pitNumber); + if (layoutType==2){ + wheatView.setTv_time_pk(false); + } LinearLayout.LayoutParams params; if (pitNumber == 9 || pitNumber == 10) { @@ -226,25 +230,65 @@ public class WheatLayoutManager { DisplayMetrics metrics = context.getResources().getDisplayMetrics(); return metrics.widthPixels; } + public void setUpData(RoomMessageEvent event,int layoutType){ + String fromPit=event.getText().getFrom_pit_number()!=null?event.getText().getFrom_pit_number():""; + String toPitNumber=event.getText().getTo_pit_number()!=null?event.getText().getTo_pit_number():""; + if (fromPit.equals("") || toPitNumber.equals("")){ + return; + } + RoomDefaultWheatView fromWheatView = findWheatViewByPitNumber(Integer.parseInt(fromPit)); + RoomDefaultWheatView toWheatView = findWheatViewByPitNumber(Integer.parseInt(toPitNumber)); + RoomPitBean fromPitBean=fromWheatView.pitBean; + RoomPitBean toPitBean=toWheatView.pitBean; + String tmpNumber=fromPitBean.getPit_number(); + fromPitBean.setPit_number(toPitBean.getPit_number()); + toPitBean.setPit_number(tmpNumber); - public void updateSingleWheat(RoomPitBean pitBean, int pitNumber) { - if (pitList == null || pitList.isEmpty() || pitNumber < 1 || pitNumber > 10) return; - if (isSingleMode && this.currentSinglePit != pitNumber) return; + toWheatView.setData(fromPitBean); + fromWheatView.setData(toPitBean); - RoomDefaultWheatView wheatView = findWheatViewByPitNumber(pitNumber); - if (wheatView != null) { - wheatView.setData(pitBean); + if (layoutType==2){ + fromWheatView.setTv_time_pk(false); + toWheatView.setTv_time_pk(false); + }else if (layoutType==1){ + fromWheatView.setTv_time_pk(true); + toWheatView.setTv_time_pk(true); } } - public void updateSingleCharm(RoomPitBean pitBean, int pitNumber) { + public void updateSingleWheat(RoomPitBean pitBean, int pitNumber,int layoutType) { if (pitList == null || pitList.isEmpty() || pitNumber < 1 || pitNumber > 10) return; if (isSingleMode && this.currentSinglePit != pitNumber) return; RoomDefaultWheatView wheatView = findWheatViewByPitNumber(pitNumber); if (wheatView != null) { - wheatView.setCharm(pitBean.getCharm()); + pitBean.set_pk(true); + wheatView.setData(pitBean); + if (layoutType==2){ + wheatView.setTv_time_pk(false); + }else if (layoutType==1){ + wheatView.setTv_time_pk(true); + } + + } + } + + public void updateSingleCharm(RoomPitBean pitBean, int pitNumber,int layoutType) { + if (pitList == null || pitList.isEmpty() || pitNumber < 1 || pitNumber > 10) return; + if (isSingleMode && this.currentSinglePit != pitNumber) return; + + RoomDefaultWheatView wheatView = findWheatViewByPitNumber(pitNumber); + if (wheatView != null) { + RoomPitBean bean=wheatView.pitBean; + bean=pitBean ; + + if (layoutType==2){ + wheatView.setTv_time_pk(false); + }else if (layoutType==1){ + wheatView.setTv_time_pk(true); + } + wheatView.setSex(bean.getCharm(),true); } } @@ -276,7 +320,7 @@ public class WheatLayoutManager { public void refreshWheatData(List newPitList, List changedPits) { this.pitList = newPitList; for (int pitNumber : changedPits) { - updateSingleWheat(pitList.get(pitNumber - 1), pitNumber); + updateSingleWheat(pitList.get(pitNumber - 1), pitNumber,1); } } diff --git a/moduleUtil/src/main/res/layout/room_view_default_wheat.xml b/moduleUtil/src/main/res/layout/room_view_default_wheat.xml index cc9a6211..f33151ff 100644 --- a/moduleUtil/src/main/res/layout/room_view_default_wheat.xml +++ b/moduleUtil/src/main/res/layout/room_view_default_wheat.xml @@ -135,16 +135,16 @@ android:id="@+id/iv_frame" android:layout_width="0dp" android:layout_height="0dp" + android:layout_marginStart="@dimen/dp_12" + android:layout_marginTop="@dimen/dp_12" + android:layout_marginEnd="@dimen/dp_12" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:visibility="gone" - tools:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHeight_percent="0.98" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_percent="0.98" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintHeight_percent="0.5" /> diff --git a/moduleroom/src/main/AndroidManifest.xml b/moduleroom/src/main/AndroidManifest.xml index f22d5030..c3f74cf5 100644 --- a/moduleroom/src/main/AndroidManifest.xml +++ b/moduleroom/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ (), var roomId: String? = null var mRoomInfoResp: RoomInfoResp? = null + @JvmField @Autowired var taskId: String? = null @@ -183,21 +185,6 @@ class RoomActivity : BaseMvpActivity(), taskId = intent.getStringExtra("taskId") } - - private fun resumeRoomFromMinimize() { - // 从最小化状态恢复房间 - isMinimized = false - clearMinimizeState() - - // 恢复房间状态 - resumeRoomState() - - // 确保UI正确显示 - if (mBinding != null) { - // 恢复UI状态 - } - } - private var bgEffectView: View? = null private fun setupEffectView() { @@ -499,6 +486,10 @@ class RoomActivity : BaseMvpActivity(), Log.d("TAG", "=== onDestroy called ==="); } + override fun onNewIntent(intent: Intent?) { + super.onNewIntent(intent) + } + override fun onCreate(savedInstanceState: Bundle?) { // 在super.onCreate之前设置主题以避免闪白屏 setTheme(com.xscm.moduleutil.R.style.BaseAppTheme) // 设置你的主主题 @@ -526,7 +517,7 @@ class RoomActivity : BaseMvpActivity(), // .beginTransaction() // .replace(R.id.vp_room_pager, roomFragment!!) // .commitAllowingStateLoss() - // 使用新的 OnBackPressedDispatcher API 来处理返回事件 + // 使用新的 API 来处理返回事件 if (onBackPressedDispatcher != null) { onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { @@ -613,7 +604,7 @@ class RoomActivity : BaseMvpActivity(), this.mRoomBean = roomBean this.mRoomUserBean = resp.user_info this.mRoomOwnerBean = resp.room_owner - this.mPitList = mRoomBean!!.pit_list + this.mPitList = mRoomBean?.pit_list ?: ArrayList() this.roomId = roomBean.room_id MessageListenerSingleton.getInstance().joinGroup(roomId) //加入房间im ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar) @@ -632,16 +623,7 @@ class RoomActivity : BaseMvpActivity(), number = roomBean.online_number mBinding!!.roomTop.tvNum.text = number.toString() + "" - val userIds = StringBuilder() - for (i in mRoomInfoResp!!.room_info.pit_list.indices) { - val userId = mRoomInfoResp!!.room_info.pit_list[i].user_id - if (userId != null && userId != "0" && !userId.isEmpty()) { - if (userIds.length > 0) { - userIds.append(",") - } - userIds.append(userId) - } - } + setviewyc(true) initPublicScreenFragment() // 确保Fragment已完全初始化后再调用getUpRoomInfo if (publicScreenFragment != null && publicScreenFragment!!.isAdded && publicScreenFragment!!.view != null) { @@ -654,7 +636,18 @@ class RoomActivity : BaseMvpActivity(), Log.e("Fragment", "Fragment transaction skipped due to state loss.") } LogUtils.e("加入", roomId) - + val userIds = StringBuilder() + if (mRoomInfoResp?.room_info?.pit_list != null) { + for (i in mRoomInfoResp?.room_info?.pit_list!!.indices) { + val userId = mRoomInfoResp!!.room_info.pit_list[i].user_id + if (userId != null && userId != "0" && !userId.isEmpty()) { + if (userIds.length > 0) { + userIds.append(",") + } + userIds.append(userId) + } + } + } CommonAppContext.getInstance().isPlaying = true CommonAppContext.getInstance().playId = roomId CommonAppContext.getInstance().playName = mRoomBean!!.room_name @@ -1315,6 +1308,12 @@ class RoomActivity : BaseMvpActivity(), ) } + mBinding!!.roomTop.muZc.setOnClickListener { view: View -> + this.onClick( + view + ) + } + // SpUtil.saveMyRoomId(roomId); // MvpPre.getRoomIn(roomId, password); // MvpPre.getRoomOnline(roomId, "1", "10"); @@ -1438,7 +1437,7 @@ class RoomActivity : BaseMvpActivity(), } else if (msgType == 1001) { handleMsgType1001() } else if (msgType == 1002) { - handleMsgType1002() + handleMsgType1002(messageEvent, text) } else if (msgType == 1029) { handleMsgType1029(messageEvent, text) } else if (msgType == 1021) { @@ -1467,7 +1466,7 @@ class RoomActivity : BaseMvpActivity(), setRoleType(3, -11) } } else if (msgType == 125) { - handleMsgType125(messageEvent, text) + handleMsgType125(messageEvent, text.text) } else if (msgType == 1006) { handleMsgType1006() } else if (msgType == 1007) { @@ -1586,7 +1585,8 @@ class RoomActivity : BaseMvpActivity(), } xlhDjs(xlhBean.end_time) } else if (xlhBean.from_type == 104) { - + mBinding?.xlhRk?.visibility = View.GONE + releaseCountDownTimer1() } } @@ -1910,13 +1910,13 @@ class RoomActivity : BaseMvpActivity(), for (roomPitBean in mRoomInfoResp!!.song_pit_list) { AgoraManager.getInstance(this@RoomActivity).ClientRole(false) ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding) - mBinding!!.rlMic.visibility = View.GONE + mBinding?.rlMic?.visibility = View.GONE } if (mRoomInfoResp!!.song_user_info != null && mRoomInfoResp!!.song_user_info.user_id != null) { if (mRoomInfoResp!!.song_user_info.user_id == SpUtil.getUserId().toString() + "") { AgoraManager.getInstance(this@RoomActivity).ClientRole(false) ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding) - mBinding!!.rlMic.visibility = View.GONE + mBinding?.rlMic?.visibility = View.GONE } } } @@ -1987,6 +1987,21 @@ class RoomActivity : BaseMvpActivity(), } else if ("3" == typeId || "4" == typeId || "1" == typeId || "8" == typeId) { val labelId = mRoomInfoResp!!.room_info.label_id if ("2" == labelId) { +// val pitBean = RoomPitBean() +// pitBean.pit_number = messageEvent.text.pit_number +// pitBean.user_id = messageEvent.text.fromUserInfo.user_id.toString() + "" +// pitBean.avatar = messageEvent.text.fromUserInfo.avatar +// pitBean.nickname = messageEvent.text.fromUserInfo.nickname +// pitBean.sex = messageEvent.text.fromUserInfo.sex.toString() + "" +// pitBean.charm = messageEvent.text.fromUserInfo.charm +// pitBean.dress = messageEvent.text.fromUserInfo.dress +// +// if (pitBean.pit_number == "9") { +// val roomDefaultWheatView: RoomKtvWheatView = mBinding?.roomTop!!.muZc +// roomDefaultWheatView.setData(pitBean) +// } + + roomFragment!!.KtvFragmentEvent(messageEvent) } else if ("1" == labelId) { mRoomInfoResp!!.room_info.pit_list.set(pitNumber.toInt() - 1, getPitBean(messageEvent)) @@ -2064,6 +2079,17 @@ class RoomActivity : BaseMvpActivity(), } else if ("3" == typeId || "4" == typeId || "1" == typeId || "8" == typeId) { val labelId = mRoomInfoResp!!.room_info.label_id if ("2" == labelId) { +// val pitBean = RoomPitBean() +// pitBean.pit_number = messageEvent.text.pit_number +// pitBean.user_id = "" +// pitBean.avatar = "" +// pitBean.nickname = "" +// pitBean.sex = "" +// pitBean.charm = "" +// if (pitBean.pit_number == "9") { +// val roomDefaultWheatView: RoomKtvWheatView = mBinding?.roomTop!!.muZc +// roomDefaultWheatView.setData(pitBean) +// } roomFragment!!.KtvFragmentEvent(messageEvent) } else if ("1" == labelId) { mRoomInfoResp!!.room_info.pit_list.set(pitNumber.toInt() - 1, getPitBean2(messageEvent, pitNumber)) @@ -2153,6 +2179,9 @@ class RoomActivity : BaseMvpActivity(), if (text.fromUserInfo.user_id == SpUtil.getUserId()) { LogUtils.e("退出房间") MvpPre!!.quitRoom(roomId, SpUtil.getUserId().toString() + "") + MessageListenerSingleton.quitGroup(roomId); + quit(); + performExitRoom(1); } } @@ -2161,12 +2190,18 @@ class RoomActivity : BaseMvpActivity(), mBinding!!.roomTop.tvNum.text = number.toString() + "" } - private fun handleMsgType1002() { + private fun handleMsgType1002(messageEvent: RoomMessageEvent, text: T?) { number-- if (number < 0) { number = 0 } mBinding!!.roomTop.tvNum.text = number.toString() + "" + if (text == null || text.fromUserInfo == null) return + if (text.fromUserInfo.user_id == SpUtil.getUserId()) { + MessageListenerSingleton.quitGroup(roomId); + quit(); + performExitRoom(1); + } } private fun handleMsgType1029(messageEvent: RoomMessageEvent, text: T?) { @@ -2369,23 +2404,19 @@ class RoomActivity : BaseMvpActivity(), return mRoomInfoResp } - private fun handleMsgType125(messageEvent: RoomMessageEvent, text: T?) { + private fun handleMsgType125(messageEvent: RoomMessageEvent, text: String) { if (text == null) return try { - val parsedText = GsonUtils.fromJson( - text.text, - text::class.java - ) + val parsedText: RoomMessageEvent.text = GsonUtils.fromJson(text, RoomMessageEvent.text::class.java) if (parsedText.is_mute == 1) { - AgoraManager.getInstance(this).ClientRole(false) - AgoraManager.getInstance(this).muteLocalAudioStreamEx(false, SpUtil.getUserId()) + AgoraManagerEx.getInstance(this).muteLocalAudioStreamEx(true) } else { - AgoraManager.getInstance(this).ClientRole(true) - AgoraManager.getInstance(this).muteLocalAudioStreamEx(true, SpUtil.getUserId()) + AgoraManagerEx.getInstance(this).muteLocalAudioStreamEx(false) } } catch (e: Exception) { // Handle exception + LogUtils.e("handleMsgType125: " + e.message) } } @@ -2775,6 +2806,54 @@ class RoomActivity : BaseMvpActivity(), aBoolean = true } } + } else if (id == R.id.mu_zc) { + val muZc: RoomKtvWheatView = mBinding!!.roomTop.muZc + if (muZc.getUserId() != "") { + RoomUserInfoFragment.show( + roomId, + muZc.getUserId(), + muZc.pitNumber, + getHostUser(), + false, + 2, + isNumberWhether(), + supportFragmentManager + ) + } else { + MvpPre!!.applyPit(roomId, "9") + } + } + } + + private fun isNumberWhether(): Int { + if (mRoomInfoResp!!.getUser_info().getPit_number() == 9) { + return 1 + } + return 0 + } + + private fun getHostUser(): Int { + if (mRoomInfoResp?.getUser_info()?.getPit_number() == 9) { + return if (mRoomInfoResp?.getUser_info()?.getIs_room_owner() == 1) { + 1 + } else if (mRoomInfoResp?.getUser_info()?.getIs_management() == 1) { + 2 + } else if (mRoomInfoResp?.getUser_info()?.getIs_host() == 1) { + 3 + } else { + 4 + } + } else { + if (mRoomInfoResp?.getUser_info()?.getIs_room_owner() == 1) { + return 1 + } + if (mRoomInfoResp?.getUser_info()?.getIs_management() == 1) { + return 2 + } + if (mRoomInfoResp?.getUser_info()?.getIs_host() == 1) { + return 3 + } + return 4 } } @@ -2873,33 +2952,17 @@ class RoomActivity : BaseMvpActivity(), appStateListener!!.isAppInBackground = true } QXGiftPlayerManager.getInstance(applicationContext).destroyEffectSvga() - ARouter.getInstance() - .build(ARouteConstants.ME) - .navigation() - // ARouter.getInstance().build(ARouteConstants.ME) -// .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TOP) -// .navigation(); - // 使用Intent启动主Activity，通过ARouter路径 - // 这样可以避免模块间的直接依赖 -// try { -// val intent = Intent() -// intent.setClassName(packageName, "com.xscm.modulemain.activity.MainActivity") -// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) -// startActivity(intent) -// } catch (e: Exception) { -// // 如果直接指定类名失败，则使用默认的Launcher Activity -// val startMain = Intent(Intent.ACTION_MAIN) -// startMain.addCategory(Intent.CATEGORY_HOME) -// startMain.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) -// startActivity(startMain) -// } - - // 隐藏Activity而不是销毁它 -// moveTaskToBack(true); - // 使用 moveTaskToBack 将应用最小化 -// moveTaskToBack(true); + if (ActivityUtils.getActivityList().size <= 0) { + ARouter.getInstance() + .build(ARouteConstants.ME) + .navigation() + } else { + val intent = Intent(this, ActivityUtils.getActivityList()[1]::class.java) + intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT + startActivity(intent) + } } private fun saveMinimizeState() { @@ -3014,12 +3077,12 @@ class RoomActivity : BaseMvpActivity(), } fun setrlMic(voive: Boolean) { - mBinding!!.rlMic.visibility = + mBinding?.rlMic?.visibility = if (voive) View.VISIBLE else View.GONE } fun rlMore(voive: Boolean) { - mBinding!!.rlMore.visibility = if (voive) View.GONE else View.GONE + mBinding!!.rlMore.visibility = if (voive) View.VISIBLE else View.GONE } fun ivMic(inIvMic: Int) { @@ -3027,16 +3090,16 @@ class RoomActivity : BaseMvpActivity(), } fun setRoleType(roleType: Int, pit_number: Int) { - val rl_voice = mBinding!!.rlVoive // 注意：原拼写错误已修正 - val rl_mic = mBinding!!.rlMic - val rl_more = mBinding!!.rlMore - val rl_misc = mBinding!!.rlMisc + val rl_voice = mBinding?.rlVoive // 注意：原拼写错误已修正 喇叭 + val rl_mic = mBinding?.rlMic//麦克风 + val rl_more = mBinding?.rlMore //PK + val rl_misc = mBinding?.rlMisc //音乐 // 默认隐藏所有按钮 - rl_voice.visibility = View.GONE - rl_more.visibility = View.GONE - rl_misc.visibility = View.GONE - rl_mic.visibility = View.GONE + rl_voice?.visibility = View.GONE + rl_more?.visibility = View.GONE + rl_misc?.visibility = View.GONE + rl_mic?.visibility = View.GONE // 空指针保护 if (mRoomInfoResp == null || mRoomInfoResp!!.room_info == null || mRoomInfoResp!!.user_info == null) { @@ -3049,70 +3112,80 @@ class RoomActivity : BaseMvpActivity(), // 特殊房间类型处理（优先级最高） if ("6" == typeId) { - mBinding!!.rlMessage.visibility = View.GONE + mBinding?.rlMessage?.visibility = View.GONE return // 全部隐藏，无需继续处理 + } else { + mBinding?.rlMessage?.visibility = View.VISIBLE } // 根据角色类型显示按钮 when (roleType) { 1, 2, 3 -> { - rl_voice.visibility = View.VISIBLE - rl_mic.visibility = + rl_voice?.visibility = View.VISIBLE + rl_mic?.visibility = if (pit_number != 0) View.VISIBLE else View.GONE - rl_more.visibility = - if (pit_number == 9) View.GONE else View.GONE - rl_misc.visibility = View.VISIBLE + rl_more?.visibility = + if (pit_number == 9) View.VISIBLE else View.GONE + rl_misc?.visibility = View.VISIBLE } 0 -> { - rl_voice.visibility = View.VISIBLE - rl_mic.visibility = + rl_voice?.visibility = View.VISIBLE + rl_mic?.visibility = if (pit_number != 0) View.VISIBLE else View.GONE - rl_misc.visibility = View.VISIBLE + rl_misc?.visibility = View.VISIBLE } 5 -> { - rl_voice.visibility = View.VISIBLE - rl_more.visibility = View.GONE - rl_misc.visibility = View.VISIBLE + rl_voice?.visibility = View.VISIBLE + rl_more?.visibility = View.GONE + rl_misc?.visibility = View.VISIBLE } else -> {} } if (roleType != 5) { - rl_misc.visibility = View.VISIBLE + rl_misc?.visibility = View.VISIBLE if (userPitNumber == 9) { - rl_more.visibility = View.GONE + rl_more?.visibility = View.VISIBLE } } // label_id 和 type_id 联合判断 - if (mutableListOf("1", "3", "4", "8").contains(typeId) && "2" == labelId) { - rl_more.visibility = View.GONE + if (mutableListOf("1").contains(typeId) && "1" == labelId) { + rl_more?.visibility = View.VISIBLE + rl_misc?.visibility = View.VISIBLE + }else{ + rl_more?.visibility = View.GONE + rl_misc?.visibility = View.GONE } // mic 显示逻辑 if (userPitNumber > 0) { - rl_mic.visibility = View.VISIBLE - switchMic(2) - } else { - if (pit_number == 888) { - rl_mic.visibility = View.VISIBLE - switchMic(2) - } else if (pit_number == -1) { - rl_mic.visibility = View.VISIBLE // 原代码此处缺少 View. 前缀，已补全 + rl_mic?.visibility = View.VISIBLE + if (CommonAppContext.getInstance().isMai) { switchMic(1) } else { - rl_mic.visibility = View.GONE + switchMic(2) + } + } else { + if (pit_number == 888) { + rl_mic?.visibility = View.VISIBLE + switchMic(2) + } else if (pit_number == -1) { + rl_mic?.visibility = View.VISIBLE // 原代码此处缺少 View. 前缀，已补全 + switchMic(1) + } else { + rl_mic?.visibility = View.GONE switchMic(2) } } if ("7" == typeId || "2" == typeId) { - rl_more.visibility = View.GONE - rl_misc.visibility = View.GONE + rl_more?.visibility = View.GONE + rl_misc?.visibility = View.GONE } } @@ -3309,121 +3382,123 @@ class RoomActivity : BaseMvpActivity(), // TODO: 2025/8/26 加入房间 override fun roomInfo(resp: RoomInfoResp) { AppStateManager.getInstance().roomInfo = resp - this.mRoomInfoResp = resp - val roomBean = resp.room_info - this.mRoomBean = roomBean - this.mRoomUserBean = resp.user_info - this.mRoomOwnerBean = resp.room_owner - this.mPitList = mRoomBean!!.pit_list - this.roomId = roomBean.room_id - MessageListenerSingleton.getInstance().joinGroup(roomId) //加入房间im - ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar) - mBinding!!.roomTop.name.text = roomBean.room_name - mBinding!!.roomTop.idVal.text = "ID:" + roomBean.room_number - if (mRoomUserBean?.getIs_room_owner() == 1) { - mBinding!!.roomTop.btnFollow.visibility = View.GONE - } else { - mBinding!!.roomTop.btnFollow.visibility = View.VISIBLE - if (resp.isCollect) { - mBinding!!.roomTop.btnFollow.background = - resources.getDrawable(com.xscm.moduleutil.R.mipmap.collected) - mBinding!!.roomTop.btnFollow.text = "" - } - } - number = roomBean.online_number - mBinding!!.roomTop.tvNum.text = number.toString() + "" + setview(resp) - val userIds = StringBuilder() - for (i in mRoomInfoResp!!.room_info.pit_list.indices) { - val userId = mRoomInfoResp!!.room_info.pit_list[i].user_id - if (userId != null && userId != "0" && !userId.isEmpty()) { - if (userIds.length > 0) { - userIds.append(",") - } - userIds.append(userId) - } - } - initPublicScreenFragment() - if (!isFinishing && !isDestroyed) { - resetFragment() - upHeight() - } else { - Log.e("Fragment", "Fragment transaction skipped due to state loss.") - } - LogUtils.e("加入", roomId) - - CommonAppContext.getInstance().isPlaying = true - CommonAppContext.getInstance().playId = roomId - CommonAppContext.getInstance().playName = mRoomBean!!.room_name - - CommonAppContext.getInstance().playCover = resp.room_info.room_cover - CommonAppContext.getInstance().showSelf = resp.is_show_self == 1 - - if (mRoomUserBean?.getIs_collect() == 1) { - mBinding!!.roomTop.btnFollow.background = - resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc) - mBinding!!.roomTop.btnFollow.text = "" - } else { - ThemeableDrawableUtils.setThemeableRoundedBackground( - mBinding!!.roomTop.btnFollow, - ColorManager.getInstance().primaryColorInt, - 53 - ) - mBinding!!.roomTop.btnFollow.setTextColor(ColorManager.getInstance().buttonColorInt) - mBinding!!.roomTop.btnFollow.text = "收藏" - // mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.collect)); - } - if ((roomBean.type_id == "3" || roomBean.type_id == "1" || roomBean.type_id == "4") && roomBean.label_id == "2") { - AgoraManager.getInstance(this).isBjMusic = false - } else { - AgoraManager.getInstance(this).isBjMusic = true - } - - AgoraManager.stopMuisc() - initializeAudio() - - - toutiao() - upRoomInfo(resp) - - - if (userIds.length > 0 && roomId != null) { -// MvpPre.userOnlineStatus(userIds.toString(), roomId); - } - if (publicScreenFragment != null) { - publicScreenFragment!!.getUpRoomInfo(resp) - } - instView() - - if (mRoomInfoResp!!.user_info.pit_number == 9 && mRoomInfoResp!!.user_info.user_id == SpUtil.getUserId() - .toString() + "" - ) { - mBinding!!.roomTop.rl.visibility = View.VISIBLE - ivSoundEffects(true) - } else { - mBinding!!.roomTop.rl.visibility = View.GONE - ivSoundEffects(false) - } - - if (resp.room_info.type_id == "7" || resp.room_info.type_id == "2") { - mBinding!!.rlMore.visibility = View.GONE - mBinding!!.rlMisc.visibility = View.GONE - } - setupEffectView() - - if (mRoomInfoResp!!.gift_cycle != null && mRoomInfoResp!!.gift_cycle.xlh_info != null && mRoomInfoResp!!.gift_cycle.xlh_info.xlh_status != null && mRoomInfoResp!!.gift_cycle.xlh_info.xlh_status == "1") { - mBinding?.xlhRk?.visibility = View.VISIBLE - xlhDjs(mRoomInfoResp!!.gift_cycle.xlh_info.end_time) - } else { - mBinding?.xlhRk?.visibility = View.INVISIBLE - releaseCountDownTimer1() - } - - if (mRoomInfoResp!!.hour_ranking_open == 1) { - mBinding!!.clXsb.visibility = View.VISIBLE - } else { - mBinding!!.clXsb.visibility = View.GONE - } +// this.mRoomInfoResp = resp +// val roomBean = resp.room_info +// this.mRoomBean = roomBean +// this.mRoomUserBean = resp.user_info +// this.mRoomOwnerBean = resp.room_owner +// this.mPitList = mRoomBean!!.pit_list +// this.roomId = roomBean.room_id +// MessageListenerSingleton.getInstance().joinGroup(roomId) //加入房间im +// ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar) +// mBinding!!.roomTop.name.text = roomBean.room_name +// mBinding!!.roomTop.idVal.text = "ID:" + roomBean.room_number +// if (mRoomUserBean?.getIs_room_owner() == 1) { +// mBinding!!.roomTop.btnFollow.visibility = View.GONE +// } else { +// mBinding!!.roomTop.btnFollow.visibility = View.VISIBLE +// if (resp.isCollect) { +// mBinding!!.roomTop.btnFollow.background = +// resources.getDrawable(com.xscm.moduleutil.R.mipmap.collected) +// mBinding!!.roomTop.btnFollow.text = "" +// } +// } +// number = roomBean.online_number +// mBinding!!.roomTop.tvNum.text = number.toString() + "" +// +// val userIds = StringBuilder() +// for (i in mRoomInfoResp!!.room_info.pit_list.indices) { +// val userId = mRoomInfoResp!!.room_info.pit_list[i].user_id +// if (userId != null && userId != "0" && !userId.isEmpty()) { +// if (userIds.length > 0) { +// userIds.append(",") +// } +// userIds.append(userId) +// } +// } +// initPublicScreenFragment() +// if (!isFinishing && !isDestroyed) { +// resetFragment() +// upHeight() +// } else { +// Log.e("Fragment", "Fragment transaction skipped due to state loss.") +// } +// LogUtils.e("加入", roomId) +// +// CommonAppContext.getInstance().isPlaying = true +// CommonAppContext.getInstance().playId = roomId +// CommonAppContext.getInstance().playName = mRoomBean!!.room_name +// +// CommonAppContext.getInstance().playCover = resp.room_info.room_cover +// CommonAppContext.getInstance().showSelf = resp.is_show_self == 1 +// +// if (mRoomUserBean?.getIs_collect() == 1) { +// mBinding!!.roomTop.btnFollow.background = +// resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc) +// mBinding!!.roomTop.btnFollow.text = "" +// } else { +// ThemeableDrawableUtils.setThemeableRoundedBackground( +// mBinding!!.roomTop.btnFollow, +// ColorManager.getInstance().primaryColorInt, +// 53 +// ) +// mBinding!!.roomTop.btnFollow.setTextColor(ColorManager.getInstance().buttonColorInt) +// mBinding!!.roomTop.btnFollow.text = "收藏" +// // mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.collect)); +// } +// if ((roomBean.type_id == "3" || roomBean.type_id == "1" || roomBean.type_id == "4") && roomBean.label_id == "2") { +// AgoraManager.getInstance(this).isBjMusic = false +// } else { +// AgoraManager.getInstance(this).isBjMusic = true +// } +// +// AgoraManager.stopMuisc() +// initializeAudio() +// +// +// toutiao() +// upRoomInfo(resp) +// +// +// if (userIds.length > 0 && roomId != null) { +//// MvpPre.userOnlineStatus(userIds.toString(), roomId); +// } +// if (publicScreenFragment != null) { +// publicScreenFragment!!.getUpRoomInfo(resp) +// } +// instView() +// +// if (mRoomInfoResp!!.user_info.pit_number == 9 && mRoomInfoResp!!.user_info.user_id == SpUtil.getUserId() +// .toString() + "" +// ) { +// mBinding!!.roomTop.rl.visibility = View.VISIBLE +// ivSoundEffects(true) +// } else { +// mBinding!!.roomTop.rl.visibility = View.GONE +// ivSoundEffects(false) +// } +// +// if (resp.room_info.type_id == "7" || resp.room_info.type_id == "2") { +// mBinding!!.rlMore.visibility = View.GONE +// mBinding!!.rlMisc.visibility = View.GONE +// } +// setupEffectView() +// +// if (mRoomInfoResp!!.gift_cycle != null && mRoomInfoResp!!.gift_cycle.xlh_info != null && mRoomInfoResp!!.gift_cycle.xlh_info.xlh_status != null && mRoomInfoResp!!.gift_cycle.xlh_info.xlh_status == "1") { +// mBinding?.xlhRk?.visibility = View.VISIBLE +// xlhDjs(mRoomInfoResp!!.gift_cycle.xlh_info.end_time) +// } else { +// mBinding?.xlhRk?.visibility = View.INVISIBLE +// releaseCountDownTimer1() +// } +// +// if (mRoomInfoResp!!.hour_ranking_open == 1) { +// mBinding!!.clXsb.visibility = View.VISIBLE +// } else { +// mBinding!!.clXsb.visibility = View.GONE +// } } protected fun tzblChanged() { @@ -3476,7 +3551,7 @@ class RoomActivity : BaseMvpActivity(), } // } if (mRoomInfoResp!!.user_info.user_id == SpUtil.getUserId() - .toString() + "" && mRoomInfoResp!!.user_info.pit_number == 9 && mRoomInfoResp!!.room_info.type_id != "2" && mRoomInfoResp!!.room_info.type_id != "6" + .toString() + "" && mRoomInfoResp!!.user_info.pit_number == 9 && mRoomInfoResp!!.room_info.type_id == "1" && mRoomInfoResp!!.room_info.label_id != "1" ) { rlMore(true) } else { @@ -3527,7 +3602,12 @@ class RoomActivity : BaseMvpActivity(), mBinding!!.ivQuanC.setOnClickListener { v: View? -> if (mRoomInfoResp!!.room_info.head_line.room_id != null && mRoomInfoResp!!.room_info.head_line.room_id.isNotEmpty()) { if (mRoomInfoResp!!.room_info.head_line.room_id != roomId) { - RoomManager.getInstance().fetchRoomDataAndEnter(applicationContext, mRoomInfoResp!!.room_info.head_line.room_id, "",null) + RoomManager.getInstance().fetchRoomDataAndEnter( + applicationContext, + mRoomInfoResp!!.room_info.head_line.room_id, + "", + null + ) } else { com.blankj.utilcode.util.ToastUtils.showLong("您就在当前房间") } @@ -3746,7 +3826,7 @@ class RoomActivity : BaseMvpActivity(), } if (isInBackground) { isInBackground = false - MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId) +// MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId) } // 检查是否从最小化状态恢复 @@ -3757,7 +3837,7 @@ class RoomActivity : BaseMvpActivity(), resumeRoomState() setupEffectView() - MvpPre?.postRoomInfo(CommonAppContext.getInstance().playId) +// MvpPre?.postRoomInfo(CommonAppContext.getInstance().playId) } // 延迟调整布局，确保视图已经完全加载 @@ -3927,93 +4007,93 @@ class RoomActivity : BaseMvpActivity(), return } this.mRoomInfoResp = resp + setview(resp) - - val roomBean = resp.room_info - if (roomBean!!.type_id.equals("6")) { - +// val roomBean = resp.room_info +// if (roomBean!!.type_id.equals("6")) { +// +//// upHeight() +// initPublicScreenFragment() +// if (!isFinishing && !isDestroyed) { +// resetFragment() +// upHeight() +// } else { +// Log.e("Fragment", "Fragment transaction skipped due to state loss.") +// } +// return +// } +// this.mRoomBean = roomBean +// this.mRoomUserBean = resp.user_info +// this.mRoomOwnerBean = resp.room_owner +// this.mPitList = mRoomBean!!.pit_list!! +// +// ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar) +// mBinding!!.roomTop.name.text = roomBean.room_name +// mBinding!!.roomTop.idVal.text = roomBean.room_number +// if (mRoomUserBean?.getIs_room_owner() == 1) { +// mBinding!!.roomTop.btnFollow.visibility = View.GONE +// } else { +// mBinding!!.roomTop.btnFollow.visibility = View.VISIBLE +// if (resp.isCollect) { +// mBinding!!.roomTop.btnFollow.background = +// resources.getDrawable(com.xscm.moduleutil.R.mipmap.collected) +// mBinding!!.roomTop.btnFollow.text = "" +// } +// } +// initPublicScreenFragment() +// if (!isFinishing && !isDestroyed) { +// resetFragment() // upHeight() - initPublicScreenFragment() - if (!isFinishing && !isDestroyed) { - resetFragment() - upHeight() - } else { - Log.e("Fragment", "Fragment transaction skipped due to state loss.") - } - return - } - this.mRoomBean = roomBean - this.mRoomUserBean = resp.user_info - this.mRoomOwnerBean = resp.room_owner - this.mPitList = mRoomBean!!.pit_list!! - - ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar) - mBinding!!.roomTop.name.text = roomBean.room_name - mBinding!!.roomTop.idVal.text = roomBean.room_number - if (mRoomUserBean?.getIs_room_owner() == 1) { - mBinding!!.roomTop.btnFollow.visibility = View.GONE - } else { - mBinding!!.roomTop.btnFollow.visibility = View.VISIBLE - if (resp.isCollect) { - mBinding!!.roomTop.btnFollow.background = - resources.getDrawable(com.xscm.moduleutil.R.mipmap.collected) - mBinding!!.roomTop.btnFollow.text = "" - } - } - initPublicScreenFragment() - if (!isFinishing && !isDestroyed) { - resetFragment() - upHeight() - } else { - Log.e("Fragment", "Fragment transaction skipped due to state loss.") - } - - if (mRoomUserBean?.getIs_collect() == 1) { - mBinding!!.roomTop.btnFollow.background = - resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc) - mBinding!!.roomTop.btnFollow.text = "" - } else { -// mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.collect)); - ThemeableDrawableUtils.setThemeableRoundedBackground( - mBinding!!.roomTop.btnFollow, - ColorManager.getInstance().primaryColorInt, - 53 - ) - mBinding!!.roomTop.btnFollow.setTextColor(ColorManager.getInstance().buttonColorInt) - mBinding!!.roomTop.btnFollow.text = "收藏" - } - if ((resp.room_info.type_id == "3" || resp.room_info.type_id == "1" || resp.room_info.type_id == "4") && resp.room_info.label_id == "2") { - AgoraManager.getInstance(this).isBjMusic = false - } else { - AgoraManager.getInstance(this).isBjMusic = true - } - - - AgoraManager.stopMuisc() - if (!CommonAppContext.getInstance().isMai) { - initializeAudio() - } - - if (mRoomInfoResp!!.room_info.label_id == "2" || mRoomInfoResp!!.room_info.type_id == "7") { - mBinding!!.rlMore.visibility = View.GONE - // mBinding.rlMisc.setVisibility(GONE); - } else if (mRoomInfoResp!!.room_info.label_id == "1" || mRoomInfoResp!!.room_info.type_id == "3" || mRoomInfoResp!!.room_info.type_id == "4" || - mRoomInfoResp!!.room_info.type_id == "8" - ) { - mBinding!!.rlMore.visibility = View.GONE - mBinding!!.rlMisc.visibility = View.VISIBLE - } - - if (resp.room_info.type_id == "7" || resp.room_info.type_id == "2") { - mBinding!!.rlMore.visibility = View.GONE - mBinding!!.rlMisc.visibility = View.GONE - } - - if (mRoomInfoResp!!.hour_ranking_open == 1) { - mBinding!!.clXsb.visibility = View.VISIBLE - } else { - mBinding!!.clXsb.visibility = View.GONE - } +// } else { +// Log.e("Fragment", "Fragment transaction skipped due to state loss.") +// } +// +// if (mRoomUserBean?.getIs_collect() == 1) { +// mBinding!!.roomTop.btnFollow.background = +// resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc) +// mBinding!!.roomTop.btnFollow.text = "" +// } else { +//// mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.collect)); +// ThemeableDrawableUtils.setThemeableRoundedBackground( +// mBinding!!.roomTop.btnFollow, +// ColorManager.getInstance().primaryColorInt, +// 53 +// ) +// mBinding!!.roomTop.btnFollow.setTextColor(ColorManager.getInstance().buttonColorInt) +// mBinding!!.roomTop.btnFollow.text = "收藏" +// } +// if ((resp.room_info.type_id == "3" || resp.room_info.type_id == "1" || resp.room_info.type_id == "4") && resp.room_info.label_id == "2") { +// AgoraManager.getInstance(this).isBjMusic = false +// } else { +// AgoraManager.getInstance(this).isBjMusic = true +// } +// +// +// AgoraManager.stopMuisc() +// if (!CommonAppContext.getInstance().isMai) { +// initializeAudio() +// } +// +// if (mRoomInfoResp!!.room_info.label_id == "2" || mRoomInfoResp!!.room_info.type_id == "7") { +// mBinding!!.rlMore.visibility = View.GONE +// // mBinding.rlMisc.setVisibility(GONE); +// } else if (mRoomInfoResp!!.room_info.label_id == "1" || mRoomInfoResp!!.room_info.type_id == "3" || mRoomInfoResp!!.room_info.type_id == "4" || +// mRoomInfoResp!!.room_info.type_id == "8" +// ) { +// mBinding!!.rlMore.visibility = View.GONE +// mBinding!!.rlMisc.visibility = View.VISIBLE +// } +// +// if (resp.room_info.type_id == "7" || resp.room_info.type_id == "2") { +// mBinding!!.rlMore.visibility = View.GONE +// mBinding!!.rlMisc.visibility = View.GONE +// } +// +// if (mRoomInfoResp!!.hour_ranking_open == 1) { +// mBinding!!.clXsb.visibility = View.VISIBLE +// } else { +// mBinding!!.clXsb.visibility = View.GONE +// } } fun upHeight() { @@ -4047,7 +4127,6 @@ class RoomActivity : BaseMvpActivity(), .replace(R.id.vp_room_pager, roomFragment!!) .commitAllowingStateLoss() } - if ("7" == typeId) { if (mRoomInfoResp!!.room_info.room_background == null || mRoomInfoResp!!.room_info.room_background == "") { changeBackground(com.xscm.moduleutil.R.mipmap.jiaoy_bj) @@ -4141,7 +4220,12 @@ class RoomActivity : BaseMvpActivity(), // AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId, // "" // ) - MvpPre?.getRoomIn(AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId, "") + if (AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId != null && !AgoraManager.getInstance( + OkDownloadProvider.context + ).lastRoomId.isEmpty() + ) { + MvpPre?.getRoomIn(AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId, "") + } AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId = "" // setviewyc(true); // exitFullScreen() @@ -4242,6 +4326,7 @@ class RoomActivity : BaseMvpActivity(), } GiftDisplayManager.getInstance().clearAll() mBinding!!.giftContainer.removeAllViews() + CommonAppContext.getInstance().isMai = false // 确保父类的 onDestroy 被调用 super.finish() } diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java b/moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java index ac26735f..021120fa 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java +++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java @@ -4,6 +4,7 @@ import android.app.Activity; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; +import com.xscm.moduleutil.bean.PkSwTokenBean; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; @@ -22,6 +23,8 @@ public class SingSongContacts { void endPk(); void userOnlineStatus(List list); + + void postAgora(PkSwTokenBean pkSwTokenBean); } public interface IEmotionRoomPre extends IPresenter { diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java index 2b7bdd52..85cf2178 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java @@ -212,7 +212,13 @@ public class RoomPkDialogFragment extends BaseMvpDialogFragment roomBeans) { - mAdapter.setNewData(roomBeans); + if (page==1) { + mAdapter.setNewData(roomBeans); + }else { + if (roomBeans!=null) { + mAdapter.addData(roomBeans); + } + } } @Override diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java index 45220685..bcea9ca9 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java @@ -846,7 +846,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment { @@ -154,6 +166,8 @@ public class SingSongFragment extends BaseRoomFragment { upDtaView(false); }); + + } public void upRoomInfo(RoomInfoResp roomInfoResp) { @@ -166,8 +180,16 @@ public class SingSongFragment extends BaseRoomFragment { + // 点击“确认”按钮时执行删除操作 + MvpPre.endPk(roomInfoRespPk.getPk_info().getPk_id(), "3", SpUtil.getUserId() + ""); + }, + v -> { + // 点击“取消”按钮时什么都不做 + }, false, 0).show(); + } + private int pkStatus; private void ivitTop(RoomMessageEvent message) { @@ -1686,6 +1625,7 @@ public class SingSongFragment extends BaseRoomFragment if (MvpRef==null){ MvpRef=new WeakReference<>(mView); } - String appId = CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId(); - String token = roomInfoResp.getUser_info().getAgora_token(); // 如果启用了鉴权才需要 + if (roomInfoResp==null){ + return; + } String roomId = roomInfoResp.getRoom_info().getRoom_id(); // 房间 ID String rtm_token = roomInfoResp.getUser_info().getAgora_rtm_token(); SpUtil.setRtmToken(rtm_token); @@ -103,16 +106,18 @@ public class SingSongPresenter extends BaseRoomPresenter if (type==1) { if (roomInfoResp.getPk_info() != null) { if (number.equals("9")) { - postRoomSwToken(roomId,uid); + LogUtils.e("pk_info", ""+number); + postRoomSwToken(roomId,uid,roomInfoResp.getPk_info().getInvite_pk_user_id()); ///添加多频道 } } MvpRef.get().postRoomInfoPk(roomInfoResp); +// postRoomInfo(SpUtil.getMyRoomId(),"9",3); }else if (type==3){ - AgoraManager.getInstance(getView().getSelfActivity()).leaveChannelEx(roomInfoResp.getRoom_info().getLast_pk_room_id()+"", uid); +// AgoraManagerEx.getInstance(getView().getSelfActivity()).leaveChannelEx(roomInfoResp.getRoom_info().getLast_pk_room_id()+"", uid); MvpRef.get().postRoomInfoUp(roomInfoResp); }else { - AgoraManager.getInstance(getView().getSelfActivity()).leaveChannelEx(roomInfoResp.getRoom_info().getLast_pk_room_id()+"", uid); +// AgoraManagerEx.getInstance(getView().getSelfActivity()).leaveChannelEx(roomInfoResp.getRoom_info().getLast_pk_room_id()+"", uid); MvpRef.get().postRoomInfo(roomInfoResp); } @@ -156,7 +161,7 @@ public class SingSongPresenter extends BaseRoomPresenter }); } - public void postRoomSwToken(String roomId,int uid) { + public void postRoomSwToken(String roomId,int uid,String invite_pk_user_id) { RetrofitClient.getInstance().postRoomSwToken(roomId, new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -167,8 +172,14 @@ public class SingSongPresenter extends BaseRoomPresenter public void onNext(PkSwTokenBean pkSwTokenBean) { if (pkSwTokenBean!=null){ if (pkSwTokenBean.getAgora_token() != null){ - AgoraManager.getInstance(getView().getSelfActivity()) - .joinChannelEx(pkSwTokenBean.getAgora_token(), roomId, uid); + if (MvpRef==null){ + MvpRef=new WeakReference<>(mView); + } + MvpRef.get().postAgora(pkSwTokenBean); + +// AgoraManager.getInstance(getView().getSelfActivity()) +// .joinChannelEx(pkSwTokenBean.getAgora_token(), roomId, uid); +// AgoraManager.getInstance(getView().getSelfActivity()).muteAllRemoteAudioStreamsExUserId(false, invite_pk_user_id); } } } diff --git a/moduleroom/src/main/res/layout/fragment_room_ktv.xml b/moduleroom/src/main/res/layout/fragment_room_ktv.xml index 60866ddd..81501cda 100644 --- a/moduleroom/src/main/res/layout/fragment_room_ktv.xml +++ b/moduleroom/src/main/res/layout/fragment_room_ktv.xml @@ -1,41 +1,41 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".fragment.RoomKtvFragment"> + android:layout_width="match_parent" + android:layout_height="@dimen/dp_277" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_13" + android:layout_marginEnd="@dimen/dp_16" + android:clipChildren="false"> + android:id="@+id/cl_bj" + android:layout_width="0dp" + android:layout_height="match_parent" + android:background="@drawable/bg_r8_tm" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="1.4:1.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:id="@+id/music_poster" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:alpha="0.3" + android:background="#4d000000" + android:scaleType="fitXY" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> @@ -50,259 +50,259 @@ + /> + android:id="@+id/lyrics_view" + android:layout_width="@dimen/dp_184" + android:layout_height="@dimen/dp_130" + android:layout_marginStart="@dimen/dp_12" + android:visibility="gone" + app:currentLineTextColor="@color/white" + app:currentLineTextSize="@dimen/sp_14" + app:labelWhenNoLyrics="暂无歌词" + app:layout_constraintBottom_toTopOf="@+id/mu_x_title" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ll_u_b" + app:lineSpacing="8dp" + app:startOfVerseIndicatorPaddingTop="6dp" + app:startOfVerseIndicatorRadius="4dp" + app:textSize="@dimen/sp_12"/> + android:id="@+id/mu_title" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_12" + android:layout_marginTop="@dimen/dp_12" + android:text="当前播放歌曲:" + android:textColor="@color/color_FFFFF0F0" + android:textSize="@dimen/sp_12" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent"/> + android:id="@+id/mu_name" + android:layout_width="@dimen/dp_70" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_12" + android:layout_marginEnd="@dimen/dp_72" + android:ellipsize="marquee" + android:focusable="true" + android:focusableInTouchMode="true" + android:marqueeRepeatLimit="marquee_forever" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="@color/color_FFFFF0F0" + android:textSize="@dimen/sp_12" + app:layout_constraintStart_toEndOf="@+id/mu_title" + app:layout_constraintTop_toTopOf="@+id/mu_title" + tools:text="歌曲名称"/> + android:id="@+id/ll_u_b" + android:layout_width="@dimen/dp_55" + android:layout_height="@dimen/dp_55" + android:layout_marginStart="@dimen/dp_12" + android:layout_marginTop="@dimen/dp_12" + android:layout_marginEnd="@dimen/dp_80" + android:background="@mipmap/muis_bj" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/mu_title"> + android:id="@+id/mu_bj" + android:layout_width="@dimen/dp_25" + android:layout_height="@dimen/dp_25" + android:layout_centerInParent="true" + android:src="@mipmap/default_avatar" + app:riv_oval="true"/> + android:id="@+id/mu_x_title" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_12" + android:layout_marginBottom="@dimen/dp_12" + android:text="下一首:" + android:textColor="@color/color_FFFFF0F0" + android:textSize="@dimen/sp_12" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent"/> + android:id="@+id/mu_x_name" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_12" + android:ellipsize="none" + android:focusable="true" + android:focusableInTouchMode="true" + android:marqueeRepeatLimit="marquee_forever" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="@color/color_FFFFF0F0" + android:textSize="@dimen/sp_12" + app:layout_constraintStart_toEndOf="@+id/mu_x_title" + app:layout_constraintTop_toTopOf="@+id/mu_x_title" + tools:text="歌曲名称"/> + android:id="@+id/mu_yc" + android:layout_width="@dimen/dp_62" + android:layout_height="@dimen/dp_88" + android:layout_marginEnd="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:room_wheat_number="-1"/> + android:id="@+id/fl_pit_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:flexDirection="column" + app:flexWrap="nowrap" + app:layout_constraintDimensionRatio="1:1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="@+id/mu_yc" + app:layout_constraintTop_toBottomOf="@id/mu_yc"> + android:id="@+id/ll_bz" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="@dimen/dp_5" + android:orientation="vertical"> + android:id="@+id/im_bz" + android:layout_width="@dimen/dp_13" + android:layout_height="@dimen/dp_16" + android:layout_gravity="center" + android:src="@mipmap/accompany_on"/> + android:id="@+id/tv_bz" + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_14" + android:layout_gravity="center" + android:gravity="center" + android:text="原唱" + android:textColor="@color/color_white" + android:textSize="@dimen/sp_10"/> + android:id="@+id/ll_ds" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="@dimen/dp_5" + android:orientation="vertical"> + android:layout_width="@dimen/dp_13" + android:layout_height="@dimen/dp_16" + android:layout_gravity="center" + android:src="@mipmap/muisc_reward"/> + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_14" + android:layout_gravity="center" + android:gravity="center" + android:text="打赏" + android:textColor="@color/colorPrimary" + android:textSize="@dimen/sp_10"/> + android:id="@+id/ll_qg" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="@dimen/dp_5" + android:orientation="vertical"> + android:layout_width="@dimen/dp_13" + android:layout_height="@dimen/dp_16" + android:layout_gravity="center" + android:src="@mipmap/muisc_switch"/> + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_14" + android:layout_gravity="center" + android:gravity="center" + android:text="切歌" + android:textColor="@color/colorPrimary" + android:textSize="@dimen/sp_10"/> + android:id="@+id/ll_js" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="@dimen/dp_5" + android:orientation="vertical"> + android:layout_width="@dimen/dp_13" + android:layout_height="@dimen/dp_16" + android:layout_gravity="center" + android:src="@mipmap/muisc_end"/> + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_14" + android:layout_gravity="center" + android:gravity="center" + android:text="结束" + android:textColor="@color/colorPrimary" + android:textSize="@dimen/sp_10"/> + android:id="@+id/ll_sz" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="@dimen/dp_5" + android:orientation="vertical" + android:visibility="gone"> + android:layout_width="@dimen/dp_13" + android:layout_height="@dimen/dp_16" + android:layout_gravity="center" + android:src="@mipmap/muisc_set_up"/> + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_14" + android:layout_gravity="center" + android:gravity="center" + android:text="设置" + android:textColor="@color/color_0DFFB9" + android:textSize="@dimen/sp_10"/> @@ -311,21 +311,22 @@ + android:id="@+id/mu_zc" + android:layout_width="@dimen/dp_62" + android:layout_height="@dimen/dp_88" + android:layout_marginTop="-25dp" + android:layout_marginEnd="@dimen/dp_5" + android:clickable="true" + android:elevation="9999dp" + android:focusable="true" + android:foreground="?android:attr/selectableItemBackground" + android:translationZ="30dp" + app:layout_constraintDimensionRatio="1:1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/cl_bj" + app:layout_constraintTop_toTopOf="parent" + app:room_wheat_number="9" + /> @@ -342,25 +343,29 @@ + android:id="@+id/mu_jb" + android:layout_width="@dimen/dp_62" + android:layout_height="@dimen/dp_88" + android:layout_marginTop="@dimen/dp_5" + android:layout_marginEnd="@dimen/dp_5" + app:layout_constraintDimensionRatio="1:1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/cl_bj" + app:layout_constraintTop_toBottomOf="@+id/mu_zc" + app:room_wheat_number="10"/> + android:id="@+id/recycler_view" + android:layout_width="@dimen/dp_58" + android:layout_height="0dp" + android:paddingEnd="@dimen/dp_5" + android:layout_marginBottom="-100dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/cl_bj" + app:layout_constraintTop_toBottomOf="@+id/mu_jb" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintVertical_bias="0.0" + /> diff --git a/moduleroom/src/main/res/layout/fragment_sing_song.xml b/moduleroom/src/main/res/layout/fragment_sing_song.xml index c25121be..04803fab 100644 --- a/moduleroom/src/main/res/layout/fragment_sing_song.xml +++ b/moduleroom/src/main/res/layout/fragment_sing_song.xml @@ -185,7 +185,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/bt_stop" - android:text="未开始:04:25" + tools:text="未开始:04:25" android:textSize="@dimen/sp_12" android:textColor="@color/white" android:background="@mipmap/pk_djs" diff --git a/moduleroom/src/main/res/layout/item_room_charm_rank.xml b/moduleroom/src/main/res/layout/item_room_charm_rank.xml index 15a0eca8..f0942ea5 100644 --- a/moduleroom/src/main/res/layout/item_room_charm_rank.xml +++ b/moduleroom/src/main/res/layout/item_room_charm_rank.xml @@ -8,7 +8,7 @@ android:id="@+id/mu_rank" android:layout_width="@dimen/dp_62" android:layout_height="@dimen/dp_88" - app:layout_constraintDimensionRatio="1:1.2" + app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/moduleroom/src/main/res/layout/popup_menu.xml b/moduleroom/src/main/res/layout/popup_menu.xml index 0098db5e..f9d03cdc 100644 --- a/moduleroom/src/main/res/layout/popup_menu.xml +++ b/moduleroom/src/main/res/layout/popup_menu.xml @@ -1,6 +1,6 @@ + + diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java index 1e3c4c3b..8da7ec00 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java +++ b/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java @@ -254,7 +254,7 @@ public class CreatedRoomActivity extends BaseMvpActivity { mBinding.ll.setVisibility(View.INVISIBLE); CommonAppContext.getInstance().isShow = false; @@ -203,6 +232,17 @@ public class MyRoomActivity extends BaseMvpActivity { - ARouter.getInstance().build(ARouteConstants.MY_ROOM).navigation(); + ARouter.getInstance().build(ARouteConstants.MY_ROOM).withFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT).navigation(); }); mBinding.homeGg.setOnClickListener(v -> { diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java index 6794ad9c..2184bed9 100644 --- a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java +++ b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java @@ -67,7 +67,7 @@ public class VoiceFragment extends BaseMvpFragment { //我的房间 - ARouter.getInstance().build(ARouteConstants.MY_ROOM).navigation(); + ARouter.getInstance().build(ARouteConstants.MY_ROOM).withFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT).navigation(); }); // mBinding.ivRoom2.setOnClickListener(v -> {