From 1ec1b12e6cb9677f96df3babbbff49b10ea907d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Tue, 2 Dec 2025 10:56:37 +0800 Subject: [PATCH] =?UTF-8?q?1:=E7=82=B9=E5=94=B1=E6=88=BF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9C=A8=E7=A6=BB=E7=BA=BF=202=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/rtc/AgoraManager.java | 27 +++++++++++++++++++ .../rtc/MyIRtcEngineEventHandler.java | 21 +++++++++++++-- .../xscm/moduleutil/rtc/RtcEventListener.java | 4 +++ .../activity/room/activity/RoomActivity.kt | 2 +- .../activity/room/fragment/RoomFragment.java | 2 +- .../room/fragment/RoomJukeboxFragment.java | 20 +++++++++++++- .../modulemain/service/ForegroundService.kt | 2 +- .../res/layout/room_view_jukebox_wheat.xml | 1 + 8 files changed, 73 insertions(+), 6 deletions(-) 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 942524ac..a6403110 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java @@ -2,6 +2,14 @@ package com.xscm.moduleutil.rtc; import static com.blankj.utilcode.util.SnackbarUtils.getView; +import static io.agora.rtc2.Constants.NETWORK_TYPE_DISCONNECTED; +import static io.agora.rtc2.Constants.NETWORK_TYPE_LAN; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_2G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_3G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_4G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_5G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_UNKNOWN; +import static io.agora.rtc2.Constants.NETWORK_TYPE_WIFI; 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; @@ -593,6 +601,25 @@ public class AgoraManager { } } + @Override + public void onNetworkTypeChanged(int type) { + super.onNetworkTypeChanged(type); + switch (type) { + case NETWORK_TYPE_UNKNOWN://未知网络 + + break; + case NETWORK_TYPE_DISCONNECTED://SDK与网络断开连接 + break; + case NETWORK_TYPE_LAN: + case NETWORK_TYPE_WIFI: + case NETWORK_TYPE_MOBILE_2G: + case NETWORK_TYPE_MOBILE_3G: + case NETWORK_TYPE_MOBILE_4G: + case NETWORK_TYPE_MOBILE_5G: + break; + + } + } }; } /** diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/MyIRtcEngineEventHandler.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/MyIRtcEngineEventHandler.java index 62aa420a..26ee8137 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/MyIRtcEngineEventHandler.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/MyIRtcEngineEventHandler.java @@ -1,5 +1,14 @@ package com.xscm.moduleutil.rtc; +import static io.agora.rtc2.Constants.NETWORK_TYPE_DISCONNECTED; +import static io.agora.rtc2.Constants.NETWORK_TYPE_LAN; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_2G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_3G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_4G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_5G; +import static io.agora.rtc2.Constants.NETWORK_TYPE_UNKNOWN; +import static io.agora.rtc2.Constants.NETWORK_TYPE_WIFI; + import com.blankj.utilcode.util.ObjectUtils; import com.blankj.utilcode.util.ThreadUtils; import com.xscm.moduleutil.interfaces.SoundLevelUpdateListener; @@ -21,7 +30,7 @@ public class MyIRtcEngineEventHandler extends IRtcEngineEventHandler { this.mRtcEventListener = mRtcEventListener; } - public MyIRtcEngineEventHandler(RtcEventListener mRtcEventListener,List soundLevelUpdateListeners) { + public MyIRtcEngineEventHandler(RtcEventListener mRtcEventListener, List soundLevelUpdateListeners) { this.soundLevelUpdateListeners = soundLevelUpdateListeners; this.mRtcEventListener = mRtcEventListener; } @@ -80,7 +89,7 @@ public class MyIRtcEngineEventHandler extends IRtcEngineEventHandler { if (!ObjectUtils.isEmpty(soundLevelUpdateListeners)) { for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) { if (listener != null) { - listener.onRemoteSoundLevelUpdate(info.uid > 0 ? String.valueOf(info.uid) : SpUtil.getUserId()+"", info.volume); + listener.onRemoteSoundLevelUpdate(info.uid > 0 ? String.valueOf(info.uid) : SpUtil.getUserId() + "", info.volume); } } } @@ -108,4 +117,12 @@ public class MyIRtcEngineEventHandler extends IRtcEngineEventHandler { }); } } + + @Override + public void onNetworkTypeChanged(int type) { + super.onNetworkTypeChanged(type); + if (mRtcEventListener != null) { + mRtcEventListener.onNetworkTypeChanged(type); + } + } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/RtcEventListener.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/RtcEventListener.java index b1e12d83..5cceddda 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/RtcEventListener.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/RtcEventListener.java @@ -47,4 +47,8 @@ public interface RtcEventListener { void destroy(); + + void onNetworkTypeChanged(int type); + + } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 65f9ab94..a6bfd251 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1440,7 +1440,7 @@ class RoomActivity : BaseMvpActivity(), } } else if (mRoomInfoResp?.room_info?.type_id == "2") { roomFragment!!.handleRoomMessage(messageEvent) - } else if (mRoomInfoResp?.room_info?.type_id == "7") { + } else if (mRoomInfoResp?.room_info?.type_id == "7"|| mRoomInfoResp?.room_info?.type_id=="10") { roomFragment!!.handleRoomMessage(messageEvent) } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index 71f2e9a9..dfb24490 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -984,7 +984,7 @@ public class RoomFragment extends BaseMvpFragment dataList = adapter.getData(); + for (int i = 0; i < dataList.size(); i++) { + RoomPitBean roomPitBean2 = dataList.get(i); + if (roomPitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) + pitBean.setIs_online(type == 1 ? 1 : 2); + adapter.notifyItemChanged(adapter.getData().indexOf(roomPitBean2)); + } + } } \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/service/ForegroundService.kt b/MainModule/src/main/java/com/xscm/modulemain/service/ForegroundService.kt index e4506f39..21074c2a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/service/ForegroundService.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/service/ForegroundService.kt @@ -23,7 +23,7 @@ class ForegroundService : Service() { Log.d("ForegroundService", "Timer task ${logInt++}") RetrofitClient.getInstance().keepXintiao(); } - }, 0L, 10000L) + }, 0L, 60000L) } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { diff --git a/MainModule/src/main/res/layout/room_view_jukebox_wheat.xml b/MainModule/src/main/res/layout/room_view_jukebox_wheat.xml index 08c4eeb2..a2114a68 100644 --- a/MainModule/src/main/res/layout/room_view_jukebox_wheat.xml +++ b/MainModule/src/main/res/layout/room_view_jukebox_wheat.xml @@ -104,6 +104,7 @@ android:layout_height="@dimen/dp_13" android:scaleType="fitCenter" android:src="@mipmap/mu_yc" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/riv" app:layout_constraintEnd_toEndOf="@id/riv" app:layout_constraintStart_toStartOf="@id/riv" />