Browse Source

优化视频播放器的结构

杨充 5 years ago
parent
commit
47240937cc
100 changed files with 278 additions and 185 deletions
  1. 2 2
      VideoPlayer/src/main/AndroidManifest.xml
  2. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/BaseVideoController.java
  3. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/ControlWrapper.java
  4. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/GestureVideoController.java
  5. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IControlComponent.java
  6. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IGestureComponent.java
  7. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IVideoController.java
  8. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/MediaPlayerControl.java
  9. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/OrientationHelper.java
  10. 0 15
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/player/PlayerFactory.java
  11. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/audio/AudioFocusHelper.java
  12. 7 8
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/config/VideoViewConfig.java
  13. 22 0
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/factory/PlayerFactory.java
  14. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/exo/ExoMediaPlayer.java
  15. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/exo/ExoMediaPlayerFactory.java
  16. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/exo/ExoMediaSourceHelper.java
  17. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/ijk/IjkPlayer.java
  18. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/ijk/IjkPlayerFactory.java
  19. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/ijk/RawDataSourceProvider.java
  20. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/media/AndroidMediaPlayer.java
  21. 5 5
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/media/MediaPlayerFactory.java
  22. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/inter/AbstractPlayer.java
  23. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/manager/ProgressManager.java
  24. 3 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/manager/VideoViewManager.java
  25. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/IRenderView.java
  26. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/MeasureHelper.java
  27. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/RenderViewFactory.java
  28. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/TextureRenderView.java
  29. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/TextureRenderViewFactory.java
  30. 11 11
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/video/VideoView.java
  31. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/manager/VideoPlayerManager.java
  32. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/receiver/BatterReceiver.java
  33. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/receiver/NetChangedReceiver.java
  34. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/utils/PlayerUtils.java
  35. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/surface/VideoSurfaceView.java
  36. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/surface/VideoTextureView.java
  37. 2 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/BasisVideoController.java
  38. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomBottomView.java
  39. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomCompleteView.java
  40. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomErrorView.java
  41. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomGestureView.java
  42. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomLiveControlView.java
  43. 4 4
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomPrepareView.java
  44. 3 3
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/CustomTitleView.java
  45. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/window/FloatPlayerView.java
  46. 2 2
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/controller/VideoPlayerController.java
  47. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/player/VideoMediaPlayer.java
  48. 1 1
      VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/player/VideoPlayer.java
  49. 3 3
      app/src/main/java/org/yczbj/ycvideoplayer/BaseApplication.java
  50. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/MainActivity.java
  51. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestClarityActivity.java
  52. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestEightVideoActivity.java
  53. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestFragment.java
  54. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestFragmentActivity.java
  55. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestFullActivity2.java
  56. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestListFragment.java
  57. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestNormalActivity.java
  58. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestRecyclerActivity.java
  59. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestSavePosActivity.java
  60. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestTinyActivity.java
  61. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/TestWindowActivity.java
  62. 2 2
      app/src/main/java/org/yczbj/ycvideoplayer/activity/DetailActivity.java
  63. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/activity/MultipleActivity.java
  64. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/activity/NormalActivity.java
  65. 8 8
      app/src/main/java/org/yczbj/ycvideoplayer/activity/TypeActivity.java
  66. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/ad/AdActivity.java
  67. 3 3
      app/src/main/java/org/yczbj/ycvideoplayer/ad/AdControlView.java
  68. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/clarity/ClarityActivity.java
  69. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/danmu/DanmuActivity.java
  70. 3 3
      app/src/main/java/org/yczbj/ycvideoplayer/danmu/MyDanmakuView.java
  71. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/list/ListVideoActivity.java
  72. 2 2
      app/src/main/java/org/yczbj/ycvideoplayer/list/PlayerMonitor.java
  73. 2 2
      app/src/main/java/org/yczbj/ycvideoplayer/list/RecyclerViewFragment.java
  74. 2 2
      app/src/main/java/org/yczbj/ycvideoplayer/list/SeamlessPlayFragment.java
  75. 1 2
      app/src/main/java/org/yczbj/ycvideoplayer/list/TestListActivity.java
  76. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTok2Activity.java
  77. 3 3
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokRenderView.java
  78. 3 3
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokRenderViewFactory.java
  79. 3 4
      app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokView.java
  80. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiny/TestFullActivity.java
  81. 1 1
      app/src/main/java/org/yczbj/ycvideoplayer/tiny/TinyScreenActivity.java
  82. 1 1
      app/src/main/res/layout/activity_ad_video.xml
  83. 1 1
      app/src/main/res/layout/activity_danmu_player.xml
  84. 1 1
      app/src/main/res/layout/activity_full_video1.xml
  85. 2 2
      app/src/main/res/layout/activity_multiple_play.xml
  86. 1 1
      app/src/main/res/layout/activity_normal_video.xml
  87. 0 0
      read/01.视频播放器介绍文档.md
  88. 0 0
      read/02.视频播放器整体结构.md
  89. 0 0
      read/04.视频播放器封装思路.md
  90. 19 1
      read/05.播放器内核切换封装.md
  91. 42 0
      read/06.播放器UI抽取封装.md
  92. 0 0
      read/07.MediaPlayer详细介绍.md
  93. 0 0
      read/08.视频播放器优化处理.md
  94. 0 0
      read/09.视频播放器使用设计模式.md
  95. 0 0
      read/10.视频全局悬浮窗播放.md
  96. 0 0
      read/11.视频播放器音频焦点抢占.md
  97. 26 0
      read/12.视频边播边缓存分析.md
  98. 3 0
      read/20.视频播放器版本更新文档.md
  99. 0 0
      read/21.视频播放器后期需求.md
  100. 0 0
      read/22.视频基础概念术语.md

+ 2 - 2
VideoPlayer/src/main/AndroidManifest.xml

@@ -7,8 +7,8 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
 
     <application>
     <application>
-        <receiver android:name=".receiver.BatterReceiver"/>
-        <receiver android:name=".receiver.NetChangedReceiver">
+        <receiver android:name=".tool.receiver.BatterReceiver"/>
+        <receiver android:name=".tool.receiver.NetChangedReceiver">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
             </intent-filter>

+ 3 - 3
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/BaseVideoController.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/BaseVideoController.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Context;
@@ -17,8 +17,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.StatesCutoutUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.StatesCutoutUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.NetworkUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.NetworkUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/ControlWrapper.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/ControlWrapper.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ActivityInfo;

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/GestureVideoController.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/GestureVideoController.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Context;
@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 import java.util.Map;
 import java.util.Map;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/IControlComponent.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IControlComponent.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 import android.view.View;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.Animation;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/IGestureComponent.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IGestureComponent.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 public interface IGestureComponent extends IControlComponent {
 public interface IGestureComponent extends IControlComponent {
     /**
     /**

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/IVideoController.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IVideoController.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 public interface IVideoController {
 public interface IVideoController {
 
 

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/MediaPlayerControl.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/MediaPlayerControl.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 
 

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/controller/OrientationHelper.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/OrientationHelper.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.controller;
+package org.yczbj.ycvideoplayerlib.controller;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.view.OrientationEventListener;
 import android.view.OrientationEventListener;

+ 0 - 15
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/player/PlayerFactory.java

@@ -1,15 +0,0 @@
-package org.yczbj.ycvideoplayerlib.kernel.player;
-
-import android.content.Context;
-
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
-
-/**
- * 此接口使用方法:
- * 1.继承{@link AbstractPlayer}扩展自己的播放器。
- * 2.继承此接口并实现{@link #createPlayer(Context)},返回步骤1中的播放器。
- */
-public abstract class PlayerFactory<T extends AbstractPlayer> {
-
-    public abstract T createPlayer(Context context);
-}

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/helper/AudioFocusHelper.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/audio/AudioFocusHelper.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.helper;
+package org.yczbj.ycvideoplayerlib.player.audio;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.media.AudioManager;
 import android.media.AudioManager;
@@ -7,7 +7,7 @@ import android.os.Looper;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 
 
 import java.lang.ref.WeakReference;
 import java.lang.ref.WeakReference;
 
 

+ 7 - 8
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/player/VideoViewConfig.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/config/VideoViewConfig.java

@@ -1,14 +1,13 @@
-package org.yczbj.ycvideoplayerlib.kernel.player;
+package org.yczbj.ycvideoplayerlib.player.config;
 
 
 
 
-import android.content.Context;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.impl.media.AndroidMediaPlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.render.RenderViewFactory;
-import org.yczbj.ycvideoplayerlib.kernel.render.TextureRenderViewFactory;
-import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
+import org.yczbj.ycvideoplayerlib.player.factory.PlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.impl.media.MediaPlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.manager.ProgressManager;
+import org.yczbj.ycvideoplayerlib.player.render.RenderViewFactory;
+import org.yczbj.ycvideoplayerlib.player.render.TextureRenderViewFactory;
 
 
 
 
 /**
 /**
@@ -47,7 +46,7 @@ public class VideoViewConfig {
         mScreenScaleType = builder.mScreenScaleType;
         mScreenScaleType = builder.mScreenScaleType;
         if (builder.mPlayerFactory == null) {
         if (builder.mPlayerFactory == null) {
             //默认为AndroidMediaPlayer
             //默认为AndroidMediaPlayer
-            mPlayerFactory = AndroidMediaPlayerFactory.create();
+            mPlayerFactory = MediaPlayerFactory.create();
         } else {
         } else {
             mPlayerFactory = builder.mPlayerFactory;
             mPlayerFactory = builder.mPlayerFactory;
         }
         }

+ 22 - 0
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/factory/PlayerFactory.java

@@ -0,0 +1,22 @@
+package org.yczbj.ycvideoplayerlib.player.factory;
+
+import android.content.Context;
+
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
+
+
+/**
+ * <pre>
+ *     @author yangchong
+ *     blog  : https://github.com/yangchong211
+ *     time  : 2018/11/9
+ *     desc  : 此接口使用方法
+ *     revise: 1.继承{@link AbstractPlayer}扩展自己的播放器。
+ *             2.继承此接口并实现{@link #createPlayer(Context)},返回步骤1中的播放器。
+ * </pre>
+ */
+public abstract class PlayerFactory<T extends AbstractPlayer> {
+
+    public abstract T createPlayer(Context context);
+
+}

+ 3 - 3
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/exo/ExoMediaPlayer.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/exo/ExoMediaPlayer.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.exo;
+package org.yczbj.ycvideoplayerlib.player.impl.exo;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetFileDescriptor;
@@ -25,8 +25,8 @@ import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.EventLogger;
 import com.google.android.exoplayer2.util.EventLogger;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoListener;
 import com.google.android.exoplayer2.video.VideoListener;
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/exo/ExoMediaPlayerFactory.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/exo/ExoMediaPlayerFactory.java

@@ -1,8 +1,8 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.exo;
+package org.yczbj.ycvideoplayerlib.player.impl.exo;
 
 
 import android.content.Context;
 import android.content.Context;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.player.PlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.factory.PlayerFactory;
 
 
 
 
 public class ExoMediaPlayerFactory extends PlayerFactory<ExoMediaPlayer> {
 public class ExoMediaPlayerFactory extends PlayerFactory<ExoMediaPlayer> {

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/exo/ExoMediaSourceHelper.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/exo/ExoMediaSourceHelper.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.exo;
+package org.yczbj.ycvideoplayerlib.player.impl.exo;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.net.Uri;
 import android.net.Uri;

+ 3 - 3
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/ijk/IjkPlayer.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/ijk/IjkPlayer.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.ijk;
+package org.yczbj.ycvideoplayerlib.player.impl.ijk;
 
 
 import android.content.ContentResolver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Context;
@@ -11,8 +11,8 @@ import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceHolder;
 
 
 
 
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/ijk/IjkPlayerFactory.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/ijk/IjkPlayerFactory.java

@@ -1,8 +1,8 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.ijk;
+package org.yczbj.ycvideoplayerlib.player.impl.ijk;
 
 
 import android.content.Context;
 import android.content.Context;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.player.PlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.factory.PlayerFactory;
 
 
 
 
 public class IjkPlayerFactory extends PlayerFactory<IjkPlayer> {
 public class IjkPlayerFactory extends PlayerFactory<IjkPlayer> {

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/ijk/RawDataSourceProvider.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/ijk/RawDataSourceProvider.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.ijk;
+package org.yczbj.ycvideoplayerlib.player.impl.ijk;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetFileDescriptor;

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/media/AndroidMediaPlayer.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/media/AndroidMediaPlayer.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.media;
+package org.yczbj.ycvideoplayerlib.player.impl.media;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetFileDescriptor;
@@ -8,7 +8,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Build;
 import android.view.Surface;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceHolder;
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**

+ 5 - 5
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/impl/media/AndroidMediaPlayerFactory.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/impl/media/MediaPlayerFactory.java

@@ -1,16 +1,16 @@
-package org.yczbj.ycvideoplayerlib.kernel.impl.media;
+package org.yczbj.ycvideoplayerlib.player.impl.media;
 
 
 import android.content.Context;
 import android.content.Context;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.player.PlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.factory.PlayerFactory;
 
 
 /**
 /**
  * 创建{@link AndroidMediaPlayer}的工厂类,不推荐,系统的MediaPlayer兼容性较差,建议使用IjkPlayer或者ExoPlayer
  * 创建{@link AndroidMediaPlayer}的工厂类,不推荐,系统的MediaPlayer兼容性较差,建议使用IjkPlayer或者ExoPlayer
  */
  */
-public class AndroidMediaPlayerFactory extends PlayerFactory<AndroidMediaPlayer> {
+public class MediaPlayerFactory extends PlayerFactory<AndroidMediaPlayer> {
 
 
-    public static AndroidMediaPlayerFactory create() {
-        return new AndroidMediaPlayerFactory();
+    public static MediaPlayerFactory create() {
+        return new MediaPlayerFactory();
     }
     }
 
 
     @Override
     @Override

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/inter/AbstractPlayer.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/inter/AbstractPlayer.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.inter;
+package org.yczbj.ycvideoplayerlib.player.inter;
 
 
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetFileDescriptor;
 import android.view.Surface;
 import android.view.Surface;

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

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

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

@@ -1,8 +1,9 @@
-package org.yczbj.ycvideoplayerlib.kernel.player;
+package org.yczbj.ycvideoplayerlib.player.manager;
 
 
 import android.app.Application;
 import android.app.Application;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.config.VideoViewConfig;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 
 import java.util.LinkedHashMap;
 import java.util.LinkedHashMap;

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/render/IRenderView.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/IRenderView.java

@@ -1,11 +1,11 @@
-package org.yczbj.ycvideoplayerlib.kernel.render;
+package org.yczbj.ycvideoplayerlib.player.render;
 
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 import android.view.View;
 import android.view.View;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
 
 
 
 
 public interface IRenderView {
 public interface IRenderView {

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/render/MeasureHelper.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/MeasureHelper.java

@@ -1,8 +1,8 @@
-package org.yczbj.ycvideoplayerlib.kernel.render;
+package org.yczbj.ycvideoplayerlib.player.render;
 
 
 import android.view.View;
 import android.view.View;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 
 
 
 
 public class MeasureHelper {
 public class MeasureHelper {

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/render/RenderViewFactory.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/RenderViewFactory.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.render;
+package org.yczbj.ycvideoplayerlib.player.render;
 
 
 import android.content.Context;
 import android.content.Context;
 
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/render/TextureRenderView.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/TextureRenderView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.render;
+package org.yczbj.ycvideoplayerlib.player.render;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
 
 
 
 
 @SuppressLint("ViewConstructor")
 @SuppressLint("ViewConstructor")

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/render/TextureRenderViewFactory.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/render/TextureRenderViewFactory.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.render;
+package org.yczbj.ycvideoplayerlib.player.render;
 
 
 import android.content.Context;
 import android.content.Context;
 
 

+ 11 - 11
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/kernel/view/VideoView.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/player/video/VideoView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.kernel.view;
+package org.yczbj.ycvideoplayerlib.player.video;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentResolver;
@@ -21,16 +21,16 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.BaseVideoController;
-import org.yczbj.ycvideoplayerlib.kernel.controller.MediaPlayerControl;
-import org.yczbj.ycvideoplayerlib.kernel.helper.AudioFocusHelper;
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
-import org.yczbj.ycvideoplayerlib.kernel.player.PlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.player.ProgressManager;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewConfig;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.render.IRenderView;
-import org.yczbj.ycvideoplayerlib.kernel.render.RenderViewFactory;
+import org.yczbj.ycvideoplayerlib.controller.BaseVideoController;
+import org.yczbj.ycvideoplayerlib.controller.MediaPlayerControl;
+import org.yczbj.ycvideoplayerlib.player.audio.AudioFocusHelper;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.factory.PlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.manager.ProgressManager;
+import org.yczbj.ycvideoplayerlib.player.config.VideoViewConfig;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.render.IRenderView;
+import org.yczbj.ycvideoplayerlib.player.render.RenderViewFactory;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/manager/VideoPlayerManager.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/manager/VideoPlayerManager.java

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 */
 */
-package org.yczbj.ycvideoplayerlib.manager;
+package org.yczbj.ycvideoplayerlib.tool.manager;
 
 
 
 
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/receiver/BatterReceiver.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/receiver/BatterReceiver.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 */
 */
 
 
-package org.yczbj.ycvideoplayerlib.receiver;
+package org.yczbj.ycvideoplayerlib.tool.receiver;
 
 
 import android.content.BroadcastReceiver;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Context;
@@ -23,7 +23,7 @@ import android.os.BatteryManager;
 
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.AbsVideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.AbsVideoPlayerController;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/receiver/NetChangedReceiver.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/tool/receiver/NetChangedReceiver.java

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 */
 */
-package org.yczbj.ycvideoplayerlib.receiver;
+package org.yczbj.ycvideoplayerlib.tool.receiver;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.BroadcastReceiver;
@@ -22,7 +22,7 @@ import android.content.Intent;
 
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.AbsVideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.AbsVideoPlayerController;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.NetworkUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.NetworkUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;

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

@@ -43,9 +43,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.view.ContextThemeWrapper;
 
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewConfig;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.config.VideoViewConfig;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/surface/VideoSurfaceView.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/surface/VideoSurfaceView.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 */
 */
 
 
-package org.yczbj.ycvideoplayerlib.view.surface;
+package org.yczbj.ycvideoplayerlib.ui.surface;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.view.Gravity;
 import android.view.Gravity;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/surface/VideoTextureView.java → VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/surface/VideoTextureView.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 */
 */
 
 
-package org.yczbj.ycvideoplayerlib.view.surface;
+package org.yczbj.ycvideoplayerlib.ui.surface;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Context;

+ 2 - 3
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/view/BasisVideoController.java

@@ -24,7 +24,6 @@ import android.view.animation.Animation;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 
 import androidx.annotation.AttrRes;
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
@@ -32,8 +31,8 @@ import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.GestureVideoController;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.GestureVideoController;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 

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

@@ -38,9 +38,9 @@ import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 /**
 /**

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

@@ -31,9 +31,9 @@ import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 

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

@@ -28,9 +28,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 
 
 
 
 /**
 /**

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

@@ -30,9 +30,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IGestureComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IGestureComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 /**
 /**

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

@@ -29,9 +29,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 
 

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

@@ -29,10 +29,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+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.VideoView;
 
 
 
 
 
 

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

@@ -34,9 +34,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 
 

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/ui/window/FloatPlayerView.java

@@ -11,7 +11,7 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnPlayerStatesListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnPlayerStatesListener;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 

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

@@ -41,8 +41,8 @@ import org.yczbj.ycvideoplayerlib.R;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnPlayerStatesListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnPlayerStatesListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnPlayerTypeListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnPlayerTypeListener;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.receiver.BatterReceiver;
-import org.yczbj.ycvideoplayerlib.receiver.NetChangedReceiver;
+import org.yczbj.ycvideoplayerlib.tool.receiver.BatterReceiver;
+import org.yczbj.ycvideoplayerlib.tool.receiver.NetChangedReceiver;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/player/VideoMediaPlayer.java

@@ -14,7 +14,7 @@ import org.yczbj.ycvideoplayerlib.inter.listener.OnTextureListener;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
-import org.yczbj.ycvideoplayerlib.view.surface.VideoTextureView;
+import org.yczbj.ycvideoplayerlib.ui.surface.VideoTextureView;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/view/player/VideoPlayer.java

@@ -34,7 +34,7 @@ import org.yczbj.ycvideoplayerlib.view.controller.AbsVideoPlayerController;
 import org.yczbj.ycvideoplayerlib.inter.player.InterPropertyVideoPlayer;
 import org.yczbj.ycvideoplayerlib.inter.player.InterPropertyVideoPlayer;
 import org.yczbj.ycvideoplayerlib.inter.player.InterScreenVideoPlayer;
 import org.yczbj.ycvideoplayerlib.inter.player.InterScreenVideoPlayer;
 import org.yczbj.ycvideoplayerlib.inter.player.InterStateVideoPlayer;
 import org.yczbj.ycvideoplayerlib.inter.player.InterStateVideoPlayer;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 
 

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

@@ -6,9 +6,9 @@ import android.content.res.Configuration;
 import android.util.Log;
 import android.util.Log;
 
 
 
 
-import org.yczbj.ycvideoplayerlib.kernel.impl.ijk.IjkPlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewConfig;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.impl.ijk.IjkPlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.config.VideoViewConfig;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 

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

@@ -14,7 +14,7 @@ import androidx.appcompat.widget.Toolbar;
 import org.yczbj.ycvideoplayer.activity.TypeActivity;
 import org.yczbj.ycvideoplayer.activity.TypeActivity;
 import org.yczbj.ycvideoplayer.list.TestListActivity;
 import org.yczbj.ycvideoplayer.list.TestListActivity;
 import org.yczbj.ycvideoplayer.surface.TestSurfaceActivity;
 import org.yczbj.ycvideoplayer.surface.TestSurfaceActivity;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 
 

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

@@ -8,7 +8,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;

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

@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;

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

@@ -1,6 +1,6 @@
 package org.yczbj.ycvideoplayer;
 package org.yczbj.ycvideoplayer;
 
 
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 
 
 
 
 /**
 /**

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

@@ -7,7 +7,7 @@ import com.bumptech.glide.Glide;
 
 
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 

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

@@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;

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

@@ -5,7 +5,7 @@ import android.widget.ImageView;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

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

@@ -4,7 +4,7 @@ package org.yczbj.ycvideoplayer;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;

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

@@ -5,7 +5,7 @@ import android.widget.ImageView;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

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

@@ -9,7 +9,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.view.controller.VideoPlayerController;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
 import org.yczbj.ycvideoplayerlib.inter.dev.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

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

@@ -11,7 +11,7 @@ import android.widget.Button;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RequiresApi;
 
 
 import org.yczbj.ycvideoplayer.tiny.TestFullActivity;
 import org.yczbj.ycvideoplayer.tiny.TestFullActivity;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.view.player.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.ui.window.FloatPlayerView;
 import org.yczbj.ycvideoplayerlib.ui.window.FloatPlayerView;
 import org.yczbj.ycvideoplayerlib.ui.window.FloatWindow;
 import org.yczbj.ycvideoplayerlib.ui.window.FloatWindow;

+ 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 androidx.core.view.ViewCompat;
 
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 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.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;

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

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

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

@@ -20,12 +20,12 @@ import org.yczbj.ycvideoplayer.surface.TestSurfaceActivity;
 import org.yczbj.ycvideoplayer.tiny.TestFullActivity;
 import org.yczbj.ycvideoplayer.tiny.TestFullActivity;
 import org.yczbj.ycvideoplayer.tiny.TinyScreenActivity;
 import org.yczbj.ycvideoplayer.tiny.TinyScreenActivity;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.impl.exo.ExoMediaPlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.impl.ijk.IjkPlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.impl.media.AndroidMediaPlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.player.PlayerFactory;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewConfig;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.impl.exo.ExoMediaPlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.impl.ijk.IjkPlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.impl.media.MediaPlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.factory.PlayerFactory;
+import org.yczbj.ycvideoplayerlib.player.config.VideoViewConfig;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
@@ -70,7 +70,7 @@ public class TypeActivity extends AppCompatActivity implements View.OnClickListe
             setTitle(getResources().getString(R.string.app_name) + " (ExoPlayer)");
             setTitle(getResources().getString(R.string.app_name) + " (ExoPlayer)");
         } else if (factory instanceof IjkPlayerFactory) {
         } else if (factory instanceof IjkPlayerFactory) {
             mTvTitle.setText("视频内核:" + " (IjkPlayer)");
             mTvTitle.setText("视频内核:" + " (IjkPlayer)");
-        } else if (factory instanceof AndroidMediaPlayerFactory) {
+        } else if (factory instanceof MediaPlayerFactory) {
             mTvTitle.setText("视频内核:" + " (MediaPlayer)");
             mTvTitle.setText("视频内核:" + " (MediaPlayer)");
         } else {
         } else {
             mTvTitle.setText("视频内核:" + " (unknown)");
             mTvTitle.setText("视频内核:" + " (unknown)");
@@ -195,7 +195,7 @@ public class TypeActivity extends AppCompatActivity implements View.OnClickListe
                     mTvTitle.setText("视频内核:" + " (ExoPlayer)");
                     mTvTitle.setText("视频内核:" + " (ExoPlayer)");
                     break;
                     break;
                 case ConstantKeys.VideoPlayerType.TYPE_NATIVE:
                 case ConstantKeys.VideoPlayerType.TYPE_NATIVE:
-                    playerFactory = AndroidMediaPlayerFactory.create();
+                    playerFactory = MediaPlayerFactory.create();
                     mTvTitle.setText("视频内核:" + " (MediaPlayer)");
                     mTvTitle.setText("视频内核:" + " (MediaPlayer)");
                     break;
                     break;
                 case ConstantKeys.VideoPlayerType.TYPE_RTC:
                 case ConstantKeys.VideoPlayerType.TYPE_RTC:

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

@@ -13,7 +13,7 @@ import com.yc.videocache.HttpProxyCacheServer;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.cache.ProxyVideoCacheManager;
 import org.yczbj.ycvideoplayer.cache.ProxyVideoCacheManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 

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

@@ -15,9 +15,9 @@ import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 
 

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

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

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

@@ -10,7 +10,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

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

@@ -18,9 +18,9 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.ContextCompat;
 
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 import master.flame.danmaku.controller.DrawHandler;
 import master.flame.danmaku.controller.DrawHandler;

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

@@ -12,7 +12,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 
 import java.util.List;
 import java.util.List;

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

@@ -5,8 +5,8 @@ import android.view.animation.Animation;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 

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

@@ -16,8 +16,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 

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

@@ -14,8 +14,8 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.activity.DetailActivity;
 import org.yczbj.ycvideoplayer.activity.DetailActivity;
 import org.yczbj.ycvideoplayer.activity.IntentKeys;
 import org.yczbj.ycvideoplayer.activity.IntentKeys;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.kernel.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.manager.VideoViewManager;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 
 
 /**
 /**

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

@@ -2,9 +2,8 @@ package org.yczbj.ycvideoplayer.list;
 
 
 import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.TestListFragment;
 import org.yczbj.ycvideoplayer.tiktok.TikTokListFragment;
 import org.yczbj.ycvideoplayer.tiktok.TikTokListFragment;
-import org.yczbj.ycvideoplayerlib.manager.VideoPlayerManager;
+import org.yczbj.ycvideoplayerlib.tool.manager.VideoPlayerManager;
 
 
 
 
 /**
 /**

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

@@ -14,7 +14,7 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.cache.PreloadManager;
 import org.yczbj.ycvideoplayer.cache.PreloadManager;
 import org.yczbj.ycvideoplayer.cache.ProxyVideoCacheManager;
 import org.yczbj.ycvideoplayer.cache.ProxyVideoCacheManager;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;

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

@@ -5,9 +5,9 @@ import android.view.View;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.inter.AbstractPlayer;
-import org.yczbj.ycvideoplayerlib.kernel.render.IRenderView;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.inter.AbstractPlayer;
+import org.yczbj.ycvideoplayerlib.player.render.IRenderView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 
 
 
 
 /**
 /**

+ 3 - 3
app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokRenderViewFactory.java

@@ -2,9 +2,9 @@ package org.yczbj.ycvideoplayer.tiktok;
 
 
 import android.content.Context;
 import android.content.Context;
 
 
-import org.yczbj.ycvideoplayerlib.kernel.render.IRenderView;
-import org.yczbj.ycvideoplayerlib.kernel.render.RenderViewFactory;
-import org.yczbj.ycvideoplayerlib.kernel.render.TextureRenderView;
+import org.yczbj.ycvideoplayerlib.player.render.IRenderView;
+import org.yczbj.ycvideoplayerlib.player.render.RenderViewFactory;
+import org.yczbj.ycvideoplayerlib.player.render.TextureRenderView;
 
 
 
 
 public class TikTokRenderViewFactory extends RenderViewFactory {
 public class TikTokRenderViewFactory extends RenderViewFactory {

+ 3 - 4
app/src/main/java/org/yczbj/ycvideoplayer/tiktok/TikTokView.java

@@ -15,10 +15,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.kernel.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.kernel.controller.IControlComponent;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
-import org.yczbj.ycvideoplayerlib.tool.toast.BaseToast;
+import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
+import org.yczbj.ycvideoplayerlib.controller.IControlComponent;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.VideoLogUtils;
 
 
 public class TikTokView extends FrameLayout implements IControlComponent {
 public class TikTokView extends FrameLayout implements IControlComponent {

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

@@ -10,7 +10,7 @@ import com.bumptech.glide.Glide;
 import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.BaseActivity;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.ConstantVideo;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;

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

@@ -15,7 +15,7 @@ import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.list.OnItemChildClickListener;
 import org.yczbj.ycvideoplayer.list.OnItemChildClickListener;
 import org.yczbj.ycvideoplayer.list.VideoRecyclerViewAdapter;
 import org.yczbj.ycvideoplayer.list.VideoRecyclerViewAdapter;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
 import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.kernel.view.VideoView;
+import org.yczbj.ycvideoplayerlib.player.video.VideoView;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.tool.utils.PlayerUtils;
 import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
 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:fitsSystemWindows="true"
     android:background="@color/whiteBg">
     android:background="@color/whiteBg">
 
 
-    <org.yczbj.ycvideoplayerlib.kernel.view.VideoView
+    <org.yczbj.ycvideoplayerlib.player.video.VideoView
         android:id="@+id/video_player"
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>
         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:layout_height="match_parent"
     android:orientation="vertical">
     android:orientation="vertical">
 
 
-    <org.yczbj.ycvideoplayerlib.kernel.view.VideoView
+    <org.yczbj.ycvideoplayerlib.player.video.VideoView
         android:id="@+id/video_player"
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_height="0dp"

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

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

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

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

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

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

+ 0 - 0
read/audio_study.md → read/01.视频播放器介绍文档.md


+ 0 - 0
read/architecture.md → read/02.视频播放器整体结构.md


+ 0 - 0
read/framework.md → read/04.视频播放器封装思路.md


+ 19 - 1
read/video_study10.md → read/05.播放器内核切换封装.md

@@ -1,4 +1,4 @@
-# 认识TextureView
+# 视频封装思路
 #### 目录介绍
 #### 目录介绍
 
 
 
 
@@ -20,5 +20,23 @@
 
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 

+ 42 - 0
read/06.播放器UI抽取封装.md

@@ -0,0 +1,42 @@
+# 视频封装思路
+#### 目录介绍
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 0 - 0
read/video_study3.md → read/07.MediaPlayer详细介绍.md


+ 0 - 0
read/optimize.md → read/08.视频播放器优化处理.md


+ 0 - 0
read/design.md → read/09.视频播放器使用设计模式.md


+ 0 - 0
read/float_play.md → read/10.视频全局悬浮窗播放.md


+ 0 - 0
read/cache_play.md → read/11.视频播放器音频焦点抢占.md


+ 26 - 0
read/12.视频边播边缓存分析.md

@@ -0,0 +1,26 @@
+# 音频相关知识点学习
+#### 目录介绍
+
+
+
+
+
+
+- https://blog.csdn.net/ta893115871/article/details/71429738
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 3 - 0
read/20.视频播放器版本更新文档.md

@@ -0,0 +1,3 @@
+# 基础方法说明
+#### 目录介绍
+

+ 0 - 0
read/todo.md → read/21.视频播放器后期需求.md


+ 0 - 0
read/video_study0.md → read/22.视频基础概念术语.md


Some files were not shown because too many files changed in this diff