完善手势传递机制，完善播放日志点位

Author: jiajunhui

app/src/main/java/com/kk/taurus/avplayer/cover/GestureCover.java

@@ -24,13 +24,14 @@
 import com.kk.taurus.playerbase.receiver.IReceiverGroup;
 import com.kk.taurus.playerbase.receiver.PlayerStateGetter;
 import com.kk.taurus.playerbase.touch.OnTouchGestureListener;
+import com.kk.taurus.playerbase.touch.TouchEventIndicator;
 import com.kk.taurus.playerbase.utils.TimeUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class GestureCover extends BaseCover implements OnTouchGestureListener {
+public class GestureCover extends BaseCover implements OnTouchGestureListener, TouchEventIndicator {
 
     @BindView(R.id.cover_player_gesture_operation_volume_box)
     View mVolumeBox;
@@ -413,4 +414,10 @@ public void onEndGesture() {
         }
         mHorizontalSlide = false;
     }
+
+    @Override
+    public boolean disallowReceiveTouchEvent() {
+        return getGroupValue().getBoolean(DataInter.Key.KEY_ERROR_SHOW, false);
+    }
+
 }

exoplayer/build.gradle

@@ -34,6 +34,6 @@ dependencies {
     api "com.google.android.exoplayer:exoplayer-dash:$exoplayersdkVersion"
     api "com.google.android.exoplayer:exoplayer-hls:$exoplayersdkVersion"
     api "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoplayersdkVersion"
-    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
-//    api project(':playerbase')
+//    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
+    api project(':playerbase')
 }

exoplayer/src/main/java/com/kk/taurus/exoplayer/ExoMediaPlayer.java

@@ -330,6 +330,7 @@ public void stop() {
         isBuffering = false;
         updateStatus(IPlayer.STATE_STOPPED);
         mInternalPlayer.stop();
+        submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_STOP, null);
     }
 
     @Override
@@ -345,6 +346,7 @@ public void destroy() {
         mInternalPlayer.removeListener(mEventListener);
         mInternalPlayer.removeVideoListener(mVideoListener);
         mInternalPlayer.release();
+        submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_DESTROY, null);
     }
 
     private boolean isInPlaybackState(){
@@ -400,8 +402,13 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
 
             if(!isPreparing){
                 if(playWhenReady){
-                    updateStatus(IPlayer.STATE_STARTED);
-                    submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_RESUME, null);
+                    if(getState()==STATE_PREPARED){
+                        updateStatus(IPlayer.STATE_STARTED);
+                        submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_AUDIO_RENDER_START, null);
+                    }else{
+                        updateStatus(IPlayer.STATE_STARTED);
+                        submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_RESUME, null);
+                    }
                 }else{
                     updateStatus(IPlayer.STATE_PAUSED);
                     submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_PAUSE, null);

ijkplayer/build.gradle

@@ -31,6 +31,6 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     api "tv.danmaku.ijk.media:ijkplayer-java:$ijksdkVersion"
-    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
-//    api project(':playerbase')
+//    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
+    api project(':playerbase')
 }

playerbase/src/main/java/com/kk/taurus/playerbase/AVPlayer.java

@@ -24,6 +24,7 @@
 import com.kk.taurus.playerbase.config.PlayerLoader;
 import com.kk.taurus.playerbase.entity.DataSource;
 import com.kk.taurus.playerbase.entity.DecoderPlan;
+import com.kk.taurus.playerbase.log.DebugLog;
 import com.kk.taurus.playerbase.log.PLog;
 import com.kk.taurus.playerbase.player.BaseInternalPlayer;
 import com.kk.taurus.playerbase.event.BundlePool;
@@ -229,6 +230,7 @@ private void onTimerUpdateEvent(int curr, int duration, int bufferPercentage) {
             new OnPlayerEventListener() {
         @Override
         public void onPlayerEvent(int eventCode, Bundle bundle) {
+            DebugLog.onPlayEventLog(eventCode, bundle);
             mTimerCounterProxy.proxyPlayEvent(eventCode, bundle);
             if(eventCode==OnPlayerEventListener.PLAYER_EVENT_ON_PREPARED){
                 //when prepared set volume value
@@ -253,6 +255,7 @@ public void onPlayerEvent(int eventCode, Bundle bundle) {
             new OnErrorEventListener() {
         @Override
         public void onErrorEvent(int eventCode, Bundle bundle) {
+            DebugLog.onErrorEventLog(eventCode, bundle);
             mTimerCounterProxy.proxyErrorEvent(eventCode, bundle);
             if(isPlayRecordOpen())
                 mRecordProxyPlayer.onErrorEvent(eventCode, bundle);

playerbase/src/main/java/com/kk/taurus/playerbase/event/EventDispatcher.java

@@ -19,11 +19,11 @@
 import android.os.Bundle;
 import android.view.MotionEvent;
 
-import com.kk.taurus.playerbase.log.DebugLog;
 import com.kk.taurus.playerbase.player.OnTimerUpdateListener;
 import com.kk.taurus.playerbase.receiver.IReceiver;
 import com.kk.taurus.playerbase.receiver.IReceiverGroup;
 import com.kk.taurus.playerbase.touch.OnTouchGestureListener;
+import com.kk.taurus.playerbase.touch.TouchEventIndicator;
 
 /**
  * Created by Taurus on 2018/4/14.
@@ -48,7 +48,6 @@ public EventDispatcher(IReceiverGroup receiverGroup){
      */
     @Override
     public void dispatchPlayEvent(final int eventCode, final Bundle bundle){
-        DebugLog.onPlayEventLog(eventCode, bundle);
         switch (eventCode){
             case OnPlayerEventListener.PLAYER_EVENT_ON_TIMER_UPDATE:
                 mReceiverGroup.forEach(new IReceiverGroup.OnLoopListener() {
@@ -82,7 +81,6 @@ public void onEach(IReceiver receiver) {
      */
     @Override
     public void dispatchErrorEvent(final int eventCode, final Bundle bundle){
-        DebugLog.onErrorEventLog(eventCode, bundle);
         mReceiverGroup.forEach(new IReceiverGroup.OnLoopListener() {
             @Override
             public void onEach(IReceiver receiver) {
@@ -214,7 +212,10 @@ private void filterImplOnTouchEventListener(final IReceiverGroup.OnLoopListener
         mReceiverGroup.forEach(new IReceiverGroup.OnReceiverFilter() {
             @Override
             public boolean filter(IReceiver receiver) {
-                return receiver instanceof OnTouchGestureListener;
+                boolean gestureReceiver = receiver instanceof OnTouchGestureListener;
+                boolean disallowReceiveGesture = receiver instanceof TouchEventIndicator
+                        && ((TouchEventIndicator) receiver).disallowReceiveTouchEvent();
+                return gestureReceiver && !disallowReceiveGesture;
             }
         }, new IReceiverGroup.OnLoopListener() {
             @Override

playerbase/src/main/java/com/kk/taurus/playerbase/touch/TouchEventIndicator.java

@@ -0,0 +1,18 @@
+package com.kk.taurus.playerbase.touch;
+
+/**
+ * @ClassName TouchEventIndicator
+ * @Description
+ * @Author Taurus
+ * @Date 2020/9/1 9:26 PM
+ */
+public interface TouchEventIndicator {
+
+    /**
+     * If you don't want to receive a touch event, the method returns true
+     *
+     * @return
+     */
+    boolean disallowReceiveTouchEvent();
+
+}