From 9e06469fb6a74855a90ed9ac23e79529768c0f3a Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Fri, 26 Nov 2021 15:28:54 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E4=BF=AE=E5=A4=8D=E4=B8=A4=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=E5=90=8E=E8=87=AA=E5=8A=A8=E5=BC=80=E5=A7=8B=E6=8E=A8?=
 =?UTF-8?q?=E6=B5=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/manager/LiveStreamManagerImpl.java   | 14 ++++++++----
 .../cloud/live/manager/MoGoLiveManager.java   |  9 ++++----
 gradle.properties                             | 22 +++++++++----------
 3 files changed, 26 insertions(+), 19 deletions(-)

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 9d40593..2abbea2 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
@@ -5,6 +5,7 @@ import android.media.AudioFormat;
 import android.os.Handler;
 import android.os.SystemClock;
 
+import com.elegant.log.simplelog.Logger;
 import com.mogo.cloud.live.listener.ILiveStatusListener;
 import com.mogo.cloud.live.model.CommandModel;
 import com.mogo.cloud.live.server.PushService;
@@ -12,7 +13,6 @@ import com.mogo.cloud.live.socket.SocketMsgUtils;
 import com.mogo.cloud.live.socket.SocketRequestUtils;
 import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener;
 import com.mogo.cloud.socket.entity.MsgBody;
-import com.mogo.cloud.utils.logger.Logger;
 
 
 /**
@@ -79,8 +79,11 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
                         livePushHandler(obj.getType(), obj.getVideoChannel());
                     }
                 });
-        // 初始化查询摄像头状态
-        restartCamStatusLoop();
+        // 是自定义推流才开启上报摄像头状态
+        if (isExpressEngine) {
+            // 初始化查询摄像头状态
+            restartCamStatusLoop();
+        }
         // 开启房间人数检测
         restartCheckOnlineNumLoop();
     }
@@ -103,6 +106,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
         mLivePushConfig.setAudioFormat(AudioFormat.ENCODING_PCM_16BIT);
         mLivePushConfig.setMute(true);
         mLivePushConfig.setDevicesId(devicesId);
+        mLivePushConfig.setExpressEngine(isExpressEngine);
         // 初始化直播
         mMoGoLiveManager = MoGoLiveManager.getInstance().init(mApplication, mLivePushConfig);
     }
@@ -214,7 +218,9 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
         if (mMoGoLiveManager.getLiveStatusModel().isPushing() &&
                 mMoGoLiveManager.getLiveStatusModel().getOnlineNumber() <= 1) {
             livePushHandler(PUSH_STOP, C1);
-        } else {
+        }
+        if (!mMoGoLiveManager.getLiveStatusModel().isPushing() &&
+                mMoGoLiveManager.getLiveStatusModel().getOnlineNumber() >= 2) {
             livePushHandler(PUSH_START, C1);
         }
         restartCheckOnlineNumLoop();
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 ff0e3f4..4a017fe 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
@@ -164,9 +164,7 @@ public class MoGoLiveManager {
     public MoGoLiveManager init(Application application, MoGoLivePushConfig livePushConfig) {
         mApplication = application;
         mLivePushConfig = livePushConfig;
-        if (mLivePushConfig.isExpressEngine()) {
-            initExpressEngine();
-        }
+        initExpressEngine();
         return this;
     }
 
@@ -489,8 +487,11 @@ public class MoGoLiveManager {
 
             // 将视频信息设置到推流引擎
             mExpressEngine.setVideoConfig(zegoVideoConfig);
+
+            if (mLivePushConfig.isExpressEngine()) {
+                initCustomVideoCapture();
+            }
         }
-        initCustomVideoCapture();
         loginRoom();
     }
 
diff --git a/gradle.properties b/gradle.properties
index 87c5bfa..a5afdf0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,25 +27,25 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-RELEASE=false
+RELEASE=true
 # AI CLOUD 云平台
 # 工具类
-MOGO_UTILS_VERSION=1.1.58-live
+MOGO_UTILS_VERSION=1.1.59-live
 # 网络请求
-MOGO_NETWORK_VERSION=1.1.58-live
+MOGO_NETWORK_VERSION=1.1.59-live
 # 网络DNS
-MOGO_HTTPDNS_VERSION=1.1.58-live
+MOGO_HTTPDNS_VERSION=1.1.59-live
 # 鉴权
-MOGO_PASSPORT_VERSION=1.1.58-live
+MOGO_PASSPORT_VERSION=1.1.59-live
 # 常链接
-MOGO_SOCKET_VERSION=1.1.58-live
+MOGO_SOCKET_VERSION=1.1.59-live
 # 数据采集
-MOGO_REALTIME_VERSION=1.1.58-live
+MOGO_REALTIME_VERSION=1.1.59-live
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.1.58-live
+MOGO_TANLU_VERSION=1.1.59-live
 # 直播推流
-MOGO_LIVE_VERSION=1.1.58-live
+MOGO_LIVE_VERSION=1.1.59-live
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.1.58-live
+MOGO_TRAFFICLIVE_VERSION=1.1.59-live
 # 定位服务
-MOGO_LOCATION_VERSION=1.1.58-live
+MOGO_LOCATION_VERSION=1.1.59-live