1 封装视频库

杨帅
1 parent 14ed85cd
Showing 11 changed files with 408 additions and 352 deletions
app/strike/src/main/AndroidManifest.xml
cloud/video/src/main/java/com/libs/video/video/exoplayer/CNLiveBaseVideoControlView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/CNLiveVideoView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/IVideoMultDataSource.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/IVideoPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/MyTestControlView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/VideoPlayer.java
cloud/video/src/main/res/drawable-hdpi/cover_youku_icon.png
cloud/video/src/main/res/drawable/video_seekbar_progress.xml
cloud/video/src/main/res/layout/layout_base_video_view.xml
cloud/video/src/main/res/layout/layout_protrait_control_view.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <application
-        android:name="com.cnlive.strike.MyApp"
+        android:name="com.cnlive.strike.demo.exoplayer.demo.DemoApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -9,15 +9,17 @@ import android.content.res.TypedArray;
 import android.os.Looper;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Surface;
 import android.view.View;
-import android.view.WindowManager;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.TextView;
+import android.widget.LinearLayout;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import com.cnlive.cloud.video.R;
 import com.google.android.exoplayer2.C;
@@ -25,7 +27,6 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.PlaybackPreparer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
@@ -44,6 +45,9 @@ import java.util.Formatter;
 import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
+/**
+ * 视频控制视图基类
+ */
 public abstract class CNLiveBaseVideoControlView extends FrameLayout implements AnalyticsListener {
     static {
@@ -135,7 +139,10 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
     private FrameLayout fl_root;//根布局
     @Nullable
     public Context context;
+    //用于获取当前屏幕朝向
     private Configuration newConfig;
+    //延时隐藏当前播放视图
+    private Runnable delayHideViewAction;
     public CNLiveBaseVideoControlView(Context context) {
         this(context, /* attrs= */ null, 0, null);
@@ -143,14 +150,29 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         visibilityListeners = new CopyOnWriteArrayList<>();
     }
+    /**
+     * 获取竖屏ui
+     *
+     * @return
+     */
     protected int getPortraitControllViewId() {
         return -1;
     }
+    /**
+     * 获取横屏UI
+     *
+     * @return
+     */
     protected int getLandscapeControllViewId() {
         return -1;
     }
+    /**
+     * 按鈕点击事件
+     *
+     * @param view
+     */
     protected abstract void onViewClick(View view);
     @SuppressWarnings({
@@ -168,6 +190,7 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         if (context instanceof Activity) {
             this.activity = (Activity) context;
         }
+
         formatBuilder = new StringBuilder();
         formatter = new Formatter(formatBuilder, Locale.getDefault());
         period = new Timeline.Period();
@@ -177,147 +200,9 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         componentListener = new CNLiveBaseVideoControlView.ComponentListener();
 //        controlDispatcher = new CNLiveDefaultControlDispatcher();
         controllerLayoutId = R.layout.layout_cnlive_control_view;
-//        if (null != playbackAttrs && -1 != getPortraitControllViewId()) {
-//            rewindMs = DEFAULT_REWIND_MS;
-//            fastForwardMs = DEFAULT_FAST_FORWARD_MS;
-//            showTimeoutMs = DEFAULT_SHOW_TIMEOUT_MS;
-//            repeatToggleModes = DEFAULT_REPEAT_TOGGLE_MODES;
-//            timeBarMinUpdateIntervalMs = DEFAULT_TIME_BAR_MIN_UPDATE_INTERVAL_MS;
-//            hideAtMs = C.TIME_UNSET;
-//            showShuffleButton = false;
-//            if (playbackAttrs != null) {
-//                TypedArray a =
-//                        context
-//                                .getTheme()
-//                                .obtainStyledAttributes(playbackAttrs, R.styleable.PlayerControlView, 0, 0);
-//                try {
-//                    rewindMs = a.getInt(R.styleable.PlayerControlView_rewind_increment, rewindMs);
-//                    fastForwardMs =
-//                            a.getInt(R.styleable.PlayerControlView_fastforward_increment, fastForwardMs);
-//                    showTimeoutMs = a.getInt(R.styleable.PlayerControlView_show_timeout, showTimeoutMs);
-//                    controllerLayoutId =
-//                            a.getResourceId(R.styleable.PlayerControlView_controller_layout_id, controllerLayoutId);
-//                    repeatToggleModes = getRepeatToggleModes(a, repeatToggleModes);
-//                    showShuffleButton =
-//                            a.getBoolean(R.styleable.PlayerControlView_show_shuffle_button, showShuffleButton);
-//                    setTimeBarMinUpdateInterval(
-//                            a.getInt(
-//                                    R.styleable.PlayerControlView_time_bar_min_update_interval,
-//                                    timeBarMinUpdateIntervalMs));
-//                } finally {
-//                    a.recycle();
-//                }
-//            }
-//
-//
-//            adGroupTimesMs = new long[0];
-//            playedAdGroups = new boolean[0];
-//            extraAdGroupTimesMs = new long[0];
-//            extraPlayedAdGroups = new boolean[0];
         updateProgressAction = this::updateProgress;
-//            hideAction = this::hide;
-//
-//            basePortraitView = LayoutInflater.from(context).inflate(controllerLayoutId, /* root= */ this);
-//            setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
-//
-//            TimeBar customTimeBar = findViewById(R.id.cnlive_progress);
-//            View timeBarPlaceholder = findViewById(R.id.cnlive_progress_placeholder);
-//            if (customTimeBar != null) {
-//                timeBar = customTimeBar;
-//            } else if (timeBarPlaceholder != null) {
-//                // Propagate attrs as timebarAttrs so that DefaultTimeBar's custom attributes are transferred,
-//                // but standard attributes (e.g. background) are not.
-//                BaseTimerBar defaultTimeBar = new BaseTimerBar(context, null, 0, playbackAttrs);
-//                //todo 设置播放的颜色
-////            defaultTimeBar.setPlayedColor(ContextCompat.getColor(context,R.color.qmui_config_color_red));
-//                //todo 设置缓冲颜色
-////            defaultTimeBar.setBufferedColor(ContextCompat.getColor(context,R.color.qmui_config_color_red));
-//                defaultTimeBar.setId(R.id.cnlive_progress);
-//                defaultTimeBar.setLayoutParams(timeBarPlaceholder.getLayoutParams());
-//                ViewGroup parent = ((ViewGroup) timeBarPlaceholder.getParent());
-//                int timeBarIndex = parent.indexOfChild(timeBarPlaceholder);
-//                parent.removeView(timeBarPlaceholder);
-//                parent.addView(defaultTimeBar, timeBarIndex);
-//                timeBar = defaultTimeBar;
-//            } else {
-//                timeBar = null;
-//            }
-//            durationView = findViewById(R.id.cnlive_duration);
-//            positionView = findViewById(R.id.cnlive_position);
-//            //初始化顶部视图
-//            //顶部标题
-//            tvTopViewTitle = findViewById(R.id.cnlive_top_title);
-//            //设置标题名称
-//            if (null != tvTopViewTitle) {
-//                tvTopViewTitle.setText("测试");
-//            }
-//            if (timeBar != null) {
-//                timeBar.addListener(componentListener);
-//            }
-//            playButton = findViewById(R.id.cnlive_play);
-//            if (playButton != null) {
-//                playButton.setOnClickListener(componentListener);
-//            }
-//            pauseButton = findViewById(R.id.cnlive_pause);
-//            if (pauseButton != null) {
-//                pauseButton.setOnClickListener(componentListener);
-//            }
-//            previousButton = findViewById(R.id.cnlive_prev);
-//            if (previousButton != null) {
-//                previousButton.setOnClickListener(componentListener);
-//            }
-//            nextButton = findViewById(R.id.cnlive_next);
-//            if (nextButton != null) {
-//                nextButton.setOnClickListener(componentListener);
-//            }
-//            rewindButton = findViewById(R.id.cnlive_rew);
-//            if (rewindButton != null) {
-//                rewindButton.setOnClickListener(componentListener);
-//            }
-//            fastForwardButton = findViewById(R.id.cnlive_ffwd);
-//            if (fastForwardButton != null) {
-//                fastForwardButton.setOnClickListener(componentListener);
-//            }
-//            repeatToggleButton = findViewById(R.id.cnlive_repeat_toggle);
-//            if (repeatToggleButton != null) {
-//                repeatToggleButton.setOnClickListener(componentListener);
-//            }
-//            repeatToggleButton.setVisibility(GONE);
-//            shuffleButton = findViewById(R.id.cnlive_shuffle);
-//            if (shuffleButton != null) {
-//                shuffleButton.setOnClickListener(componentListener);
-//            }
-//            //初始化横竖屏切换
-//            switchScreenButton = findViewById(R.id.cnlive_switch_screen);
-//            if (switchScreenButton != null) {
-//                switchScreenButton.setOnClickListener(componentListener);
-//            }
-//            vrButton = findViewById(R.id.cnlive_vr);
-//            setShowVrButton(false);
 //
-//            Resources resources = context.getResources();
-//
-//            buttonAlphaEnabled =
-//                    (float) resources.getInteger(R.integer.exo_media_button_opacity_percentage_enabled) / 100;
-//            buttonAlphaDisabled =
-//                    (float) resources.getInteger(R.integer.exo_media_button_opacity_percentage_disabled) / 100;
-//
-//            repeatOffButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_off);
-//            repeatOneButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_one);
-//            repeatAllButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_all);
-//            shuffleOnButtonDrawable = resources.getDrawable(R.drawable.exo_controls_shuffle_on);
-//            shuffleOffButtonDrawable = resources.getDrawable(R.drawable.exo_controls_shuffle_off);
-//            repeatOffButtonContentDescription =
-//                    resources.getString(R.string.exo_controls_repeat_off_description);
-//            repeatOneButtonContentDescription =
-//                    resources.getString(R.string.exo_controls_repeat_one_description);
-//            repeatAllButtonContentDescription =
-//                    resources.getString(R.string.exo_controls_repeat_all_description);
-//            shuffleOnContentDescription = resources.getString(R.string.exo_controls_shuffle_on_description);
-//            shuffleOffContentDescription =
-//                    resources.getString(R.string.exo_controls_shuffle_off_description);
-//        } else {
         //设置底层视图
         baseRootView = LayoutInflater.from(context).inflate(R.layout.layout_cnlive_control_view, /* root= */ this);
         if (null != baseRootView) {
@@ -326,21 +211,8 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         baseRootView.post(new Runnable() {
             @Override
             public void run() {
-                if (-1 != getPortraitControllViewId()) {
-                    basePortraitView = LayoutInflater.from(context).inflate(getPortraitControllViewId(), /* root= */ null);
-                    if (null != fl_root && null != basePortraitView) {
-                        fl_root.addView(basePortraitView);
-                    }
-                }
-                if (-1 != getLandscapeControllViewId()) {
-                    baseLandscapeView = LayoutInflater.from(context).inflate(getLandscapeControllViewId(), /* root= */ null);
-                    if (null != fl_root && null != baseLandscapeView) {
-                        fl_root.addView(baseLandscapeView);
-                    }
-                }
-                basePortraitView.setVisibility(VISIBLE);
-                baseLandscapeView.setVisibility(GONE);
-
+                //初始化视图UI
+                initView();
                 if (null != componentListener && null != basePortraitView) {
                     initPortraitView(basePortraitView, componentListener);
                 }
@@ -348,27 +220,98 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
                 baseRootView.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        //获取当前屏幕朝向
-                        if (null == newConfig) {
-                            showPortraitView();
-                        } else {
-                            if (null != basePortraitView && null != baseLandscapeView) {
-                                //当前是竖屏
-                                if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                                    showPortraitView();
-                                } else {
-                                    showLandscapeView();
-                                }
-                            } else {
-                                showPortraitView();
-                            }
-                        }
+                        showControlView();
                     }
                 });
             }
         });
+//        post(new Runnable() {
+//            @Override
+//            public void run() {
+//                initView();
+//                if (null != componentListener && null != basePortraitView) {
+//                    initPortraitView(basePortraitView, componentListener);
+//                }
+//                LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT);
+//                LinearLayout lineLayout = new LinearLayout(context);
+//                lineLayout.setOrientation(LinearLayout.VERTICAL);
+//                lineLayout.setLayoutParams(params);
+//                lineLayout.setGravity(Gravity.CENTER );
+//                lineLayout.setClickable(true);
+//                lineLayout.setBackgroundColor(ContextCompat.getColor(context,R.color.black));
+//
+//                addView(lineLayout);
+//            }
+//        });
+    }
+
+    /**
+     * 显示控制UI
+     */
+    private void showControlView() {
+        //获取当前屏幕朝向
+        if (null == newConfig) {
+            showPortraitView();
+        } else {
+            if (null != basePortraitView && null != baseLandscapeView) {
+                //当前是竖屏
+                if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                    showPortraitView();
+                } else {
+                    showLandscapeView();
+                }
+            } else {
+                showPortraitView();
+            }
+        }
+        if (null != delayHideViewAction) {
+            removeCallbacks(delayHideViewAction);
+            postDelayed(delayHideViewAction, 10 * 1000);
+        }
+
+    }
+
+    /**
+     * 初始化视图
+     */
+    private void initView() {
+        //隐藏视图
+        delayHideViewAction = new Runnable() {
+            @Override
+            public void run() {
+                if (null != basePortraitView) {
+                    basePortraitView.setVisibility(GONE);
+                }
+                if (null != baseLandscapeView) {
+                    baseLandscapeView.setVisibility(GONE);
+                }
+            }
+        };
+
+        if (-1 != getPortraitControllViewId()) {
+            basePortraitView = LayoutInflater.from(context).inflate(getPortraitControllViewId(), /* root= */ null);
+//            if (null != fl_root && null != basePortraitView) {
+//                fl_root.addView(basePortraitView);
+//            }
+            addView(basePortraitView);
+        }
+        if (-1 != getLandscapeControllViewId()) {
+            baseLandscapeView = LayoutInflater.from(context).inflate(getLandscapeControllViewId(), /* root= */ null);
+//            if (null != fl_root && null != baseLandscapeView) {
+//                fl_root.addView(baseLandscapeView);
+//            }
+            addView(baseLandscapeView);
+        }
+        basePortraitView.setVisibility(VISIBLE);
+        if (null != baseLandscapeView) {
+            baseLandscapeView.setVisibility(GONE);
+        }
+        if (null != delayHideViewAction) {
+            removeCallbacks(delayHideViewAction);
+            postDelayed(delayHideViewAction, 10 * 1000);
+        }
     }
     /**
@@ -385,19 +328,20 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
      * 显示横屏
      */
     private void showLandscapeView() {
-        if (null == baseLandscapeView) {
-            return;
-        }
-        if (baseLandscapeView.getVisibility() == View.VISIBLE) {
-            baseLandscapeView.setVisibility(View.GONE);
-        } else {
-            baseLandscapeView.setVisibility(View.VISIBLE);
-        }
+        //当前有横屏UI
+        if (null != baseLandscapeView) {
+            if (baseLandscapeView.getVisibility() == View.VISIBLE) {
+                baseLandscapeView.setVisibility(View.GONE);
+            } else {
+                baseLandscapeView.setVisibility(View.VISIBLE);
+            }
-        if (null != basePortraitView) {
-            basePortraitView.setVisibility(View.GONE);
+            if (null != basePortraitView) {
+                basePortraitView.setVisibility(View.GONE);
+            }
+        } else {
+            basePortraitView.setVisibility(View.VISIBLE);
         }
-
     }
     /**
@@ -407,11 +351,7 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         if (null == basePortraitView) {
             return;
         }
-        if (basePortraitView.getVisibility() == View.VISIBLE) {
-            basePortraitView.setVisibility(View.GONE);
-        } else {
-            basePortraitView.setVisibility(View.VISIBLE);
-        }
+        basePortraitView.setVisibility(View.VISIBLE);
         if (null != baseLandscapeView) {
             baseLandscapeView.setVisibility(GONE);
         }
@@ -554,35 +494,6 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
 //        updateShuffleButton();
 //    }
-    /**
-     * Returns whether the VR button is shown.
-     */
-//    public boolean getShowVrButton() {
-//        return vrButton != null && vrButton.getVisibility() == VISIBLE;
-//    }
-
-    /**
-     * Sets whether the VR button is shown.
-     *
-     * @param showVrButton Whether the VR button is shown.
-     */
-//    public void setShowVrButton(boolean showVrButton) {
-//        if (vrButton != null) {
-//            vrButton.setVisibility(showVrButton ? VISIBLE : GONE);
-//        }
-//    }
-
-    /**
-     * Sets listener for the VR button.
-     *
-     * @param onClickListener Listener for the VR button, or null to clear the listener.
-     */
-//    public void setVrButtonListener(@Nullable OnClickListener onClickListener) {
-//        if (vrButton != null) {
-//            vrButton.setOnClickListener(onClickListener);
-//        }
-//    }
-
     /**
      * Shows the playback controls. If {@link #getShowTimeoutMs()} is positive then the controls will
@@ -775,7 +686,7 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
      * 更新进度条
      */
     private void updateProgress() {
-        if (!isVisible() || !isAttachedToWindow) {
+        if (!isVisible() || !isAttachedToWindow || null == basePortraitView) {
             return;
         }
         long position = 0;
@@ -783,23 +694,18 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
             position = player.getContentPosition();
         }
         Log.e(TAG, "updateProgress: " + position);
-//        if (positionView != null && !scrubbing) {
-//            positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
-//        }
-//        if (progressUpdateListener != null) {
-//            progressUpdateListener.onProgressUpdate(position, bufferedPosition);
-//        }
         //先移除之前的动作
         removeCallbacks(updateProgressAction);
         int playbackState = player == null ? Player.STATE_IDLE : player.getPlaybackState();
-        onProgressChange(position, Util.getStringForTime(formatBuilder, formatter, position));
         if (player != null && player.isPlaying()) {
             postDelayed(updateProgressAction, MAX_UPDATE_INTERVAL_MS);
+            onProgressChange(position, Util.getStringForTime(formatBuilder, formatter, position));
         } else if (playbackState != Player.STATE_ENDED && playbackState != Player.STATE_IDLE) {
             postDelayed(updateProgressAction, MAX_UPDATE_INTERVAL_MS);
         }
     }
+
 //    private void requestPlayPauseFocus() {
 //        boolean shouldShowPauseButton = shouldShowPauseButton();
 //        if (!shouldShowPauseButton && playButton != null) {
@@ -818,7 +724,7 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
 //        view.setVisibility(VISIBLE);
 //    }
-    private void previous(VideoPlayer player) {
+    private void previous() {
         Timeline timeline = player.getCurrentTimeline();
         if (timeline.isEmpty() || player.isPlayingAd()) {
             return;
@@ -837,10 +743,8 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
     /**
      * 播放下一个视频
-     *
-     * @param player
      */
-    public void next(VideoPlayer player) {
+    public void next() {
         Timeline timeline = player.getCurrentTimeline();
         if (timeline.isEmpty() || player.isPlayingAd()) {
             return;
@@ -942,7 +846,12 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         isAttachedToWindow = false;
-        removeCallbacks(updateProgressAction);
+        if (null != delayHideViewAction) {
+            removeCallbacks(delayHideViewAction);
+        }
+        if (null != updateProgressAction) {
+            removeCallbacks(updateProgressAction);
+        }
 //        removeCallbacks(hideAction);
     }
@@ -994,10 +903,10 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
                         pauseVideo();
                         break;
                     case KeyEvent.KEYCODE_MEDIA_NEXT:
-                        next(player);
+//                        next(player);
                         break;
                     case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-                        previous(player);
+//                        previous(player);
                         break;
                     default:
                         break;
@@ -1087,13 +996,6 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         }
     }
-    public void setShuffleModeEnabled(boolean isShuffleModeEnabled) {
-        if (null == player) {
-            return;
-        }
-        player.setShuffleModeEnabled(isShuffleModeEnabled);
-//        controlDispatcher.dispatchSetShuffleModeEnabled(player, !player.getShuffleModeEnabled());
-    }
     /**
      * 设置播放模式
@@ -1117,12 +1019,19 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
             //获取当前屏幕朝向
             Configuration mConfiguration = activity.getResources().getConfiguration(); //获取设置的配置信息
             int ori = mConfiguration.orientation; //获取屏幕方向
-            if (ori == mConfiguration.ORIENTATION_LANDSCAPE) {
+            if (ori == Configuration.ORIENTATION_LANDSCAPE) {
                 //强制为竖屏
                 activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            } else if (ori == mConfiguration.ORIENTATION_PORTRAIT) {
+            } else if (ori == Configuration.ORIENTATION_PORTRAIT) {
                 //强制为横屏
                 activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                //修改当前UI宽高
+                LayoutParams lp = (LayoutParams) getLayoutParams();
+                lp.setMargins(0, 0, 0, 0);
+                lp.height = ViewGroup.LayoutParams.MATCH_PARENT;
+                lp.width = ViewGroup.LayoutParams.MATCH_PARENT;
+                lp.gravity = Gravity.CENTER;
+                setLayoutParams(lp);
             }
         }
     }
@@ -1131,21 +1040,7 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         this.newConfig = newConfig;
-        //竖屏
-        if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-            showPortraitView();
-//            if (null != baseLandscapeView) {
-//                baseLandscapeView.setVisibility(GONE);
-//            }
-//            if (null != basePortraitView) {
-//                basePortraitView.setVisibility(VISIBLE);
-//            }
-        }
-        //横屏
-        else {
-            //隐藏状态栏
-            showLandscapeView();
-        }
+        showControlView();
     }
     /**
@@ -1243,7 +1138,9 @@ public abstract class CNLiveBaseVideoControlView extends FrameLayout implements 
         }
     }
-    /**获取格式化后的时间
+    /**
+     * 获取格式化后的时间
+     *
      * @param duration
      * @return
      */
@@ -29,6 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import androidx.annotation.ColorInt;
 import androidx.annotation.IntDef;
@@ -42,9 +43,11 @@ import com.google.android.exoplayer2.DefaultControlDispatcher;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.PlaybackPreparer;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.analytics.AnalyticsListener;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.flac.PictureFrame;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.text.Cue;
@@ -63,13 +66,18 @@ import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView;
 import com.google.android.exoplayer2.video.VideoListener;
+import java.io.IOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
-public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProvider {
+public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProvider, AnalyticsListener {
+
+
+    private String TAG = this.getClass().getName();
+
     /**
      * Determines when the buffering view is shown. One of {@link #SHOW_BUFFERING_NEVER}, {@link
      * #SHOW_BUFFERING_WHEN_PLAYING} or {@link #SHOW_BUFFERING_ALWAYS}.
@@ -118,7 +126,7 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
     @Nullable
     private final View bufferingView;
     @Nullable
-    private final TextView errorMessageView;
+    private final LinearLayout errorMessageView;
     @Nullable
     private CNLiveBaseVideoControlView controller;
     @Nullable
@@ -177,6 +185,8 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
         componentListener = new CNLiveVideoView.ComponentListener();
         //初始化videoplayer
         player = new VideoPlayer(context);
+        //添加事件监听
+        player.addAnalyticsListener(this);
         if (isInEditMode()) {
             contentFrame = null;
             shutterView = null;
@@ -313,7 +323,13 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
         if (errorMessageView != null) {
             errorMessageView.setVisibility(View.GONE);
         }
-
+        errorMessageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                errorMessageView.setVisibility(GONE);
+                player.retry();
+            }
+        });
         // Playback control view.
         CNLiveBaseVideoControlView customController = findViewById(R.id.cnlive_controller);
         controllerPlaceholder = findViewById(R.id.cnlive_controller_placeholder);
@@ -399,8 +415,14 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
             controller.addVisibilityListener(/* listener= */ componentListener);
         }
         Uri mp4VideoUri = Uri.parse("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
-        player.setDataSource(mp4VideoUri);
-        player.prepare(false);
+        List<String> list = new ArrayList<>();
+        list.add("https://qq.com-ok-qq.com/20191005/24249_f5e36323/index.m3u8");
+        list.add("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
+        list.add("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
+
+
+        player.setDataSource(list);
+        player.prepare();
         setPlayer(player);
         controllerPlaceholder.setOnClickListener(new OnClickListener() {
             @Override
@@ -763,16 +785,6 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
         return controller != null && controller.isVisible();
     }
-    /**
-     * Shows the playback controls. Does nothing if playback controls are disabled.
-     *
-     * <p>The playback controls are automatically hidden during playback after {{@link
-     * #getControllerShowTimeoutMs()}}. They are shown indefinitely when playback has not started yet,
-     * is paused, has ended or failed.
-     */
-    public void showController() {
-        showController(shouldShowControllerIndefinitely());
-    }
     /**
      * Hides the playback controls. Does nothing if playback controls are disabled.
@@ -807,7 +819,7 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
         this.controllerShowTimeoutMs = controllerShowTimeoutMs;
         if (controller.isVisible()) {
             // Update the controller's timeout if necessary.
-            showController();
+//            showController();
         }
     }
@@ -838,16 +850,6 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
         return controllerAutoShow;
     }
-    /**
-     * Sets whether the playback controls are automatically shown when playback starts, pauses, ends,
-     * or fails. If set to false, the playback controls can be manually operated with {@link
-     * #showController()} and {@link #hideController()}.
-     *
-     * @param controllerAutoShow Whether the playback controls are allowed to show automatically.
-     */
-    public void setControllerAutoShow(boolean controllerAutoShow) {
-        this.controllerAutoShow = controllerAutoShow;
-    }
     /**
      * Sets whether the playback controls are hidden when ads are playing. Controls are always shown
@@ -1166,13 +1168,6 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
                 || !player.getPlayWhenReady());
     }
-    private void showController(boolean showIndefinitely) {
-        if (!useController()) {
-            return;
-        }
-//        controller.setShowTimeoutMs(showIndefinitely ? 0 : controllerShowTimeoutMs);
-        controller.show();
-    }
     private boolean isPlayingAd() {
         return player != null && player.isPlayingAd() && player.getPlayWhenReady();
@@ -1295,21 +1290,21 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
     }
     private void updateErrorMessage() {
-        if (errorMessageView != null) {
-            if (customErrorMessage != null) {
-                errorMessageView.setText(customErrorMessage);
-                errorMessageView.setVisibility(View.VISIBLE);
-                return;
-            }
-            @Nullable ExoPlaybackException error = player != null ? player.getPlaybackError() : null;
-            if (error != null && errorMessageProvider != null) {
-                CharSequence errorMessage = errorMessageProvider.getErrorMessage(error).second;
-                errorMessageView.setText(errorMessage);
-                errorMessageView.setVisibility(View.VISIBLE);
-            } else {
-                errorMessageView.setVisibility(View.GONE);
-            }
-        }
+//        if (errorMessageView != null) {
+//            if (customErrorMessage != null) {
+//                errorMessageView.setText(customErrorMessage);
+//                errorMessageView.setVisibility(View.VISIBLE);
+//                return;
+//            }
+//            @Nullable ExoPlaybackException error = player != null ? player.getPlaybackError() : null;
+//            if (error != null && errorMessageProvider != null) {
+//                CharSequence errorMessage = errorMessageProvider.getErrorMessage(error).second;
+//                errorMessageView.setText(errorMessage);
+//                errorMessageView.setVisibility(View.VISIBLE);
+//            } else {
+//                errorMessageView.setVisibility(View.GONE);
+//            }
+//        }
     }
     private void updateContentDescription() {
@@ -1491,17 +1486,6 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
     }
-    /**
-     * 设置播放进度条的颜色
-     *
-     * @param color
-     */
-//    public void setPlayedProgressColor(@ColorInt int color) {
-//        if (null != controller && controller instanceof CNLiveBaseVideoControlView) {
-//            CNLiveBaseVideoControlView controlView = controller;
-//            controller.setPlayedColor(color);
-//        }
-//    }
     public void onBackPress() {
         if (null != controller) {
             controller.onBackPress();
@@ -1539,5 +1523,86 @@ public class CNLiveVideoView extends FrameLayout implements AdsLoader.AdViewProv
             }
         }
     }
+
+    @Override
+    public void onLoadingChanged(EventTime eventTime, boolean isLoading) {
+        if (null == bufferingView) {
+            return;
+        }
+//        if (isLoading) {
+//            bufferingView.setVisibility(VISIBLE);
+//        } else {
+//            bufferingView.setVisibility(GONE);
+//        }
+        Log.e(TAG, "onLoadingChanged: ");
+    }
+
+    @Override
+    public void onLoadCanceled(EventTime eventTime, MediaSourceEventListener.LoadEventInfo loadEventInfo, MediaSourceEventListener.MediaLoadData mediaLoadData) {
+        if (null == bufferingView) {
+            return;
+        }
+        bufferingView.setVisibility(GONE);
+        Log.e(TAG, "onLoadCanceled: ");
+    }
+
+    @Override
+    public void onLoadStarted(EventTime eventTime, MediaSourceEventListener.LoadEventInfo loadEventInfo, MediaSourceEventListener.MediaLoadData mediaLoadData) {
+        Log.e(TAG, "onLoadStarted: ");
+        bufferingView.setVisibility(VISIBLE);
+    }
+
+    @Override
+    public void onPlayerError(EventTime eventTime, ExoPlaybackException error) {
+        if (null != errorMessageView) {
+            errorMessageView.setVisibility(VISIBLE);
+        }
+        // 报错
+        switch (error.type) {
+            case ExoPlaybackException.TYPE_SOURCE:
+                // 加载资源时出错
+                break;
+            case ExoPlaybackException.TYPE_RENDERER:
+                // 渲染时出错
+                break;
+            case ExoPlaybackException.TYPE_UNEXPECTED:
+                // 意外的错误
+                break;
+        }
+    }
+
+    @Override
+    public void onLoadCompleted(EventTime eventTime, MediaSourceEventListener.LoadEventInfo loadEventInfo, MediaSourceEventListener.MediaLoadData mediaLoadData) {
+        bufferingView.setVisibility(GONE);
+    }
+
+    @Override
+    public void onLoadError(EventTime eventTime, MediaSourceEventListener.LoadEventInfo loadEventInfo, MediaSourceEventListener.MediaLoadData mediaLoadData, IOException error, boolean wasCanceled) {
+        bufferingView.setVisibility(GONE);
+    }
+
+    @Override
+    public void onPlayerStateChanged(EventTime eventTime, boolean playWhenReady, int playbackState) {
+        switch (playbackState) {
+            case Player.STATE_IDLE:
+                Log.e(TAG, "空闲 ");
+                // 空闲
+                break;
+            case Player.STATE_BUFFERING:
+                // 缓冲中
+                Log.e(TAG, "缓冲中 ");
+                break;
+            case Player.STATE_READY:
+                Log.e(TAG, "准备好 ");
+
+                // 准备好
+                break;
+            case Player.STATE_ENDED:
+                // 结束
+                break;
+            default:
+                break;
+        }
+    }
 }
+package com.libs.video.video.exoplayer;
+
+import android.net.Uri;
+
+import java.util.List;
+
+/**
+ * 多资源播放
+ */
+public interface IVideoMultDataSource {
+    List<String> getDataSourceId();
+
+    List<String> getDataSourceType();
+
+    List<String> getPlayUri();
+}
@@ -19,16 +19,17 @@ import com.google.android.exoplayer2.ui.PlayerView;
 import com.libs.video.video.base.IDataSource;
 import com.libs.video.video.base.IMediaPlayer;
+import java.util.List;
+
 public interface IVideoPlayer {
-    //    /**
-//     * 设置播放资源
-//     *
-//     * @param data
-//     */
+    void setDataSource(IVideoMultDataSource data);
+
     void setDataSource(IVideoDataSource data);
     void setDataSource(Uri data);
+    void setDataSource(List<String> data);
+
     void setPlayView(CNLiveVideoView playView);
     void play() throws IllegalStateException;
@@ -39,7 +40,11 @@ public interface IVideoPlayer {
     void prepare();
-    void prepare(boolean isPlay);
+    void retry();
+
+    void onPause();
+
+    void onDestroy();
     void setForegroundMode(boolean foregroundMode);
@@ -13,6 +13,7 @@ import androidx.appcompat.widget.AppCompatSeekBar;
 import androidx.core.content.ContextCompat;
 import com.cnlive.cloud.video.R;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 public class MyTestControlView extends CNLiveBaseVideoControlView {
     private View playButton;
@@ -70,11 +71,14 @@ public class MyTestControlView extends CNLiveBaseVideoControlView {
     }
     @Override
+//    protected int getLandscapeControllViewId() {
+//        return R.layout.layout_landscape_control_view;
+//    }
+
     protected int getLandscapeControllViewId() {
-        return R.layout.layout_landscape_control_view;
+        return -1;
     }
-
     @Override
     protected void onViewClick(View view) {
         if (view.getId() == R.id.btn_start) {
@@ -109,4 +113,13 @@ public class MyTestControlView extends CNLiveBaseVideoControlView {
         seekBar.setMax((int) duration);
     }
-}
+    @Override
+    public void onLoadStarted(EventTime eventTime, MediaSourceEventListener.LoadEventInfo loadEventInfo, MediaSourceEventListener.MediaLoadData mediaLoadData) {
+        super.onLoadStarted(eventTime, loadEventInfo, mediaLoadData);
+    }
+
+    @Override
+    public void onLoadCompleted(EventTime eventTime, MediaSourceEventListener.LoadEventInfo loadEventInfo, MediaSourceEventListener.MediaLoadData mediaLoadData) {
+        super.onLoadCompleted(eventTime, loadEventInfo, mediaLoadData);
+    }
+}
 \ No newline at end of file
@@ -15,6 +15,8 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
 import com.google.android.exoplayer2.ext.rtmp.RtmpDataSourceFactory;
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -208,8 +210,31 @@ public class VideoPlayer implements IVideoPlayer {
         return buffer.toString();
     }
+    /**
+     * 多资源播放
+     *
+     * @param data
+     */
+    @Override
+    public void setDataSource(IVideoMultDataSource data) {
+        if (null != data && null != data.getPlayUri()) {
+            MediaSource[] mediaSources = new MediaSource[data.getPlayUri().size()];
+            for (int i = 0; i < data.getPlayUri().size(); i++) {
+                mediaSources[i] = getPlayerMediaSource(data.getPlayUri().get(i));
+            }
+            currentMediaSource =
+                    new ConcatenatingMediaSource(mediaSources);
+        }
+
+//        LoopingMediaSource firstSourceTwice = new LoopingMediaSource(firstSource, 2);
+
+    }
+
     @Override
     public void setDataSource(IVideoDataSource data) {
+        ConcatenatingMediaSource concatenatedSource =
+                new ConcatenatingMediaSource();
+
         mDataSource = null;
         mDataSource = data;
         Map<String, String> probeData = new HashMap<>();
@@ -270,6 +295,18 @@ public class VideoPlayer implements IVideoPlayer {
     }
     @Override
+    public void setDataSource(List<String> data) {
+        if (null != data) {
+            MediaSource[] mediaSources = new MediaSource[data.size()];
+            for (int i = 0; i < data.size(); i++) {
+                mediaSources[i] = getPlayerMediaSource(data.get(i));
+            }
+            currentMediaSource =
+                    new ConcatenatingMediaSource(mediaSources);
+        }
+    }
+
+    @Override
     public void setPlayView(CNLiveVideoView playView) {
     }
@@ -350,13 +387,29 @@ public class VideoPlayer implements IVideoPlayer {
     }
     @Override
-    public void prepare(boolean isPlay) {
-        if (null != currentMediaSource && null != player) {
-            player.prepare(currentMediaSource);
-            player.setPlayWhenReady(isPlay);
+    public void retry() {
+        if (null != player) {
+            player.retry();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (player != null) {
+            player.setPlayWhenReady(false);
         }
     }
+    @Override
+    public void onDestroy() {
+        if (player != null) {
+            player.stop();
+            player.release();
+            player = null;
+        }
+    }
+
+
     private MediaSource getPlayerMediaSource(String playerUrl) {
         if (TextUtils.isEmpty(playerUrl)) {
             return null;
@@ -536,18 +589,18 @@ public class VideoPlayer implements IVideoPlayer {
      */
     @Override
     public int getCurrentWindowIndex() {
-        int result=0;
+        int result = 0;
         if (null != player) {
-            result=player.getCurrentWindowIndex();
+            result = player.getCurrentWindowIndex();
         }
         return result;
     }
     @Override
     public long getDuration() {
-        long result=0;
+        long result = 0;
         if (null != player) {
-            result=player.getDuration();
+            result = player.getDuration();
         }
         return result;
     }
@@ -11,7 +11,7 @@
     <item android:id="@android:id/secondaryProgress" >
         <clip>
             <shape>
-                <solid android:color="#bdbdbd"/>
+                <solid android:color="@color/btnCancel"/>
             </shape>
         </clip>
     </item>
@@ -25,21 +25,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-        <ProgressBar
-            android:id="@id/cnlive_buffering"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:indeterminate="true" />
-
-        <TextView
-            android:id="@id/cnlive_error_message"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:background="@color/exo_error_message_background_color"
-            android:gravity="center"
-            android:padding="16dp" />
     </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
@@ -58,4 +43,25 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+    <ProgressBar
+        android:id="@id/cnlive_buffering"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true" />
+
+    <LinearLayout
+        android:id="@id/cnlive_error_message"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="刷新" />
+    </LinearLayout>
 </merge>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/rl_protrait_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/transparent"
     android:orientation="vertical">
     <LinearLayout
@@ -15,7 +16,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
         android:background="@drawable/bg_cnvideo_bottom"
         android:gravity="center_vertical">
@@ -63,4 +64,4 @@
     </LinearLayout>
-</RelativeLayout>
 \ No newline at end of file
+</FrameLayout>
 \ No newline at end of file