diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8116b81..1563bc1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -26,7 +26,6 @@
-
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d060819..7ea2c35 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,12 +43,12 @@
android:label="配置信息"
android:launchMode="singleTask" />
{
Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show();
@@ -67,6 +77,15 @@ public abstract class BaseLiveActivity extends AppCompatActivity {
tbLiveStatus = findViewById(R.id.tbLiveStatus);
+ surfacePlayView = findViewById(R.id.surfacePlayView);
+ etLookRoomId = findViewById(R.id.etLookRoomId);
+ liveToggleBtn = findViewById(R.id.liveToggleBtn);
+ liveToggleBtn.setOnCheckedChangeListener((buttonView, isChecked) -> {
+ Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show();
+ togglePlay(isChecked);
+ });
+ tvWifiState = findViewById(R.id.tvWifiState);
+
initCamer();
}
@@ -106,7 +125,7 @@ public abstract class BaseLiveActivity extends AppCompatActivity {
});
// 这里是纯预览
- surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
+ surfacePreviewView.getHolder().addCallback(new SurfaceHolder.Callback() {
@Override
public void surfaceCreated(SurfaceHolder holder) {
Log.i(TAG, "addSurfaceCallBack id");
@@ -157,4 +176,11 @@ public abstract class BaseLiveActivity extends AppCompatActivity {
*/
public abstract void toggleCameraState(boolean isLive);
+ /**
+ * 开关查看直播
+ *
+ * @param isPlay true-查看直播，false-不查看直播
+ */
+ public abstract void togglePlay(boolean isPlay);
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
new file mode 100644
index 0000000..1766c43
--- /dev/null
+++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
@@ -0,0 +1,126 @@
+package com.mogo.cloud;
+
+import android.net.wifi.WifiInfo;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.mogo.cloud.live.listener.ILiveStatusListener;
+import com.mogo.cloud.live.manager.ILiveStreamManager;
+import com.mogo.cloud.live.manager.LiveStreamManagerImpl;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.cloud.trafficlive.api.ITrafficLiveCallBack;
+import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
+import com.mogo.cloud.wifi.IWifiStateListener;
+import com.mogo.cloud.wifi.WifiStateManager;
+
+
+/**
+ * 推流和拉流页面
+ */
+public class LivePlayAndPushActivity extends BaseLiveActivity implements ITrafficLiveCallBack, IWifiStateListener {
+ public static final String TAG = "PushActivity";
+
+ private String liveSn;
+
+ ILiveStreamManager liveStreamManager;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ WifiStateManager.getInstance().registerWifiStateListener(this);
+
+ // 初始化直播流管理
+ liveStreamManager = LiveStreamManagerImpl.getInstance(this.getApplication(),
+ MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId());
+
+ // 设置状态回调
+ liveStreamManager.setLiveStatusChangeCallback(new ILiveStatusListener() {
+ @Override
+ public void onChange(String camId, int status) {
+ tbLiveStatus.post(new Runnable() {
+ @Override
+ public void run() {
+ if (status == 0) {
+ tbLiveStatus.setTextColor(getResources().getColor(R.color.colorStartLive));
+ tbLiveStatus.setChecked(true);
+ } else {
+ tbLiveStatus.setTextColor(getResources().getColor(R.color.colorStopLive));
+ tbLiveStatus.setChecked(false);
+ }
+ }
+ });
+ }
+ });
+ }
+
+ @Override
+ public void onVideoFrame(byte[] bytes, int bytesLength) {
+ //Log.i(TAG, "onVideoFrame byte length: " + bytesLength);
+ if (liveStreamManager != null) {
+ // 将摄像头采集的YUV数据推送到ZEGO
+ liveStreamManager.notifyYUVData(bytes, 1280, 720, 3);
+ }
+ }
+
+ @Override
+ public void toggleLive(boolean isLive) {
+
+ }
+
+ @Override
+ public void toggleCameraState(boolean isLive) {
+ Log.i(TAG, "toggleCameraState isLive: " + isLive);
+ if (isLive) {
+ // 上报摄像头状态，1-可用，2-不可用
+ liveStreamManager.uploadCamStatus(1, 1);
+ } else {
+ liveStreamManager.uploadCamStatus(2, 2);
+ }
+ }
+
+ @Override
+ public void togglePlay(boolean isPlay) {
+ if (isPlay) {
+ liveSn = etLookRoomId.getText().toString().trim();
+ MoGoAiCloudTrafficLive.viewVehicleHeadLive(this.getApplication(),
+ liveSn, surfacePlayView, this);
+ } else {
+ MoGoAiCloudTrafficLive.stopLive(liveSn);
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ if (liveStreamManager != null) {
+ // 停止
+ liveStreamManager.stopLiveStream();
+ // 释放资源
+ liveStreamManager.release();
+ }
+
+ MoGoAiCloudTrafficLive.stopLive(liveSn);
+ MoGoAiCloudTrafficLive.destroyLive();
+ WifiStateManager.getInstance().unRegisterWifiStateListener(this);
+ }
+
+ @Override
+ public void onLive() {
+ Log.d(TAG, "开始直播 onLive");
+ }
+
+ @Override
+ public void onDisConnect() {
+ Log.d(TAG, "失去连接 onDisConnect");
+ }
+
+ @Override
+ public void onError(String errorMsg) {
+ Log.d(TAG, "发生错误 onError msg: " + errorMsg);
+ }
+
+ @Override
+ public void onWifiState(WifiInfo wifiInfo) {
+ tvWifiState.setText("wifiLevel: " + Math.abs(wifiInfo.getRssi()));
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/cloud/LivePushActivity.java b/app/src/main/java/com/mogo/cloud/LivePushActivity.java
index 639510f..5d26f04 100644
--- a/app/src/main/java/com/mogo/cloud/LivePushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePushActivity.java
@@ -21,8 +21,10 @@ public class LivePushActivity extends BaseLiveActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// 初始化直播流管理
- liveStreamManager = LiveStreamManagerImpl.getInstance(this,
+ liveStreamManager = LiveStreamManagerImpl.getInstance(this.getApplication(),
MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId());
+
+ // 设置状态回调
liveStreamManager.setLiveStatusChangeCallback(new ILiveStatusListener() {
@Override
public void onChange(String camId, int status) {
@@ -67,6 +69,11 @@ public class LivePushActivity extends BaseLiveActivity {
}
}
+ @Override
+ public void togglePlay(boolean isPlay) {
+
+ }
+
@Override
protected void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java
index d43d3af..7ebc22a 100644
--- a/app/src/main/java/com/mogo/cloud/MainActivity.java
+++ b/app/src/main/java/com/mogo/cloud/MainActivity.java
@@ -7,7 +7,6 @@ import android.text.TextUtils;
import android.widget.Button;
import android.widget.TextView;
-
import com.mogo.cloud.network.NetworkActivity;
import com.mogo.cloud.passport.IMoGoTokenCallback;
import com.mogo.cloud.passport.MoGoAiCloudClient;
@@ -19,6 +18,7 @@ public class MainActivity extends AppCompatActivity {
private Button btnJumpNetWorkPort;
private Button btnJumpRealTime;
private Button btnJumpRoadCondition;
+ private Button btnJumpLivePlayAndPush;
private Button btnJumpLivePush;
private Button btnJumpLivePlay;
@@ -66,6 +66,12 @@ public class MainActivity extends AppCompatActivity {
startActivity(intent);
});
+ btnJumpLivePlayAndPush = findViewById(R.id.btnJumpLivePlayAndPush);
+ btnJumpLivePlayAndPush.setOnClickListener(v -> {
+ Intent intent = new Intent(MainActivity.this, LivePlayAndPushActivity.class);
+ startActivity(intent);
+ });
+
btnJumpLivePush = findViewById(R.id.btnJumpLivePush);
btnJumpLivePush.setOnClickListener(v -> {
Intent intent = new Intent(MainActivity.this, LivePushActivity.class);
diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml
index dd0eca0..efd8e5d 100644
--- a/app/src/main/res/layout/activity_live_play.xml
+++ b/app/src/main/res/layout/activity_live_play.xml
@@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="请输入要查看的车机SN"
- android:text="F803BB2037EZD00071"
+ android:text="F803EB2046PZD00149"
android:textColor="#FFFF"
app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn"
app:layout_constraintEnd_toEndOf="parent"
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
new file mode 100644
index 0000000..bc80b7d
--- /dev/null
+++ b/app/src/main/res/layout/activity_live_play_and_push.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ecde731..c3e69bd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -72,16 +72,25 @@
android:layout_height="match_parent"
android:text="路况服务测试" />
+
+
+ android:text="直播SDK推流测试"
+ android:visibility="gone" />
+
+ android:text="直播SDK观看测试"
+ android:visibility="gone" />
\ No newline at end of file
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 f508190..485f382 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
@@ -1,6 +1,7 @@
package com.mogo.cloud.live.manager;
-import android.content.Context;
+import android.app.Application;
+import android.media.AudioFormat;
import android.os.Handler;
import android.os.SystemClock;
import android.util.Log;
@@ -24,9 +25,8 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
private static final String TAG = "LiveStreamManagerImpl";
private static volatile ILiveStreamManager sInstance;
- public static volatile String mDevicesId;
- private final Context mContext;
+ private final Application mApplication;
// 循环上报摄像头可直播状态间隔时间
private static final int PUSH_CAM_TIME = 10 * 30 * 1000;
@@ -40,13 +40,16 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
private Handler mHandler; // 循环上报摄像头状态
private SocketMsgUtils mSocketMsgUtils; // Socket 长链接
private ILiveStatusListener mLiveStatusCallback;// 直播状态回调
+ private MoGoLivePushConfig mLivePushConfig;// 直播参数
+ private static final int WIDTH = 1280;
+ private static final int HEIGHT = 720;
- public static ILiveStreamManager getInstance(Context context, String devicesId) {
+ public static ILiveStreamManager getInstance(Application application, String devicesId) {
if (sInstance == null) {
synchronized (LiveStreamManagerImpl.class) {
if (sInstance == null) {
- sInstance = new LiveStreamManagerImpl(context, devicesId);
+ sInstance = new LiveStreamManagerImpl(application, devicesId);
}
}
}
@@ -54,12 +57,26 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
}
- private LiveStreamManagerImpl(Context context, String devicesId) {
- mContext = context;
- mDevicesId = devicesId;
+ private LiveStreamManagerImpl(Application application, String devicesId) {
+ mApplication = application;
mHandler = new Handler();
+
+ // 初始化配置文件
+ mLivePushConfig = MoGoLivePushConfig.getInstance();
+ mLivePushConfig.setWidth(WIDTH);
+ mLivePushConfig.setHeight(HEIGHT);
+ mLivePushConfig.setVideoBitrate(1500);
+ mLivePushConfig.setVideoFPS(15);
+ mLivePushConfig.setAudioChannels(2);
+ mLivePushConfig.setAudioSampleRate(44100);
+ mLivePushConfig.setAudioFormat(AudioFormat.ENCODING_PCM_16BIT);
+ mLivePushConfig.setMute(true);
+ mLivePushConfig.setDevicesId(devicesId);
+ // 初始化直播
+ MoGoLiveManager.getInstance().init(mApplication, mLivePushConfig);
+
// 初始化Socket长连接通道
- mSocketMsgUtils = SocketMsgUtils.getInstance(mContext,
+ mSocketMsgUtils = SocketMsgUtils.getInstance(mApplication,
new IMogoCloudSocketOnMessageListener() {
@Override
@@ -75,6 +92,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
});
// 初始化查询摄像头状态
restartCamStatusLoop();
+
}
/**
@@ -87,14 +105,14 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
@Override
public void startLiveStream() {
- Logger.d(TAG, "startLiveStream devices id:" + mDevicesId);
- PushService.startService(mContext, PushService.ACTION_START_RTMP_PUSH, mDevicesId);
+ Logger.d(TAG, "startLiveStream");
+ PushService.startService(mApplication, PushService.ACTION_START_RTMP_PUSH);
}
@Override
public void stopLiveStream() {
- Logger.d(TAG, "stopLiveStream devices id:" + mDevicesId);
- PushService.startService(mContext, PushService.ACTION_STOP_RTMP_PUSH, mDevicesId);
+ Logger.d(TAG, "stopLiveStream");
+ PushService.startService(mApplication, PushService.ACTION_STOP_RTMP_PUSH);
}
@Override
@@ -167,20 +185,17 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
if (C1.equals(videoChannel)) {
// 停止直播
if (status == PUSH_STOP) {
- PushService.startService(mContext, PushService.ACTION_STOP_RTMP_PUSH,
- LiveStreamManagerImpl.mDevicesId);
+ PushService.startService(mApplication, PushService.ACTION_STOP_RTMP_PUSH);
// 释放资源
CameraFrameManager.getInstance().release();
}
// 开始直播
else if (status == PUSH_START) {
- PushService.startService(mContext, PushService.ACTION_START_RTMP_PUSH,
- LiveStreamManagerImpl.mDevicesId);
+ PushService.startService(mApplication, PushService.ACTION_START_RTMP_PUSH);
}
// 强制关闭直播
else if (status == PUSH_FORCED_STOP) {
- PushService.startService(mContext, PushService.ACTION_FORCED_STOP_RTMP_PUSH,
- LiveStreamManagerImpl.mDevicesId);
+ PushService.startService(mApplication, PushService.ACTION_FORCED_STOP_RTMP_PUSH);
}
// 记录直播状态
sCam1LiveStatus = status;
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 27b918f..1b050fb 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
@@ -66,6 +66,10 @@ public class MoGoLiveManager {
* 直播会议ID，使用推流端的车机信息建立房间ID，这里采用格式为：ROOM_ID_车机SN编号
*/
public static final String ROOM_ID_PREFIX = "ROOM_ID_";
+ /**
+ * 要查看的直播会议ID，使用推流端的车机信息建立房间ID，这里采用格式为：ROOM_MULTI_ID_ 车机SN编号
+ */
+ public static final String MULTI_ROOM_ID_PREFIX = "MULTI_ROOM_ID_";
/**
* 直播用户名称的
*/
@@ -94,10 +98,18 @@ public class MoGoLiveManager {
* 当前的房间ID
*/
private String currentRoomId = "";
+ /**
+ * 当前的多房间ID
+ */
+ private String multiRoomId = "";
/**
* 当前直播流ID
*/
private String currentStreamId = "";
+ /**
+ * MultiRoom中直播流ID
+ */
+ private String multiStreamId = "";
/**
* 自定义采集状态，true-初始化完成，false-没有初始化
*/
@@ -114,6 +126,10 @@ public class MoGoLiveManager {
* 当前在直播间的人数，只剩下一个人的时候需要停掉直播推送
*/
private int onlineNumber;
+ /**
+ * 多房间配置
+ */
+ private ZegoRoomConfig zeGoMultiRoomConfig;
private static final class Holder {
private static final MoGoLiveManager manager = new MoGoLiveManager();
@@ -172,6 +188,9 @@ public class MoGoLiveManager {
zegoEngineConfig.logConfig = zegoLogConfig;
// 设置配置到引擎中
ZegoExpressEngine.setEngineConfig(zegoEngineConfig);
+
+ // 登录以前用户SN为房间ID的房间
+ loginRoom(mLivePushConfig.getDevicesId(), mLivePushConfig.getDevicesId());
}
/**
@@ -309,6 +328,21 @@ public class MoGoLiveManager {
+ " currentStreamId:" + currentStreamId);
}
+ /**
+ * 进入多房间
+ *
+ * @param roomId 房间ID
+ */
+ public void loginMultiRoom(String roomId) {
+ initCustomVideoCapture();
+ multiRoomId = MULTI_ROOM_ID_PREFIX + roomId;
+ multiStreamId = STREAM_ID_PREFIX + roomId;
+ zeGoMultiRoomConfig = new ZegoRoomConfig();
+ zeGoMultiRoomConfig.isUserStatusNotify = true;
+ mExpressEngine.loginMultiRoom(multiRoomId, zeGoMultiRoomConfig);
+ Logger.i(TAG, "loginMultiRoom currentMultiRoomId : " + multiRoomId);
+ }
+
/**
* 初始化自定义采集
*/
@@ -394,39 +428,49 @@ public class MoGoLiveManager {
}
/**
- * 开始推送
+ * 退出多房间
*/
- public void startPush(String streamId) {
- mExpressEngine.startPublishingStream(STREAM_ID_PREFIX + streamId);
+ private void logOutMultiRoom() {
+ if (mExpressEngine == null) {
+ return;
+ }
+ if (!TextUtils.isEmpty(multiRoomId)) {
+ mExpressEngine.loginMultiRoom(multiRoomId, zeGoMultiRoomConfig);
+ }
}
/**
- * 开始直播
+ * 开始推送
+ */
+ public void startPush() {
+ mExpressEngine.startPublishingStream(currentStreamId);
+ }
+
+ /**
+ * 开始播放直播
*
* @param surfaceView 渲染直播的视图
*/
public String startLive(SurfaceView surfaceView) {
- if (!TextUtils.isEmpty(currentStreamId) &&
- !currentStreamId.equals(STREAM_ID_PREFIX)) {
+ if (!TextUtils.isEmpty(multiStreamId) &&
+ !multiStreamId.equals(STREAM_ID_PREFIX)) {
ZegoCanvas zegoCanvas = new ZegoCanvas(surfaceView);
zegoCanvas.viewMode = ZegoViewMode.SCALE_TO_FILL;
- mExpressEngine.startPlayingStream(currentStreamId, zegoCanvas);
+ mExpressEngine.startPlayingStream(multiStreamId, zegoCanvas);
} else {
Logger.e(TAG, "直播ID有误，请重试");
}
-
- return currentStreamId;
+ return multiStreamId;
}
/**
- * 停止直播
+ * 停止播放直播
*/
public void stopLive() {
- if (!TextUtils.isEmpty(currentStreamId) && mExpressEngine != null) {
- mExpressEngine.stopPlayingStream(currentStreamId);
+ if (!TextUtils.isEmpty(multiStreamId) && mExpressEngine != null) {
+ mExpressEngine.stopPlayingStream(multiStreamId);
}
stopPreview();
- logOutRoom();
}
/**
@@ -453,7 +497,6 @@ public class MoGoLiveManager {
*/
public void onDestroyPublish() {
stopPublish();
- logOutRoom();
destroyEngine();
}
@@ -476,6 +519,8 @@ public class MoGoLiveManager {
return;
}
mExpressEngine.stopPreview();
+ // 退出正在查看的多房间
+ logOutMultiRoom();
}
/**
@@ -483,7 +528,6 @@ public class MoGoLiveManager {
*/
public void stopPublish() {
stopPublishingStream();
- logOutRoom();
}
/**
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
index 2c152cb..2deb65c 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
@@ -3,7 +3,6 @@ package com.mogo.cloud.live.server;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
-import android.media.AudioFormat;
import android.os.IBinder;
import android.os.SystemClock;
import android.util.Log;
@@ -11,7 +10,6 @@ import android.util.Log;
import com.mogo.cloud.live.listener.IYUVDataListener;
import com.mogo.cloud.live.manager.CameraFrameManager;
import com.mogo.cloud.live.manager.MoGoLiveManager;
-import com.mogo.cloud.live.manager.MoGoLivePushConfig;
import com.mogo.cloud.live.utils.ByteUtils;
import com.mogo.cloud.utils.logger.Logger;
@@ -23,33 +21,18 @@ public class PushService extends Service
public static final String ACTION_FORCED_STOP_RTMP_PUSH = "action_forced_stop_rtmp_push";
private static final String TAG = "PushService";
-
- private static final String DEVICES_ID = "devices_id";
-
- private static final int WIDTH = 1280;
- private static final int HEIGHT = 720;
-
// 自研直播SDK
- private MoGoLivePushConfig mLivePushConfig;
private MoGoLiveManager mLivePusher;
- /**
- * 当前设备ID，作为推流端，userID==roomId==streamID
- */
- private volatile String mDevicesId;
-
/**
* 启动服务
*
- * @param context 上下文
- * @param action 动作标志
- * @param devicesId 设备ID
+ * @param context 上下文
+ * @param action 动作标志
*/
- public static void startService(Context context, String action,
- String devicesId) {
+ public static void startService(Context context, String action) {
Intent intent = new Intent(context, PushService.class);
intent.setAction(action);
- intent.putExtra(DEVICES_ID, devicesId);
context.startService(intent);
}
@@ -57,16 +40,6 @@ public class PushService extends Service
public void onCreate() {
super.onCreate();
Log.d(TAG, "初始化推流服务……");
- mLivePushConfig = MoGoLivePushConfig.getInstance();
- mLivePushConfig.setWidth(WIDTH);
- mLivePushConfig.setHeight(HEIGHT);
- mLivePushConfig.setVideoBitrate(1500);
- mLivePushConfig.setVideoFPS(15);
- mLivePushConfig.setAudioChannels(2);
- mLivePushConfig.setAudioSampleRate(44100);
- mLivePushConfig.setAudioFormat(AudioFormat.ENCODING_PCM_16BIT);
- mLivePushConfig.setMute(true);
-
initZeGoLivePusher();
}
@@ -76,8 +49,7 @@ public class PushService extends Service
// 开启直播
if (ACTION_START_RTMP_PUSH.equals(intent.getAction())) {
try {
- String devicesId = intent.getStringExtra(DEVICES_ID);
- startPush(devicesId);
+ startPush();
} catch (Exception e) {
e.printStackTrace();
}
@@ -105,25 +77,19 @@ public class PushService extends Service
/**
* 启动发布直播视频流
- *
- * @param devicesId 设备ID
*/
- private void startPush(String devicesId) {
- if (mDevicesId != null && mDevicesId.equals(devicesId)
- && mLivePusher != null
+ private void startPush() {
+ if (mLivePusher != null
&& mLivePusher.isCaptureStatus()
&& mLivePusher.isPushing()) {
return;
}
- mDevicesId = devicesId;
initZeGoLivePusher();
- // 登录房间
- mLivePusher.loginRoom(mDevicesId, mDevicesId);
// 开始发布
- mLivePusher.startPush(mDevicesId);
+ mLivePusher.startPush();
// 注册视频YUV回调监听
CameraFrameManager.getInstance().addYuvDataCallback(this);
- Log.d(TAG, "startPush :mRoomId=" + mDevicesId + " mDevicesId=" + mDevicesId);
+ Log.d(TAG, "startPush");
}
/**
@@ -132,23 +98,6 @@ public class PushService extends Service
private void initZeGoLivePusher() {
if (mLivePusher == null) {
mLivePusher = MoGoLiveManager.getInstance();
- mLivePusher.init(getApplication(), mLivePushConfig);
-// mLivePusher.setLiveRoomPersonListener(new ILiveRoomPersonListener() {
-// @Override
-// public void onRoomOnlineUserCountUpdate(int count) {
-// Logger.i(TAG, "房间还有 " + count + " 位观众，不可以关闭直播");
-// }
-//
-// @Override
-// public void onRoomUserUpdate(ZegoUpdateType updateType, ArrayList userList) {
-// if (userList.size() <= 1) {
-// Logger.i(TAG, "房间没有观众了，主动关闭直播");
-// stopPush();
-// } else {
-// Logger.i(TAG, "房间还有 " + mLivePusher.getOnlineNumber() + " 位观众，不可以关闭直播");
-// }
-// }
-// });
}
}
@@ -157,7 +106,6 @@ public class PushService extends Service
*/
private void stopPush() {
try {
- mDevicesId = "";
// 是否处于发布状态
if (mLivePusher.isPushing()) {
// 停止发布
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 ab5d0bd..f5a5112 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
@@ -8,6 +8,7 @@ import android.view.SurfaceView;
import com.mogo.cloud.live.listener.ILiveProgressListener;
import com.mogo.cloud.live.listener.IRequestLiveListener;
import com.mogo.cloud.live.manager.MoGoLiveManager;
+import com.mogo.cloud.live.manager.MoGoLivePushConfig;
import com.mogo.cloud.live.manager.RequestLiveManager;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.trafficlive.api.ITrafficLiveCallBack;
@@ -65,18 +66,27 @@ public class TrafficLiveManager implements ILiveProgressListener {
Logger.i(TAG, "主播开始直播了 systemClock :" + SystemClock.elapsedRealtime() + " SystemTime : " + System.currentTimeMillis());
String sn = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn();
mStreamId = MoGoLiveManager.STREAM_ID_PREFIX + liveSn;
- MoGoLiveManager.getInstance().init(application, null);
- MoGoLiveManager.getInstance().loginRoom(sn, liveSn);
+
+ // 初始化配置文件
+ MoGoLivePushConfig mLivePushConfig = MoGoLivePushConfig.getInstance();
+ mLivePushConfig.setDevicesId(sn);
+
+ MoGoLiveManager.getInstance().init(application, mLivePushConfig);
+ MoGoLiveManager.getInstance().loginMultiRoom(liveSn);
MoGoLiveManager.getInstance().setLiveProgressListener(TrafficLiveManager.this);
// 直接 查看对应SN的直播
MoGoLiveManager.getInstance().startLive(surfaceView);
- callBack.onLive();
+ if (callBack != null) {
+ callBack.onLive();
+ }
}
@Override
public void onError(Throwable e) {
- callBack.onError(e.getMessage());
+ if (callBack != null) {
+ callBack.onError(e.getMessage());
+ }
}
});
}
@@ -93,7 +103,9 @@ public class TrafficLiveManager implements ILiveProgressListener {
@Override
public void onError(Throwable e) {
- callBack.onError(e.getMessage());
+ if (callBack != null) {
+ callBack.onError(e.getMessage());
+ }
}
});
MoGoLiveManager.getInstance().stopLive();
@@ -109,34 +121,46 @@ public class TrafficLiveManager implements ILiveProgressListener {
@Override
public void onEngineStart() {
- callBack.onLiveStart();
+ if (callBack != null) {
+ callBack.onLiveStart();
+ }
}
@Override
public void onEngineStop() {
- callBack.onLiveStop();
+ if (callBack != null) {
+ callBack.onLiveStop();
+ }
}
@Override
public void onConnecting() {
- callBack.onLiveConnecting();
+ if (callBack != null) {
+ callBack.onLiveConnecting();
+ }
}
@Override
public void onConnected(String roomId) {
isLoginSuccess = true;
- callBack.onLiveConnected();
+ if (callBack != null) {
+ callBack.onLiveConnected();
+ }
}
@Override
public void onDisConnect() {
isLoginSuccess = false;
- callBack.onDisConnect();
+ if (callBack != null) {
+ callBack.onDisConnect();
+ }
}
@Override
public void onDebugError(int errorCode, String funcName, String errorInfo) {
Logger.e(TAG, "onDebugError errorCode : " + errorCode + " funcName : " + funcName + " errorInfo : " + errorInfo);
- callBack.onError(errorInfo);
+ if (callBack != null) {
+ callBack.onError(errorInfo);
+ }
}
}