From f7c7120c5bbad3091f0e9d75ff1da63da714023e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Sun, 7 Feb 2021 16:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E8=A7=82=E7=9C=8B=E4=BA=BA=E6=95=B0=E5=A2=9E=E5=8A=A0=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/cloud/live/manager/MoGoLiveManager.java  | 15 +++++++++++++--
 .../mogo/cloud/live/utils/LiveStreamUtils.java    |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
index 9591810..13dbcdf 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
@@ -34,6 +34,7 @@ import im.zego.zegoexpress.entity.ZegoCustomVideoCaptureConfig;
 import im.zego.zegoexpress.entity.ZegoEngineConfig;
 import im.zego.zegoexpress.entity.ZegoLogConfig;
 import im.zego.zegoexpress.entity.ZegoPlayStreamQuality;
+import im.zego.zegoexpress.entity.ZegoRoomConfig;
 import im.zego.zegoexpress.entity.ZegoStream;
 import im.zego.zegoexpress.entity.ZegoUser;
 import im.zego.zegoexpress.entity.ZegoVideoConfig;
@@ -167,6 +168,7 @@ public class MoGoLiveManager {
      */
     private IZegoEventHandler mEventHandler = new IZegoEventHandler() {
 
+        // 	调试错误信息回调
         @Override
         public void onDebugError(int errorCode, String funcName, String info) {
             super.onDebugError(errorCode, funcName, info);
@@ -178,6 +180,7 @@ public class MoGoLiveManager {
             stopPublishingStream();
         }
 
+        // 音视频引擎状态更新回调
         @Override
         public void onEngineStateUpdate(ZegoEngineState state) {
             super.onEngineStateUpdate(state);
@@ -214,6 +217,7 @@ public class MoGoLiveManager {
             }
         }
 
+        // 房间内其他用户增加或减少的通知回调
         @Override
         public void onRoomUserUpdate(String roomID, ZegoUpdateType updateType, ArrayList<ZegoUser> userList) {
             super.onRoomUserUpdate(roomID, updateType, userList);
@@ -221,6 +225,7 @@ public class MoGoLiveManager {
             Log.i(TAG, "onRoomUserUpdate roomId : " + roomID + " , updateType : " + updateType.name());
         }
 
+        // 相同房间内其他用户推的流增加或减少的通知
         @Override
         public void onRoomStreamUpdate(String roomID, ZegoUpdateType updateType, ArrayList<ZegoStream> streamList, JSONObject extendedData) {
             super.onRoomStreamUpdate(roomID, updateType, streamList, extendedData);
@@ -228,6 +233,7 @@ public class MoGoLiveManager {
             Log.i(TAG, "onRoomStreamUpdate roomId : " + roomID + " , ZegoUpdateType : " + updateType.name());
         }
 
+        // 推流状态回调
         @Override
         public void onPublisherStateUpdate(String streamID, ZegoPublisherState state,
                                            int errorCode, JSONObject extendedData) {
@@ -236,6 +242,7 @@ public class MoGoLiveManager {
             isPushing = state == ZegoPublisherState.PUBLISHING;
         }
 
+        // 拉流状态变更回调
         @Override
         public void onPlayerStateUpdate(String streamID, ZegoPlayerState state, int errorCode, JSONObject extendedData) {
             super.onPlayerStateUpdate(streamID, state, errorCode, extendedData);
@@ -243,12 +250,14 @@ public class MoGoLiveManager {
             isPlaying = state == ZegoPlayerState.PLAYING;
         }
 
+        // 拉流质量回调
         @Override
         public void onPlayerQualityUpdate(String streamID, ZegoPlayStreamQuality quality) {
             super.onPlayerQualityUpdate(streamID, quality);
             Log.i(TAG, "onPlayerQualityUpdate quality : " + quality.toString());
         }
 
+        // 网络模式变更回调
         @Override
         public void onNetworkModeChanged(ZegoNetworkMode mode) {
             super.onNetworkModeChanged(mode);
@@ -287,7 +296,9 @@ public class MoGoLiveManager {
         currentRoomId = ROOM_ID_PREFIX + roomId;
         currentStreamId = STREAM_ID_PREFIX + roomId;
         ZegoUser zegoUser = new ZegoUser(userId, NAME_PREFIX + userId);
-        mExpressEngine.loginRoom(currentRoomId, zegoUser);
+        ZegoRoomConfig zegoRoomConfig = new ZegoRoomConfig();
+        zegoRoomConfig.isUserStatusNotify = true;
+        mExpressEngine.loginRoom(currentRoomId, zegoUser, zegoRoomConfig);
         Log.i(TAG, "loginRoom userId：" + userId + " currentRoomId : " + currentRoomId
                 + " currentStreamId:" + currentStreamId);
     }
@@ -361,7 +372,7 @@ public class MoGoLiveManager {
         if (!TextUtils.isEmpty(currentRoomId)) {
             mExpressEngine.logoutRoom(currentRoomId);
         }
-        if(customVideoCaptureConfig == null){
+        if (customVideoCaptureConfig == null) {
             // 创建自定义视频采集对象
             customVideoCaptureConfig = new ZegoCustomVideoCaptureConfig();
             // 设置自定义视频采集视频帧数据类型
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/LiveStreamUtils.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/LiveStreamUtils.java
index b5075ca..4d84245 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/LiveStreamUtils.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/LiveStreamUtils.java
@@ -114,7 +114,7 @@ public class LiveStreamUtils implements IMogoCloudSocketOnMessageListener<Comman
             if (C1.equals(videoChannel)) {
                 // 停止直播
                 if (status == PUSH_STOP) {
-                    PushService.startService(mContext, PushService.ACTION_STOP_RTMP_PUSH, LiveStreamManagerImpl.mDevicesId);
+                    //PushService.startService(mContext, PushService.ACTION_STOP_RTMP_PUSH, LiveStreamManagerImpl.mDevicesId);
                 }
                 // 开始直播
                 else {