From 30f81d39a0d6bca7d4346b137d60563520082dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 7 Feb 2021 15:59:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 - .../live/listener/ILiveProgressListener.java | 9 --------- .../cloud/live/manager/ILiveStreamManager.java | 5 ----- .../live/manager/LiveStreamManagerImpl.java | 5 ----- .../cloud/live/manager/MoGoLiveManager.java | 9 --------- .../trafficlive/core/TrafficLiveManager.java | 17 ++++------------- 6 files changed, 4 insertions(+), 42 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5674e0c..1f8e3ef 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -26,7 +26,6 @@ diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java index cef70c9..781f628 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java @@ -34,15 +34,6 @@ public interface ILiveProgressListener { */ void onDisConnect(); - /** - * 当房间数据流更新 - * - * @param streamId 直播流ID - * @param isLive 是否是直播 - */ - default void onRoomStreamUpdate(String streamId, boolean isLive) { - } - /** * 调试错误信息回调 * diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/ILiveStreamManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/ILiveStreamManager.java index 7ce33e4..bcb50ed 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/ILiveStreamManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/ILiveStreamManager.java @@ -44,11 +44,6 @@ public interface ILiveStreamManager { */ void setLiveStatusChangeCallback(ILiveStatusListener changeCallback); - /** - * 设置网络环境 - */ - void setNetEnvironment(int environment); - /** * 释放资源 */ diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 712525a..faa9016 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -72,11 +72,6 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { mLiveStreamUtils.setLiveStatusChangeCallback(callback); } - @Override - public void setNetEnvironment(int environment) { - - } - @Override public void release() { mLiveStreamUtils.release(); 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 6b8eef6..9591810 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 @@ -226,15 +226,6 @@ public class MoGoLiveManager { super.onRoomStreamUpdate(roomID, updateType, streamList, extendedData); //有用户新推送或者删除音视频时，更新流状态 Log.i(TAG, "onRoomStreamUpdate roomId : " + roomID + " , ZegoUpdateType : " + updateType.name()); - for (ZegoStream stream : streamList) { - String streamID = stream.streamID; - Log.i(TAG, "onRoomStreamUpdate streamId: " + streamID); - if (listener != null && updateType == ZegoUpdateType.ADD) { - listener.onRoomStreamUpdate(streamID, true); - } else { - listener.onRoomStreamUpdate(streamID, false); - } - } } @Override diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java index eff25bc..2bc42c3 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java @@ -66,6 +66,10 @@ public class TrafficLiveManager implements ILiveProgressListener { MoGoLiveManager.getInstance().init(application, null); MoGoLiveManager.getInstance().loginRoom(sn, liveSn); MoGoLiveManager.getInstance().setLiveProgressListener(TrafficLiveManager.this); + + // 直接 查看对应SN的直播 + MoGoLiveManager.getInstance().startLive(surfaceView); + callBack.onLive(); } @Override @@ -129,19 +133,6 @@ public class TrafficLiveManager implements ILiveProgressListener { callBack.onDisConnect(); } - @Override - public void onRoomStreamUpdate(String streamId, boolean isLive) { - if (streamId != null && isLive) { - Logger.i(TAG, "主播开始直播了"); - mStreamId = streamId; - MoGoLiveManager.getInstance().startLive(surfaceView); - callBack.onLive(); - } else { - Logger.i(TAG, "主播已离线"); - callBack.onLiveStop(); //todo 验证 onStop() 与 onRoomStreamUpdate() 回调时机 前后顺序 - } - } - @Override public void onDebugError(int errorCode, String funcName, String errorInfo) { Logger.e(TAG, "onDebugError errorCode : " + errorCode + " funcName : " + funcName + " errorInfo : " + errorInfo);