From 5d6dcd2ddeba43c466b8eb3bc1928cad1489a223 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 17:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D30=E7=A7=92=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=B3=E9=97=AD=E7=9B=B4=E6=92=AD=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                     |  4 ++--
 .../java/com/mogo/cloud/LivePlayAndPushActivity.java |  4 ++--
 .../cloud/live/manager/LiveStreamManagerImpl.java    |  3 +++
 .../com/mogo/cloud/live/manager/MoGoLiveManager.java | 12 +++++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50e44c9..c11ed4a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,14 +65,14 @@
             android:label="路况服务"
             android:launchMode="singleTask" />
 
-        <receiver android:name=".wifi.WifiBroadCastReceiver">
+       <!-- <receiver android:name=".wifi.WifiBroadCastReceiver">
             <intent-filter>
                 <action android:name="android.net.wifi.RSSI_CHANGED" />
                 <action android:name="android.net.wifi.STATE_CHANGE" />
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
             </intent-filter>
 
-        </receiver>
+        </receiver>-->
     </application>
 
 </manifest>
\ 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
index 5152f99..1acd0f2 100644
--- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
@@ -28,7 +28,7 @@ public class LivePlayAndPushActivity extends BaseLiveActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        WifiStateManager.getInstance().registerWifiStateListener(this);
+//        WifiStateManager.getInstance().registerWifiStateListener(this);
 
         // 初始化直播流管理
         liveStreamManager = LiveStreamManagerImpl.getInstance(this.getApplication(),
@@ -119,7 +119,7 @@ public class LivePlayAndPushActivity extends BaseLiveActivity
 
         MoGoAiCloudTrafficLive.stopLive(liveSn);
         MoGoAiCloudTrafficLive.destroyLive();
-        WifiStateManager.getInstance().unRegisterWifiStateListener(this);
+//        WifiStateManager.getInstance().unRegisterWifiStateListener(this);
     }
 
     @Override
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 dd96388..d8ad0fc 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
@@ -172,6 +172,9 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
         uploadCamStatus(sCam1AvailableStatus, sCam2AvailableStatus);
         restartCamStatusLoop();
         // 判断当前观众的个数，如果没人观看了的情况则停止直播
+        Logger.i(TAG, "直播状态为： " + mLivePusher.isPushing() +
+                " 观众人数：" + mLivePusher.getOnlineNumber());
+
         if (mLivePusher.isPushing() && mLivePusher.getOnlineNumber() <= 1) {
             livePushHandler(PUSH_STOP, C1);
         }
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 694481c..53788c4 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
@@ -251,10 +251,13 @@ public class MoGoLiveManager {
         @Override
         public void onRoomOnlineUserCountUpdate(String roomID, int count) {
             super.onRoomOnlineUserCountUpdate(roomID, count);
-            onlineNumber = count;
-            Logger.i(TAG, "onRoomOnlineUserCountUpdate roomID : " + roomID + " , online user number : " + onlineNumber);
-            if (mRoomStatusListener != null) {
-                mRoomStatusListener.onRoomOnlineUserCountUpdate(count);
+            // 这里只处理当前设备登录的房间中的用户总数
+            if (currentRoomId.equals(roomID)) {
+                onlineNumber = count;
+                Logger.i(TAG, "onRoomOnlineUserCountUpdate roomID : " + roomID + " , online user number : " + onlineNumber);
+                if (mRoomStatusListener != null) {
+                    mRoomStatusListener.onRoomOnlineUserCountUpdate(count);
+                }
             }
         }
 
@@ -262,7 +265,6 @@ public class MoGoLiveManager {
         @Override
         public void onRoomUserUpdate(String roomID, ZegoUpdateType updateType, ArrayList<ZegoUser> userList) {
             super.onRoomUserUpdate(roomID, updateType, userList);
-            onlineNumber = userList.size();
             Logger.i(TAG, "onRoomUserUpdate roomId : " + roomID + " , updateType : " + updateType.name() + " , online user number : " + onlineNumber);
             if (mRoomStatusListener != null) {
                 mRoomStatusListener.onRoomUserUpdate(updateType, userList);