From 8c0982b15031f8247f91b34911b17725982f15af Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Thu, 11 Nov 2021 21:31:40 +0800
Subject: [PATCH] =?UTF-8?q?Merge=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=B8=A7=E7=94=BB=E9=9D=A2=E5=92=8C=E9=94=99=E8=AF=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/cloud/LivePlayAndPushActivity.java   |  7 +++
 .../java/com/mogo/cloud/MainActivity.java     | 15 ++++++
 .../layout/activity_live_play_and_push.xml    |  4 +-
 .../listener/IMediaPlayerStateListener.java   | 21 ++++++++
 .../cloud/live/manager/MoGoLiveManager.java   | 50 +++++++++++++++++++
 .../api/ITrafficCarLiveCallBack.java          |  4 ++
 .../core/TrafficLiveCurrentManager.java       | 30 +++++++++++
 7 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IMediaPlayerStateListener.java

diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
index 06b4c28..18c0a6d 100644
--- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
@@ -3,6 +3,7 @@ package com.mogo.cloud;
 import android.net.wifi.WifiInfo;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 
 import com.mogo.cloud.live.listener.ILiveStatusListener;
 import com.mogo.cloud.live.manager.LiveStreamManagerImpl;
@@ -124,6 +125,12 @@ public class LivePlayAndPushActivity extends BaseLiveActivity
         Logger.d(TAG, "开始直播 onLive");
     }
 
+    @Override
+    public void onFirstFrame() {
+        surfacePlayView.setVisibility(View.VISIBLE);
+        Logger.d(TAG, "onFirstFrame");
+    }
+
     @Override
     public void onDisConnect() {
         Logger.d(TAG, "失去连接 onDisConnect");
diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java
index 961f24d..f4d6504 100644
--- a/app/src/main/java/com/mogo/cloud/MainActivity.java
+++ b/app/src/main/java/com/mogo/cloud/MainActivity.java
@@ -153,11 +153,26 @@ public class MainActivity extends AppCompatActivity {
             MoGoAiCloudTrafficLive.viewFrontVehicleLive(40.11547, 116.22544,
                     60, surfacePreviewView, new ITrafficCarLiveCallBack() {
 
+                        @Override
+                        public void onLiveConnecting() {
+
+                        }
+
+                        @Override
+                        public void onLiveConnected() {
+
+                        }
+
                         @Override
                         public void onLive(String liveSn) {
                             Logger.e(TAG, "liveSn : " + liveSn);
                         }
 
+                        @Override
+                        public void onFirstFrame() {
+                            Logger.e(TAG, "onFirstFrame");
+                        }
+
                         @Override
                         public void onDisConnect() {
                             Logger.e(TAG, "onDisConnect");
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 18ad850..2014222 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
@@ -23,7 +23,9 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/surfacePreviewView"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="invisible"
+        />
 
     <TextView
         android:id="@+id/tvLocalPreview"
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IMediaPlayerStateListener.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IMediaPlayerStateListener.java
new file mode 100644
index 0000000..41e35d8
--- /dev/null
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IMediaPlayerStateListener.java
@@ -0,0 +1,21 @@
+package com.mogo.cloud.live.listener;
+
+public interface IMediaPlayerStateListener {
+    void onVideoFirstFrame();
+
+    /**
+     * 远程设备异常
+     */
+    void remoteDeviceError();
+
+    /**
+     * 拉流出现错误
+     * @param errorCode
+     */
+    void onPullStreamError(int errorCode);
+
+    /**
+     * 设备错误
+     */
+    void onDeviceError(int errorCode);
+}
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 b6586bd..5fc1042 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
@@ -10,6 +10,7 @@ import com.mogo.cloud.live.listener.ILiveMultiRoomStatusListener;
 import com.mogo.cloud.live.listener.ILiveProgressListener;
 import com.mogo.cloud.live.listener.ILiveRoomPersonListener;
 import com.mogo.cloud.live.listener.ILiveStatusListener;
+import com.mogo.cloud.live.listener.IMediaPlayerStateListener;
 import com.mogo.cloud.live.model.LiveStatusModel;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 
@@ -24,9 +25,11 @@ import im.zego.zegoexpress.callback.IZegoCustomVideoCaptureHandler;
 import im.zego.zegoexpress.callback.IZegoEventHandler;
 import im.zego.zegoexpress.constants.ZegoEngineState;
 import im.zego.zegoexpress.constants.ZegoLanguage;
+import im.zego.zegoexpress.constants.ZegoPlayerMediaEvent;
 import im.zego.zegoexpress.constants.ZegoPlayerState;
 import im.zego.zegoexpress.constants.ZegoPublishChannel;
 import im.zego.zegoexpress.constants.ZegoPublisherState;
+import im.zego.zegoexpress.constants.ZegoRemoteDeviceState;
 import im.zego.zegoexpress.constants.ZegoRoomState;
 import im.zego.zegoexpress.constants.ZegoScenario;
 import im.zego.zegoexpress.constants.ZegoUpdateType;
@@ -46,6 +49,7 @@ import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_DEMO;
 import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_DEV;
 import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_QA;
 import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE;
+import static im.zego.zegoexpress.constants.ZegoRemoteDeviceState.OPEN;
 
 /**
  * 即构直播管理
@@ -117,6 +121,7 @@ public class MoGoLiveManager {
      * 房间配置
      */
     private final ZegoRoomConfig zeGoRoomConfig;
+    private IMediaPlayerStateListener mMediaPlayerStateListener;
 
     private static final class Holder {
         private static final MoGoLiveManager manager = new MoGoLiveManager();
@@ -323,6 +328,9 @@ public class MoGoLiveManager {
             if (mLiveStatusModel.getMultiStreamId().equals(streamID)) {
                 // 如果不是非播放状态则判定为直播状态
                 mLiveStatusModel.setPlaying(state != ZegoPlayerState.NO_PLAY);
+                if (mMediaPlayerStateListener != null && errorCode != 0) {
+                    mMediaPlayerStateListener.onPullStreamError(errorCode);
+                }
                 Log.i(TAG, " 拉流状态变更回调 onPlayerStateUpdate streamId : " + streamID +
                         " , isPlaying : " + mLiveStatusModel.isPlaying() +
                         " , state : " + state.name() +
@@ -338,6 +346,44 @@ public class MoGoLiveManager {
             }
         }
 
+        @Override
+        public void onPlayerRecvAudioFirstFrame(String streamID) {
+            super.onPlayerRecvAudioFirstFrame(streamID);
+            Log.d(TAG, "onPlayerRecvAudioFirstFrame");
+        }
+
+        @Override
+        public void onPlayerRenderVideoFirstFrame(String streamID) {
+            super.onPlayerRenderVideoFirstFrame(streamID);
+            Log.d(TAG, "onPlayerRenderVideoFirstFrame");
+        }
+
+        @Override
+        public void onPlayerRecvVideoFirstFrame(String streamID) {
+            super.onPlayerRecvVideoFirstFrame(streamID);
+            Log.d(TAG, "onPlayerRecvVideoFirstFrame");
+            if (mMediaPlayerStateListener != null) mMediaPlayerStateListener.onVideoFirstFrame();
+        }
+
+        @Override
+        public void onRemoteCameraStateUpdate(String streamID, ZegoRemoteDeviceState state) {
+            super.onRemoteCameraStateUpdate(streamID, state);
+            if (state != OPEN) {
+                Log.e(TAG, "onRemoteCameraStateUpdate:" + state);
+                if (mMediaPlayerStateListener != null) {
+                    mMediaPlayerStateListener.remoteDeviceError();
+                }
+            }
+        }
+
+        @Override
+        public void onDeviceError(int errorCode, String deviceName) {
+            super.onDeviceError(errorCode, deviceName);
+            Log.e(TAG, "onDeviceError:" + errorCode);
+            if (mMediaPlayerStateListener != null && errorCode != 0) {
+                mMediaPlayerStateListener.onDeviceError(errorCode);
+            }
+        }
     };
 
     /**
@@ -595,6 +641,10 @@ public class MoGoLiveManager {
         mExpressEngine.stopPublishingStream();
     }
 
+    public void setMediaPlayerStateListener(IMediaPlayerStateListener mediaPlayerStateListener) {
+        mMediaPlayerStateListener = mediaPlayerStateListener;
+    }
+
     /**
      * 开始播放直播
      *
diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/ITrafficCarLiveCallBack.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/ITrafficCarLiveCallBack.java
index 860519b..b1c827b 100644
--- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/ITrafficCarLiveCallBack.java
+++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/ITrafficCarLiveCallBack.java
@@ -13,6 +13,10 @@ public interface ITrafficCarLiveCallBack {
 
     void onLive(String liveSn);
 
+    default void onFirstFrame() {
+
+    }
+
     void onDisConnect();
 
     void onError(String errorMsg);
diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
index 5cbf8a9..7e3c2c2 100644
--- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
+++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
@@ -5,6 +5,7 @@ import android.view.SurfaceView;
 
 import com.mogo.cloud.live.listener.ILiveMultiRoomStatusListener;
 import com.mogo.cloud.live.listener.ILiveProgressListener;
+import com.mogo.cloud.live.listener.IMediaPlayerStateListener;
 import com.mogo.cloud.live.listener.IRequestLiveListener;
 import com.mogo.cloud.live.manager.MoGoLiveManager;
 import com.mogo.cloud.live.manager.MoGoLivePushConfig;
@@ -113,6 +114,7 @@ public class TrafficLiveCurrentManager
         mLivePushConfig.setDevicesId(sn);
         // 登录要查看的SN房间
         MoGoLiveManager.getInstance().loginMultiRoom(liveSn);
+        MoGoLiveManager.getInstance().setMediaPlayerStateListener(mediaPlayerStateListener);
         // 直接 查看对应SN的直播
         MoGoLiveManager.getInstance().startLive(surfaceView);
         if (TrafficLiveCurrentManager.this.trafficLiveCallBack != null) {
@@ -218,5 +220,33 @@ public class TrafficLiveCurrentManager
             trafficLiveCallBack.onDisConnect();
         }
     }
+    private IMediaPlayerStateListener mediaPlayerStateListener = new IMediaPlayerStateListener() {
+        @Override
+        public void onVideoFirstFrame() {
+            if (trafficLiveCallBack != null) {
+                trafficLiveCallBack.onFirstFrame();
+            }
+        }
 
+        @Override
+        public void remoteDeviceError() {
+            if (trafficLiveCallBack != null) {
+                trafficLiveCallBack.onError("");
+            }
+        }
+
+        @Override
+        public void onPullStreamError(int errorCode) {
+            if (trafficLiveCallBack != null) {
+                trafficLiveCallBack.onError("" + errorCode);
+            }
+        }
+
+        @Override
+        public void onDeviceError(int errorCode) {
+            if (trafficLiveCallBack != null) {
+                trafficLiveCallBack.onError("" + errorCode);
+            }
+        }
+    };
 }