1:点唱房添加在离线

2：修改心跳时长

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;
+
+                }
+            }
         };
     }
     /**

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<SoundLevelUpdateListener> soundLevelUpdateListeners) {
+    public MyIRtcEngineEventHandler(RtcEventListener mRtcEventListener, List<SoundLevelUpdateListener> 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);
+        }
+    }
 }

BaseModule/src/main/java/com/xscm/moduleutil/rtc/RtcEventListener.java

@@ -47,4 +47,8 @@ public interface RtcEventListener {
 
     void destroy();
 
+
+    void onNetworkTypeChanged(int type);
+
+
 }

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -1440,7 +1440,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     }
                 } 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)
                 }
             }

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java

@@ -984,7 +984,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 roomJukeboxFragment.event1059(messageEvent);
                 break;
             case 1058:
-//                singSongFragment.event1058(messageEvent);
+                roomJukeboxFragment.event1058(messageEvent);
                 break;
             case 1039:
                 roomJukeboxFragment.event1039(messageEvent);

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java

@@ -712,7 +712,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
             }
 
             if (mBinding.wvZc.getUserId().equals(userId)) {
-                mBinding.wvZc.pitBean.setImageType(true);
+                mBinding.wvZc.pitBean.setImageType(false);
                 mBinding.wvZc.setData(mBinding.wvZc.pitBean);
             } else {
                 for (RoomPitBean roomPitBean : adapter.getData()) {
@@ -836,4 +836,22 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
                 adapter.notifyItemChanged(adapter.getData().indexOf(roomPitBean2));
         }
     }
+
+    public void event1058(RoomMessageEvent messageEvent) {
+        int type = messageEvent.getText().getType();
+        RoomPitBean pitBean = mBinding.wvZc.pitBean;
+        if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
+            pitBean.setIs_online(type == 1 ? 1 : 2);
+            mBinding.wvZc.setData(pitBean);
+            return;
+        }
+
+        List<RoomPitBean> 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));
+        }
+    }
 }

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 {

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" />