From 9ee62fe9afaf0ff14f7eb1f3cfaf01907a790325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 3 Mar 2021 14:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BA=86=E5=B8=A7=E7=8E=87?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E7=9B=B4=E6=92=AD=E7=94=BB=E8=B4=A8?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=89=8B=E5=8A=A8=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=8E=A8=E6=B5=81=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/cloud/LivePlayAndPushActivity.java | 6 +++++-
 app/src/main/res/layout/activity_live_play_and_push.xml   | 2 +-
 .../mogo/cloud/live/manager/LiveStreamManagerImpl.java    | 8 ++++----
 .../java/com/mogo/cloud/live/manager/MoGoLiveManager.java | 4 +++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
index 96e12bc..74dfcdb 100644
--- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
@@ -65,7 +65,11 @@ public class LivePlayAndPushActivity extends BaseLiveActivity implements ITraffi
 
     @Override
     public void toggleLive(boolean isLive) {
-
+        if (isLive) {
+            liveStreamManager.startLiveStream();
+        }else{
+            liveStreamManager.stopLiveStream();
+        }
     }
 
     @Override
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 6531c8d..e32ed2f 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
@@ -101,7 +101,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 6937cca..a10d074 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
@@ -65,8 +65,8 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
         mLivePushConfig = MoGoLivePushConfig.getInstance();
         mLivePushConfig.setWidth(WIDTH);
         mLivePushConfig.setHeight(HEIGHT);
-        mLivePushConfig.setVideoBitrate(5000);
-        mLivePushConfig.setVideoFPS(25);
+        mLivePushConfig.setVideoBitrate(6000);
+        mLivePushConfig.setVideoFPS(30);
         mLivePushConfig.setAudioChannels(2);
         mLivePushConfig.setAudioSampleRate(44100);
         mLivePushConfig.setAudioFormat(AudioFormat.ENCODING_PCM_16BIT);
@@ -185,13 +185,13 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
             if (C1.equals(videoChannel)) {
                 // 停止直播
                 if (status == PUSH_STOP) {
-                    PushService.startService(mApplication, PushService.ACTION_STOP_RTMP_PUSH);
+                    stopLiveStream();
                     // 释放资源
                     CameraFrameManager.getInstance().release();
                 }
                 // 开始直播
                 else if (status == PUSH_START) {
-                    PushService.startService(mApplication, PushService.ACTION_START_RTMP_PUSH);
+                    startLiveStream();
                 }
                 // 强制关闭直播
                 else if (status == PUSH_FORCED_STOP) {
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 b26f7c7..ae07a33 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
@@ -173,7 +173,7 @@ public class MoGoLiveManager {
      * @param application    上下文
      * @param livePushConfig 是否需要配置
      */
-    public void init(Application application, MoGoLivePushConfig livePushConfig) {
+    public MoGoLiveManager init(Application application, MoGoLivePushConfig livePushConfig) {
         mApplication = application;
         mLivePushConfig = livePushConfig;
         // 通过 advancedConfig 设置 uuid 过滤字段，设置之后 SDK 只会抛出前 12 个字节为开发者所设置 uuid 的 SEI
@@ -189,6 +189,8 @@ public class MoGoLiveManager {
 
         // 登录以前用户SN为房间ID的房间
         loginRoom(mLivePushConfig.getDevicesId(), mLivePushConfig.getDevicesId());
+
+        return this;
     }
 
     /**