Răsfoiți Sursa

修改视频播放音频焦点抢占问题

杨充 5 ani în urmă
părinte
comite
53c04558cf
40 a modificat fișierele cu 47 adăugiri și 60 ștergeri
  1. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/config/PlayerConfig.java
  2. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/BaseVideoController.java
  3. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/GestureVideoController.java
  4. 14 8
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/AudioFocusHelper.java
  5. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/ProgressManager.java
  6. 3 5
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/VideoPlayer.java
  7. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/VideoViewManager.java
  8. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/surface/MeasureHelper.java
  9. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/utils/PlayerUtils.java
  10. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/BasisVideoController.java
  11. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomBottomView.java
  12. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomCompleteView.java
  13. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomErrorView.java
  14. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomGestureView.java
  15. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomLiveControlView.java
  16. 1 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomPrepareView.java
  17. 0 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomTitleView.java
  18. 1 2
      app/src/main/java/org/yczbj/ycvideoplayer/BaseApplication.java
  19. 2 2
      app/src/main/java/org/yczbj/ycvideoplayer/activity/DetailActivity.java
  20. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/activity/MultipleActivity.java
  21. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/activity/NormalActivity.java
  22. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/activity/TypeActivity.java
  23. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/ad/AdActivity.java
  24. 0 1
      app/src/main/java/org/yczbj/ycvideoplayer/ad/AdControlView.java
  25. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/clarity/ClarityActivity.java
  26. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/danmu/DanmuActivity.java
  27. 0 1
      app/src/main/java/org/yczbj/ycvideoplayer/danmu/MyDanmakuView.java
  28. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/list/ListVideoActivity.java
  29. 2 2
      app/src/main/java/org/yczbj/ycvideoplayer/list/RecyclerViewFragment.java
  30. 1 2
      app/src/main/java/org/yczbj/ycvideoplayer/list/SeamlessPlayFragment.java
  31. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTok2Activity.java
  32. 0 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokRenderView.java
  33. 0 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokView.java
  34. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiny/TestFullActivity.java
  35. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiny/TinyScreenActivity.java
  36. 1 1
      app/src/main/res/layout/activity_ad_video.xml
  37. 1 1
      app/src/main/res/layout/activity_danmu_player.xml
  38. 1 1
      app/src/main/res/layout/activity_full_video1.xml
  39. 2 2
      app/src/main/res/layout/activity_multiple_play.xml
  40. 1 1
      app/src/main/res/layout/activity_normal_video.xml

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/config/PlayerConfig.java

@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
 
 import com.yc.kernel.factory.PlayerFactory;
 import com.yc.kernel.impl.media.MediaPlayerFactory;
-import org.yczbj.ycvideoplayerlib.player.manager.ProgressManager;
+import org.yczbj.ycvideoplayerlib.player.ProgressManager;
 import org.yczbj.ycvideoplayerlib.surface.SurfaceViewFactory;
 import org.yczbj.ycvideoplayerlib.surface.TextureViewFactory;
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/BaseVideoController.java

@@ -17,8 +17,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.StatesCutoutUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.NetworkUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/GestureVideoController.java

@@ -14,7 +14,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 import java.util.Map;

+ 14 - 8
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/audio/AudioFocusHelper.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/AudioFocusHelper.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.player.audio;
+package org.yczbj.ycvideoplayerlib.player;
 
 import android.content.Context;
 import android.media.AudioManager;
@@ -7,7 +7,7 @@ import android.os.Looper;
 
 import androidx.annotation.NonNull;
 
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 
 import java.lang.ref.WeakReference;
 
@@ -55,24 +55,30 @@ public final class AudioFocusHelper implements AudioManager.OnAudioFocusChangeLi
             return;
         }
         switch (focusChange) {
-            case AudioManager.AUDIOFOCUS_GAIN://获得焦点
-            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT://暂时获得焦点
+            case AudioManager.AUDIOFOCUS_GAIN:
+                //获得焦点
+            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
+                //暂时获得焦点
                 if (mStartRequested || mPausedForLoss) {
                     videoView.start();
                     mStartRequested = false;
                     mPausedForLoss = false;
                 }
-                if (!videoView.isMute())//恢复音量
+                if (!videoView.isMute())
+                    //恢复音量
                     videoView.setVolume(1.0f, 1.0f);
                 break;
-            case AudioManager.AUDIOFOCUS_LOSS://焦点丢失
-            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT://焦点暂时丢失
+            case AudioManager.AUDIOFOCUS_LOSS:
+                //焦点丢失
+            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                //焦点暂时丢失
                 if (videoView.isPlaying()) {
                     mPausedForLoss = true;
                     videoView.pause();
                 }
                 break;
-            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK://此时需降低音量
+            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+                //此时需降低音量
                 if (videoView.isPlaying() && !videoView.isMute()) {
                     videoView.setVolume(0.1f, 0.1f);
                 }

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/manager/ProgressManager.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/ProgressManager.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.player.manager;
+package org.yczbj.ycvideoplayerlib.player;
 
 /**
  * 播放进度管理器,继承此接口实现自己的进度管理器。

+ 3 - 5
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/video/VideoPlayer.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/VideoPlayer.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.player.video;
+package org.yczbj.ycvideoplayerlib.player;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -12,7 +12,6 @@ import android.os.Build;
 import android.os.Parcelable;
 
 import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.text.TextUtils;
@@ -26,12 +25,11 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.BaseVideoController;
 import org.yczbj.ycvideoplayerlib.controller.MediaPlayerControl;
-import org.yczbj.ycvideoplayerlib.player.audio.AudioFocusHelper;
+
 import com.yc.kernel.inter.AbstractPlayer;
 import com.yc.kernel.factory.PlayerFactory;
-import org.yczbj.ycvideoplayerlib.player.manager.ProgressManager;
+
 import org.yczbj.ycvideoplayerlib.config.PlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
 import org.yczbj.ycvideoplayerlib.surface.ISurfaceView;
 import org.yczbj.ycvideoplayerlib.surface.SurfaceViewFactory;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/manager/VideoViewManager.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/VideoViewManager.java

@@ -1,9 +1,9 @@
-package org.yczbj.ycvideoplayerlib.player.manager;
+package org.yczbj.ycvideoplayerlib.player;
 
 import android.app.Application;
 
 import org.yczbj.ycvideoplayerlib.config.PlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+
 import com.yc.kernel.utils.VideoLogUtils;
 
 import java.util.LinkedHashMap;

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/surface/MeasureHelper.java

@@ -3,7 +3,6 @@ package org.yczbj.ycvideoplayerlib.surface;
 import android.view.View;
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 
 
 public class MeasureHelper {

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/utils/PlayerUtils.java

@@ -44,7 +44,7 @@ import androidx.appcompat.view.ContextThemeWrapper;
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.PlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
 
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/BasisVideoController.java

@@ -32,7 +32,6 @@ import androidx.annotation.Nullable;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.GestureVideoController;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomBottomView.java

@@ -40,7 +40,6 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 /**

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomCompleteView.java

@@ -33,7 +33,6 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomErrorView.java

@@ -31,7 +31,6 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 
 
 /**

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomGestureView.java

@@ -33,7 +33,6 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IGestureComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 /**

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomLiveControlView.java

@@ -31,7 +31,6 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 

+ 1 - 3
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomPrepareView.java

@@ -32,9 +32,7 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
-
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
 
 
 /**

+ 0 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomTitleView.java

@@ -36,7 +36,6 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 

+ 1 - 2
app/src/main/java/org/yczbj/ycvideoplayer/BaseApplication.java

@@ -10,8 +10,7 @@ import com.yc.kernel.impl.ijk.IjkPlayerFactory;
 import com.yc.kernel.utils.VideoLogUtils;
 
 import org.yczbj.ycvideoplayerlib.config.PlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
 
 /**
  * ================================================

+ 2 - 2
app/src/main/java/org/yczbj/ycvideoplayer/activity/DetailActivity.java

@@ -12,8 +12,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.ViewCompat;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/activity/MultipleActivity.java

@@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 import java.util.ArrayList;

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/activity/NormalActivity.java

@@ -13,7 +13,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 public class NormalActivity extends AppCompatActivity implements View.OnClickListener {

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/activity/TypeActivity.java

@@ -25,7 +25,7 @@ import com.yc.kernel.impl.ijk.IjkPlayerFactory;
 import com.yc.kernel.impl.media.MediaPlayerFactory;
 import com.yc.kernel.factory.PlayerFactory;
 import org.yczbj.ycvideoplayerlib.config.PlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/ad/AdActivity.java

@@ -14,7 +14,7 @@ import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.cache.ProxyVideoCacheManager;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 

+ 0 - 1
app/src/main/java/org/yczbj/ycvideoplayer/ad/AdControlView.java

@@ -17,7 +17,6 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/clarity/ClarityActivity.java

@@ -12,7 +12,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 import java.util.ArrayList;

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/danmu/DanmuActivity.java

@@ -11,7 +11,7 @@ import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

+ 0 - 1
app/src/main/java/org/yczbj/ycvideoplayer/danmu/MyDanmakuView.java

@@ -21,7 +21,6 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 import master.flame.danmaku.controller.DrawHandler;

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/list/ListVideoActivity.java

@@ -13,7 +13,7 @@ import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 import java.util.List;

+ 2 - 2
app/src/main/java/org/yczbj/ycvideoplayer/list/RecyclerViewFragment.java

@@ -17,8 +17,8 @@ import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 

+ 1 - 2
app/src/main/java/org/yczbj/ycvideoplayer/list/SeamlessPlayFragment.java

@@ -15,8 +15,7 @@ import org.yczbj.ycvideoplayer.activity.DetailActivity;
 import org.yczbj.ycvideoplayer.activity.IntentKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 /**

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTok2Activity.java

@@ -16,7 +16,7 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.cache.PreloadManager;
 import org.yczbj.ycvideoplayer.cache.ProxyVideoCacheManager;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import java.util.ArrayList;

+ 0 - 1
app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokRenderView.java

@@ -9,7 +9,6 @@ import com.yc.kernel.inter.AbstractPlayer;
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.surface.ISurfaceView;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 
 
 /**

+ 0 - 1
app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokView.java

@@ -20,7 +20,6 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
 import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
 
 public class TikTokView extends FrameLayout implements IControlComponent {
 

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/tiny/TestFullActivity.java

@@ -11,7 +11,7 @@ import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

+ 1 - 1
app/src/main/java/org/yczbj/ycvideoplayer/tiny/TinyScreenActivity.java

@@ -16,7 +16,7 @@ import org.yczbj.ycvideoplayer.list.OnItemChildClickListener;
 import org.yczbj.ycvideoplayer.list.VideoRecyclerViewAdapter;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.video.VideoPlayer;
+import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 

+ 1 - 1
app/src/main/res/layout/activity_ad_video.xml

@@ -7,7 +7,7 @@
     android:fitsSystemWindows="true"
     android:background="@color/whiteBg">
 
-    <org.yczbj.ycvideoplayerlib.player.video.VideoPlayer
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>

+ 1 - 1
app/src/main/res/layout/activity_danmu_player.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <org.yczbj.ycvideoplayerlib.player.video.VideoPlayer
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_height="0dp"

+ 1 - 1
app/src/main/res/layout/activity_full_video1.xml

@@ -8,7 +8,7 @@
     android:background="@color/whiteBg">
 
 
-    <org.yczbj.ycvideoplayerlib.player.video.VideoPlayer
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>

+ 2 - 2
app/src/main/res/layout/activity_multiple_play.xml

@@ -4,13 +4,13 @@
     android:layout_height="match_parent">
 
 
-    <org.yczbj.ycvideoplayerlib.player.video.VideoPlayer
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
         android:id="@+id/video_player1"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>
 
 
-    <org.yczbj.ycvideoplayerlib.player.video.VideoPlayer
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
         android:id="@+id/video_player2"
         android:layout_width="match_parent"
         android:layout_height="180dp"/>

+ 1 - 1
app/src/main/res/layout/activity_normal_video.xml

@@ -7,7 +7,7 @@
     android:fitsSystemWindows="true"
     android:background="@color/whiteBg">
 
-    <org.yczbj.ycvideoplayerlib.player.video.VideoPlayer
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>