diff --git a/app/src/main/res/layout/activity_live_play_and_push.xml b/app/src/main/res/layout/activity_live_play_and_push.xml index 5a691d9..99cc68f 100644 --- a/app/src/main/res/layout/activity_live_play_and_push.xml +++ b/app/src/main/res/layout/activity_live_play_and_push.xml @@ -104,7 +104,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:hint="请输入要查看的车机SN" - android:text="F803BB2037EZD00048" + android:text="F803EB2046PZD00149" android:textColor="#FFFF" app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn" app:layout_constraintEnd_toEndOf="parent" 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 d8ad0fc..d979290 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 @@ -28,7 +28,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { private final Application mApplication; // 循环上报摄像头可直播状态间隔时间 - private static final int PUSH_CAM_TIME = 30 * 1000; + private static final int PUSH_CAM_TIME = 60 * 1000; private static volatile int sCam1LiveStatus = 0, sCam2LiveStatus = 0; private static volatile int sCam1AvailableStatus = 0, sCam2AvailableStatus = 0; private static final int PUSH_START = 0; // 开始 @@ -38,7 +38,6 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { private static final String C2 = "C_2"; //后置摄像头 private Handler mHandler; // 循环上报摄像头状态 private SocketMsgUtils mSocketMsgUtils; // Socket 长链接 - private MoGoLivePushConfig mLivePushConfig;// 直播参数 private MoGoLiveManager mLivePusher; // 自研直播SDK private static final int WIDTH = 1280; private static final int HEIGHT = 720; @@ -61,7 +60,8 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { mHandler = new Handler(); // 初始化配置文件 - mLivePushConfig = MoGoLivePushConfig.getInstance(); + // 直播参数 + MoGoLivePushConfig mLivePushConfig = MoGoLivePushConfig.getInstance(); mLivePushConfig.setWidth(WIDTH); mLivePushConfig.setHeight(HEIGHT); mLivePushConfig.setVideoBitrate(6000); 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 53788c4..1f47cc8 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 @@ -233,7 +233,9 @@ public class MoGoLiveManager { @Override public void onRoomStateUpdate(String roomID, ZegoRoomState state, int errorCode, JSONObject extendedData) { super.onRoomStateUpdate(roomID, state, errorCode, extendedData); - Logger.i(TAG, "onRoomStateUpdate roomID : " + roomID + " state:" + state + " errorCode:" + errorCode); + Logger.i(TAG, "onRoomStateUpdate roomID : " + roomID + + " state:" + state + + " errorCode:" + errorCode); //房间状态更新 if (mProgressListener != null) { if (state == ZegoRoomState.CONNECTING) { @@ -254,7 +256,8 @@ public class MoGoLiveManager { // 这里只处理当前设备登录的房间中的用户总数 if (currentRoomId.equals(roomID)) { onlineNumber = count; - Logger.i(TAG, "onRoomOnlineUserCountUpdate roomID : " + roomID + " , online user number : " + onlineNumber); + Logger.i(TAG, "onRoomOnlineUserCountUpdate roomID : " + roomID + + " , online user number : " + onlineNumber); if (mRoomStatusListener != null) { mRoomStatusListener.onRoomOnlineUserCountUpdate(count); } @@ -265,16 +268,22 @@ public class MoGoLiveManager { @Override public void onRoomUserUpdate(String roomID, ZegoUpdateType updateType, ArrayList userList) { super.onRoomUserUpdate(roomID, updateType, userList); - Logger.i(TAG, "onRoomUserUpdate roomId : " + roomID + " , updateType : " + updateType.name() + " , online user number : " + onlineNumber); - if (mRoomStatusListener != null) { - mRoomStatusListener.onRoomUserUpdate(updateType, userList); + // 这里只处理当前设备登录的房间中的用户总数 + if (currentRoomId.equals(roomID)) { + Logger.i(TAG, "onRoomUserUpdate roomId : " + roomID + + " , updateType : " + updateType.name() + + " , online user number : " + onlineNumber); + if (mRoomStatusListener != null) { + mRoomStatusListener.onRoomUserUpdate(updateType, userList); + } } } @Override public void onRoomExtraInfoUpdate(String roomID, ArrayList roomExtraInfoList) { super.onRoomExtraInfoUpdate(roomID, roomExtraInfoList); - Logger.i(TAG, "onRoomExtraInfoUpdate roomId : " + roomID + " , roomExtraInfoList : " + roomExtraInfoList.size()); + Logger.i(TAG, "onRoomExtraInfoUpdate roomId : " + roomID + + " , roomExtraInfoList : " + roomExtraInfoList.size()); } // 推流状态回调 @@ -282,7 +291,9 @@ public class MoGoLiveManager { public void onPublisherStateUpdate(String streamID, ZegoPublisherState state, int errorCode, JSONObject extendedData) { super.onPublisherStateUpdate(streamID, state, errorCode, extendedData); - Logger.i(TAG, "onPublisherStateUpdate streamID : " + streamID + " , state : " + state.name() + " , errorCode : " + errorCode); + Logger.i(TAG, "onPublisherStateUpdate streamID : " + streamID + + " , state : " + state.name() + + " , errorCode : " + errorCode); isPushing = state == ZegoPublisherState.PUBLISHING; if (mLiveStatusListener != null) { mLiveStatusListener.onChange(isPushing ? 0 : 1); @@ -293,7 +304,10 @@ public class MoGoLiveManager { @Override public void onPlayerStateUpdate(String streamID, ZegoPlayerState state, int errorCode, JSONObject extendedData) { super.onPlayerStateUpdate(streamID, state, errorCode, extendedData); - Logger.i(TAG, "onPlayerStateUpdate streamId : " + streamID + " , state : " + state.name() + " , errorCode : " + errorCode + " , extendData : " + extendedData.toString()); + Logger.i(TAG, "onPlayerStateUpdate streamId : " + streamID + + " , state : " + state.name() + + " , errorCode : " + errorCode + + " , extendData : " + extendedData.toString()); isPlaying = state == ZegoPlayerState.PLAYING; }