From fa6f40c369c0dc61c5b80713e48842be0310acbd Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Fri, 26 Dec 2025 19:41:52 +0800 Subject: [PATCH] 82 --- .../moduleutil/base/CommonAppContext.java | 2 +- .../com/xscm/moduleutil/rtc/AgoraManager.java | 26 +++++----- .../src/main/res/layout/item_like_user.xml | 6 ++- .../activity/room/activity/RoomActivity.kt | 51 ++++++++++++++++--- .../room/fragment/FriendshipRoomFragment.java | 4 ++ .../room/fragment/RoomMentorShipFragment.kt | 17 ++++--- .../user/activity/RealNameActivity.java | 2 +- .../dialog/RoomUserInfoFragment.java | 8 +++ gradle.properties | 4 +- 9 files changed, 90 insertions(+), 30 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 47198879..5fbf395d 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -136,7 +136,7 @@ public class CommonAppContext extends MultiDexApplication implements Application @Getter public UnreadCountEvent unreadCountEvent; - public static int selectRelease = -1; + public static int selectRelease = 1; @Override public void onCreate() { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java index bade8cb6..7cd44cc5 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java @@ -211,7 +211,7 @@ public class AgoraManager { try { rtcEngine.setAudioProfile(Constants.AUDIO_PROFILE_MUSIC_HIGH_QUALITY_STEREO, Constants.AUDIO_SCENARIO_GAME_STREAMING); - rtcEngine.enableAudioVolumeIndication(200, 3, true); + rtcEngine.enableAudioVolumeIndication(100, 3, true); rtcEngine.setClientRole(Constants.CLIENT_ROLE_BROADCASTER); rtcEngine.muteLocalAudioStream(true); // 默认静音 rtcEngine.muteAllRemoteAudioStreams(false); // 监听远端的音频 @@ -407,14 +407,14 @@ public class AgoraManager { @Override public void onAudioEffectFinished(int soundId) { super.onAudioEffectFinished(soundId); - LogUtils.e("onAudioEffectFinished", "soundId------>" + soundId); +// LogUtils.e("onAudioEffectFinished", "soundId------>" + soundId); } @Override public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapsed) { super.onRemoteAudioStateChanged(uid, state, reason, elapsed); if (state == 0){ - LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed); +// LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed); for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) { if (listener != null) { // Pk 关闭远端推流 @@ -427,7 +427,7 @@ public class AgoraManager { @Override public void onUserMuteAudio(int uid, boolean muted) { super.onUserMuteAudio(uid, muted); - LogUtils.e("onUserMuteAudio", "uid------>" + uid, "muted------>" + muted); +// LogUtils.e("onUserMuteAudio", "uid------>" + uid, "muted------>" + muted); } @Override @@ -708,37 +708,37 @@ public class AgoraManager { @Override public void onPlayerEvent(io.agora.mediaplayer.Constants.MediaPlayerEvent eventCode, long elapsedTime, String message) { - LogUtils.e("@@@", "eventCode: " + eventCode + ", elapsedTime: " + elapsedTime + ", message: " + message); +// LogUtils.e("@@@", "eventCode: " + eventCode + ", elapsedTime: " + elapsedTime + ", message: " + message); } @Override public void onMetaData(io.agora.mediaplayer.Constants.MediaPlayerMetadataType type, byte[] data) { - LogUtils.e("@@@", "type: " + type + ", data: " + data); +// LogUtils.e("@@@", "type: " + type + ", data: " + data); } @Override public void onPlayBufferUpdated(long playCachedBuffer) { - LogUtils.e("@@@", "playCachedBuffer: " + playCachedBuffer); +// LogUtils.e("@@@", "playCachedBuffer: " + playCachedBuffer); } @Override public void onPreloadEvent(String src, io.agora.mediaplayer.Constants.MediaPlayerPreloadEvent event) { - LogUtils.e("@@@", "src: " + src + ", event: " + event); +// LogUtils.e("@@@", "src: " + src + ", event: " + event); } @Override public void onAgoraCDNTokenWillExpire() { - LogUtils.e("@@@", "onAgoraCDNTokenWillExpire"); +// LogUtils.e("@@@", "onAgoraCDNTokenWillExpire"); } @Override public void onPlayerSrcInfoChanged(SrcInfo from, SrcInfo to) { - LogUtils.e("@@@", "from: " + from + ", to: " + to); +// LogUtils.e("@@@", "from: " + from + ", to: " + to); } @Override public void onPlayerInfoUpdated(PlayerUpdatedInfo info) { - LogUtils.e("@@@", "info: " + info); +// LogUtils.e("@@@", "info: " + info); } @Override @@ -1365,12 +1365,12 @@ public class AgoraManager { @Override public void connected(@NonNull DownloadTask task, int blockCount, long currentOffset, long totalLength) { - com.xscm.moduleutil.utils.logger.Logger.e("connected", blockCount); +// com.xscm.moduleutil.utils.logger.Logger.e("connected", blockCount); } @Override public void progress(@NonNull DownloadTask task, long currentOffset, long totalLength) { - com.xscm.moduleutil.utils.logger.Logger.e("progress", currentOffset); +// com.xscm.moduleutil.utils.logger.Logger.e("progress", currentOffset); } @Override diff --git a/BaseModule/src/main/res/layout/item_like_user.xml b/BaseModule/src/main/res/layout/item_like_user.xml index 81015bf7..8e9498dc 100644 --- a/BaseModule/src/main/res/layout/item_like_user.xml +++ b/BaseModule/src/main/res/layout/item_like_user.xml @@ -2,7 +2,11 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:focusable="true" + android:focusableInTouchMode="true" + android:clickable="true" + android:descendantFocusability="blocksDescendants"> (), } override fun onConnectFailed(code: Int, error: String?) { - LogUtils.e("@@@", "断开连接") + LogUtils.e("@@@", "断开连接:${error} code:$code") CommonAppContext.getInstance().onConnectFailed = true } override fun onKickedOffline() { // queren1(); + LogUtils.e("@@@", "您的账号已被挤下线") if (CommonAppContext.getInstance().playId != null) { - ToastUtils.show("您的账号已被挤下线") + runOnUiThread { + ToastUtils.show("您的账号已被挤下线") + } try { CommonAppContext.getInstance().clearLoginInfo() } catch (e: ClassNotFoundException) { @@ -892,9 +895,13 @@ class RoomActivity : BaseMvpActivity(), } } - override fun onUserSigExpired() {} + override fun onUserSigExpired() { + LogUtils.e("@@@", "onUserSigExpired") + } - override fun onSelfInfoUpdated(info: V2TIMUserFullInfo?) {} + override fun onSelfInfoUpdated(info: V2TIMUserFullInfo?) { + LogUtils.e("@@@", "onSelfInfoUpdated:${info?.toString()}") + } } /** @@ -1532,6 +1539,15 @@ class RoomActivity : BaseMvpActivity(), messageEvent.text.rights_icon ) } + + //TODO================ CP入场不触发播放 临时添加=============== + Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn( + AndroidSchedulers.mainThread() + ).subscribe { aLong: Long? -> + if (ActivityUtils.getTopActivity() is RoomActivity) { + toActivity(TransparentActivity::class.java) + } + } } else if (msgType == EMMessageInfo.QXRoomMessageTypeSignStartText) { roomFragment?.handleRoomMessage(messageEvent) softRebuildUI() @@ -2812,6 +2828,7 @@ class RoomActivity : BaseMvpActivity(), * @param type */ fun switchMic(type: Int) { + logIn("switchMic-${type}-") if (type == 1) { mBinding!!.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone) AgoraManager.getInstance() @@ -3544,7 +3561,7 @@ class RoomActivity : BaseMvpActivity(), roomId, pitNumber, mOnlineBean, mRoomUserBean, mRoomInfoResp, supportFragmentManager ) - LogUtils.e("fragment_onItemClickListener: ${(fragment != null)}") + LogUtils.e("showUserListDialog: roomId-${roomId}, pitNumber-${pitNumber}, mRoomUserBean-${mRoomUserBean.toString()}, mRoomInfoResp-${mRoomInfoResp.toString()}") } override fun applyPit() { @@ -4222,7 +4239,7 @@ class RoomActivity : BaseMvpActivity(), val builder = AlertDialog.Builder(this) val inflater = layoutInflater val dialogView = - inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null) + inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null) builder.setView(dialogView) val etContent = dialogView.findViewById(com.xscm.moduleutil.R.id.et_content) val tvSend = dialogView.findViewById