Merge branch 'fix_loginMultiRoom_bug'

# Conflicts:
#	foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
#	gradle.properties

foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java

@@ -79,8 +79,11 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
                         livePushHandler(obj.getType(), obj.getVideoChannel());
                     }
                 });
-        // 初始化查询摄像头状态
-        restartCamStatusLoop();
+        // 是自定义推流才开启上报摄像头状态
+        if (isExpressEngine) {
+            // 初始化查询摄像头状态
+            restartCamStatusLoop();
+        }
         // 开启房间人数检测
         restartCheckOnlineNumLoop();
     }
@@ -215,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();

foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java

@@ -488,6 +488,7 @@ public class MoGoLiveManager {
 
             // 将视频信息设置到推流引擎
             mExpressEngine.setVideoConfig(zegoVideoConfig);
+
             if (mLivePushConfig.isExpressEngine()) {
                 initCustomVideoCapture();
             }