Browse Source

更新demo案例

杨充 4 years ago
parent
commit
3f0209bc08
100 changed files with 621 additions and 475 deletions
  1. 6 6
      Demo/build.gradle
  2. 35 35
      Demo/src/main/AndroidManifest.xml
  3. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/BaseActivity.java
  4. 4 4
      Demo/src/main/java/com/yc/ycvideoplayer/BaseApplication.java
  5. 2 2
      Demo/src/main/java/com/yc/ycvideoplayer/BuriedPointEventImpl.java
  6. 2 2
      Demo/src/main/java/com/yc/ycvideoplayer/ConstantVideo.java
  7. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/ImageUtil.java
  8. 6 4
      Demo/src/main/java/com/yc/ycvideoplayer/MainActivity.java
  9. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/ScreenDensityUtils.java
  10. 2 4
      Demo/src/main/java/com/yc/ycvideoplayer/demo/DemoActivity.java
  11. 3 4
      Demo/src/main/java/com/yc/ycvideoplayer/demo/ExoActivity.java
  12. 2 2
      Demo/src/main/java/com/yc/ycvideoplayer/demo/IjkActivity.java
  13. 5 4
      Demo/src/main/java/com/yc/ycvideoplayer/demo/MediaActivity.java
  14. 5 6
      Demo/src/main/java/com/yc/ycvideoplayer/demo/MediaActivity2.java
  15. 6 6
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/DetailActivity.java
  16. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/IntentKeys.java
  17. 7 6
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/MultipleActivity.java
  18. 12 12
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/NormalActivity.java
  19. 17 17
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/TypeActivity.java
  20. 9 8
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdActivity.java
  21. 7 7
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdControlView.java
  22. 7 7
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/clarity/ClarityActivity.java
  23. 5 5
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/clarity/DefinitionControlView.java
  24. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/CenteredImageSpan.java
  25. 9 9
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/DanmuActivity.java
  26. 6 6
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/MyDanmakuView.java
  27. 9 9
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/ContinuousVideoActivity.java
  28. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/OnItemChildClickListener.java
  29. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/OnItemClickListener.java
  30. 4 4
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/PlayerMonitor.java
  31. 11 11
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerView2Fragment.java
  32. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerViewAutoPlayFragment.java
  33. 11 11
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerViewFragment.java
  34. 8 8
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/SeamlessPlayFragment.java
  35. 7 6
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/TestListActivity.java
  36. 4 4
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/VideoRecyclerViewAdapter.java
  37. 8 7
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/pip/PipActivity.java
  38. 13 12
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/pip/PipListActivity.java
  39. 2 2
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/surface/MySurfaceView.java
  40. 2 2
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/surface/TestSurfaceActivity.java
  41. 13 22
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1Activity.java
  42. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1ListAdapter.java
  43. 5 4
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1ListFragment.java
  44. 8 11
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok2Activity.java
  45. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokListAdapter.java
  46. 5 4
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokListFragment.java
  47. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokRenderView.java
  48. 4 4
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokRenderViewFactory.java
  49. 5 5
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokView.java
  50. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/Tiktok2Adapter.java
  51. 9 9
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiny/TestFullActivity.java
  52. 12 11
      Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiny/TinyScreenActivity.java
  53. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/HomeKeyWatcher.java
  54. 6 5
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/OldActivity.java
  55. 9 9
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestClarityActivity.java
  56. 7 6
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestEightVideoActivity.java
  57. 6 5
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestFragment.java
  58. 5 4
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestFragmentActivity.java
  59. 10 10
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestFullActivity2.java
  60. 6 5
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestListFragment.java
  61. 10 9
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestNormalActivity.java
  62. 7 6
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestRecyclerActivity.java
  63. 10 9
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestSavePosActivity.java
  64. 10 10
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestTinyActivity.java
  65. 12 11
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestWindowActivity.java
  66. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/Video.java
  67. 7 6
      Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/VideoAdapter.java
  68. 1 1
      Demo/src/main/res/layout/activity_ad_video.xml
  69. 1 1
      Demo/src/main/res/layout/activity_danmu_player.xml
  70. 1 1
      Demo/src/main/res/layout/activity_full_video1.xml
  71. 1 1
      Demo/src/main/res/layout/activity_full_video2.xml
  72. 2 2
      Demo/src/main/res/layout/activity_multiple_play.xml
  73. 1 1
      Demo/src/main/res/layout/activity_normal_video.xml
  74. 1 1
      Demo/src/main/res/layout/activity_test_video2.xml
  75. 1 1
      Demo/src/main/res/layout/activity_test_video3.xml
  76. 1 1
      Demo/src/main/res/layout/activity_test_window.xml
  77. 1 1
      Demo/src/main/res/layout/activity_video.xml
  78. 1 1
      Demo/src/main/res/layout/item_my_video.xml
  79. 1 1
      Demo/src/main/res/layout/item_tik_tok.xml
  80. 1 1
      Demo/src/main/res/layout/item_video.xml
  81. 76 0
      MusicPlayer/.gitignore
  82. 32 0
      MusicPlayer/build.gradle
  83. 0 0
      MusicPlayer/consumer-rules.pro
  84. 21 0
      MusicPlayer/proguard-rules.pro
  85. 5 0
      MusicPlayer/src/main/AndroidManifest.xml
  86. 3 3
      README.md
  87. 1 1
      VideoCache/build.gradle
  88. 1 1
      VideoKernel/build.gradle
  89. 4 5
      VideoPlayer/build.gradle
  90. 12 4
      VideoPlayer/src/main/AndroidManifest.xml
  91. 1 1
      VideoPlayer/src/main/java/com/yc/video/config/BuriedPointEvent.java
  92. 1 1
      VideoPlayer/src/main/java/com/yc/video/config/ConstantKeys.java
  93. 1 1
      VideoPlayer/src/main/java/com/yc/video/config/VideoInfoBean.java
  94. 5 5
      VideoPlayer/src/main/java/com/yc/video/config/VideoPlayerConfig.java
  95. 9 9
      VideoPlayer/src/main/java/com/yc/video/controller/BaseVideoController.java
  96. 2 2
      VideoPlayer/src/main/java/com/yc/video/controller/ControlWrapper.java
  97. 4 4
      VideoPlayer/src/main/java/com/yc/video/controller/GestureVideoController.java
  98. 2 2
      VideoPlayer/src/main/java/com/yc/video/controller/IGestureComponent.java
  99. 1 1
      VideoPlayer/src/main/java/com/yc/video/controller/InterVideoController.java
  100. 2 2
      VideoPlayer/src/main/java/com/yc/video/controller/InterViewController.java

+ 6 - 6
Demo/build.gradle

@@ -61,13 +61,13 @@ dependencies {
     //自己封装的库,都有对应的案例项目【欢迎star】:https://github.com/yangchong211
     implementation 'com.yc:PagerLib:1.0.4'
     implementation 'cn.yc:YCStateLib:1.2.2'                                  //状态管理
-    implementation project(':VideoCache')
-    implementation project(':VideoPlayer')
-    implementation project(':VideoKernel')
+//    implementation project(':VideoCache')
+//    implementation project(':VideoPlayer')
+//    implementation project(':VideoKernel')
 
-//    implementation 'cn.yc:VideoPlayer:3.0.1'
-//    implementation 'cn.yc:VideoCache:3.0.1'
-//    implementation 'cn.yc:VideoKernel:3.0.1'
+    implementation 'cn.yc:VideoPlayer:3.0.8'
+    implementation 'cn.yc:VideoCache:3.0.5'
+    implementation 'cn.yc:VideoKernel:3.0.5'
     implementation 'cn.yc:YCStatusBarLib:1.5.0'
  //状态栏
 }

+ 35 - 35
Demo/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.yczbj.ycvideoplayer">
+    package="org.yc.ycvideoplayer">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
-        android:name=".BaseApplication"
+        android:name="com.yc.ycvideoplayer.BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -18,7 +18,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name=".MainActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.activity.TypeActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -29,92 +29,92 @@
         </activity>
 
 
-        <activity android:name=".oldPlayer.TestTinyActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestTinyActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestClarityActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestClarityActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestRecyclerActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestRecyclerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestFragmentActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestFragmentActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestEightVideoActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestEightVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.list.TestListActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.list.TestListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestWindowActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestWindowActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestNormalActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestNormalActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.tiny.TestFullActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiny.TestFullActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestSavePosActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestSavePosActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.surface.TestSurfaceActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.surface.TestSurfaceActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.activity.TypeActivity"
+<!--        <activity android:name="com.yc.ycvideoplayer.newPlayer.activity.TypeActivity"-->
+<!--            android:configChanges="orientation|keyboardHidden|screenSize"-->
+<!--            android:screenOrientation="portrait"/>-->
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.activity.NormalActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.activity.NormalActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.activity.MultipleActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.activity.MultipleActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiktok.TikTok2Activity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.tiktok.TikTok2Activity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiktok.TikTok1Activity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.tiktok.TikTok1Activity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestFullActivity2"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.TestFullActivity2"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.danmu.DanmuActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.danmu.DanmuActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.ad.AdActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.ad.AdActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.list.ContinuousVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.list.ContinuousVideoActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.clarity.ClarityActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.clarity.ClarityActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiny.TinyScreenActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".newPlayer.tiny.TinyScreenActivity"
+        <activity android:name="com.yc.ycvideoplayer.oldPlayer.OldActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".oldPlayer.OldActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.pip.PipActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="org.yczbj.ycvideoplayer.newPlayer.pip.PipActivity"
+        <activity android:name="com.yc.ycvideoplayer.newPlayer.pip.PipListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="org.yczbj.ycvideoplayer.newPlayer.pip.PipListActivity"
+        <activity android:name="com.yc.ycvideoplayer.demo.DemoActivity"/>
+        <activity android:name="com.yc.ycvideoplayer.demo.IjkActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".demo.DemoActivity"/>
-        <activity android:name=".demo.IjkActivity"
+        <activity android:name="com.yc.ycvideoplayer.demo.MediaActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".demo.MediaActivity"
+        <activity android:name="com.yc.ycvideoplayer.demo.MediaActivity2"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".demo.MediaActivity2"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".demo.ExoActivity"
+        <activity android:name="com.yc.ycvideoplayer.demo.ExoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
     </application>

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/BaseActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/BaseActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;

+ 4 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/BaseApplication.java → Demo/src/main/java/com/yc/ycvideoplayer/BaseApplication.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
 import android.app.Application;
 import android.content.Context;
@@ -10,9 +10,9 @@ import com.yc.kernel.factory.PlayerFactory;
 import com.yc.kernel.utils.PlayerConstant;
 import com.yc.kernel.utils.PlayerFactoryUtils;
 
-import org.yczbj.ycvideoplayerlib.config.VideoPlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.surface.SurfaceViewFactory;
+import com.yc.video.config.VideoPlayerConfig;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.surface.SurfaceViewFactory;
 
 /**
  * ================================================

+ 2 - 2
Demo/src/main/java/org/yczbj/ycvideoplayer/BuriedPointEventImpl.java → Demo/src/main/java/com/yc/ycvideoplayer/BuriedPointEventImpl.java

@@ -1,8 +1,8 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
 import com.yc.kernel.utils.VideoLogUtils;
 
-import org.yczbj.ycvideoplayerlib.config.BuriedPointEvent;
+import com.yc.video.config.BuriedPointEvent;
 
 public class BuriedPointEventImpl implements BuriedPointEvent {
 

+ 2 - 2
Demo/src/main/java/org/yczbj/ycvideoplayer/ConstantVideo.java → Demo/src/main/java/com/yc/ycvideoplayer/ConstantVideo.java

@@ -1,6 +1,6 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
+import com.yc.video.config.VideoInfoBean;
 
 import java.util.ArrayList;
 import java.util.List;

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/ImageUtil.java → Demo/src/main/java/com/yc/ycvideoplayer/ImageUtil.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
 import android.content.Context;
 import android.graphics.Bitmap;

+ 6 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/MainActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/MainActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -10,9 +10,11 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.demo.DemoActivity;
-import org.yczbj.ycvideoplayer.newPlayer.activity.TypeActivity;
-import org.yczbj.ycvideoplayer.oldPlayer.OldActivity;
+import org.yc.ycvideoplayer.R;
+
+import com.yc.ycvideoplayer.demo.DemoActivity;
+import com.yc.ycvideoplayer.newPlayer.activity.TypeActivity;
+import com.yc.ycvideoplayer.oldPlayer.OldActivity;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/ScreenDensityUtils.java → Demo/src/main/java/com/yc/ycvideoplayer/ScreenDensityUtils.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer;
+package com.yc.ycvideoplayer;
 
 
 import android.app.Activity;

+ 2 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/demo/DemoActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/demo/DemoActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.demo;
+package com.yc.ycvideoplayer.demo;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,9 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.activity.TypeActivity;
-import org.yczbj.ycvideoplayer.oldPlayer.OldActivity;
+import org.yc.ycvideoplayer.R;
 
 public class DemoActivity extends AppCompatActivity implements View.OnClickListener {
 

+ 3 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/demo/ExoActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/demo/ExoActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.demo;
+package com.yc.ycvideoplayer.demo;
 
 import android.net.Uri;
 import android.os.Bundle;
@@ -13,10 +13,9 @@ import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
-import com.google.android.exoplayer2.video.VideoListener;
+import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
+import org.yc.ycvideoplayer.R;
 
 public class ExoActivity extends AppCompatActivity {
 

+ 2 - 2
Demo/src/main/java/org/yczbj/ycvideoplayer/demo/IjkActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/demo/IjkActivity.java

@@ -1,11 +1,11 @@
-package org.yczbj.ycvideoplayer.demo;
+package com.yc.ycvideoplayer.demo;
 
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.R;
+import org.yc.ycvideoplayer.R;
 
 public class IjkActivity extends AppCompatActivity {
 

+ 5 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/demo/MediaActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/demo/MediaActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.demo;
+package com.yc.ycvideoplayer.demo;
 
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -11,9 +11,10 @@ import android.widget.VideoView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.tool.BaseToast;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.tool.BaseToast;
 
 public class MediaActivity extends AppCompatActivity {
 

+ 5 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/demo/MediaActivity2.java → Demo/src/main/java/com/yc/ycvideoplayer/demo/MediaActivity2.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.demo;
+package com.yc.ycvideoplayer.demo;
 
 import android.media.AudioManager;
 import android.media.MediaPlayer;
@@ -7,16 +7,15 @@ import android.os.Bundle;
 import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
-import android.widget.MediaController;
 import android.widget.SeekBar;
-import android.widget.VideoView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.tool.BaseToast;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.tool.BaseToast;
 
 public class MediaActivity2 extends AppCompatActivity {
 

+ 6 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/DetailActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/DetailActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.newPlayer.activity;
 
 import android.content.Intent;
 import android.os.Build;
@@ -11,11 +11,11 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.ViewCompat;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.BasisVideoController;
 
 public class DetailActivity extends AppCompatActivity {
 

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/IntentKeys.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/IntentKeys.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.newPlayer.activity;
 
 public class IntentKeys {
 

+ 7 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/MultipleActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/MultipleActivity.java

@@ -1,15 +1,16 @@
-package org.yczbj.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.newPlayer.activity;
 
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayerBuilder;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.player.VideoPlayerBuilder;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.ArrayList;
 import java.util.List;

+ 12 - 12
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/NormalActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/NormalActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.newPlayer.activity;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -14,18 +14,18 @@ import com.bumptech.glide.Glide;
 import com.yc.kernel.factory.PlayerFactory;
 import com.yc.kernel.utils.PlayerConstant;
 import com.yc.kernel.utils.PlayerFactoryUtils;
+import com.yc.ycvideoplayer.BuriedPointEventImpl;
+import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yczbj.ycvideoplayer.BuriedPointEventImpl;
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.config.VideoPlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.OnVideoStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayerBuilder;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
-import org.yczbj.ycvideoplayerlib.ui.view.CustomErrorView;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoPlayerConfig;
+import com.yc.video.player.OnVideoStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.player.VideoPlayerBuilder;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.ui.view.BasisVideoController;
+import com.yc.video.ui.view.CustomErrorView;
 
 public class NormalActivity extends AppCompatActivity implements View.OnClickListener {
 

+ 17 - 17
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/TypeActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/TypeActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.newPlayer.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -10,18 +10,18 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.ad.AdActivity;
-import org.yczbj.ycvideoplayer.newPlayer.clarity.ClarityActivity;
-import org.yczbj.ycvideoplayer.newPlayer.danmu.DanmuActivity;
-import org.yczbj.ycvideoplayer.newPlayer.list.ContinuousVideoActivity;
-import org.yczbj.ycvideoplayer.newPlayer.list.TestListActivity;
-import org.yczbj.ycvideoplayer.newPlayer.pip.PipActivity;
-import org.yczbj.ycvideoplayer.newPlayer.pip.PipListActivity;
-import org.yczbj.ycvideoplayer.newPlayer.surface.TestSurfaceActivity;
-import org.yczbj.ycvideoplayer.newPlayer.tiny.TestFullActivity;
-import org.yczbj.ycvideoplayer.newPlayer.tiny.TinyScreenActivity;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
+import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.newPlayer.ad.AdActivity;
+import com.yc.ycvideoplayer.newPlayer.clarity.ClarityActivity;
+import com.yc.ycvideoplayer.newPlayer.danmu.DanmuActivity;
+import com.yc.ycvideoplayer.newPlayer.list.ContinuousVideoActivity;
+import com.yc.ycvideoplayer.newPlayer.list.TestListActivity;
+import com.yc.ycvideoplayer.newPlayer.pip.PipActivity;
+import com.yc.ycvideoplayer.newPlayer.pip.PipListActivity;
+import com.yc.ycvideoplayer.newPlayer.surface.TestSurfaceActivity;
+import com.yc.ycvideoplayer.newPlayer.tiny.TestFullActivity;
+import com.yc.ycvideoplayer.newPlayer.tiny.TinyScreenActivity;
+import com.yc.video.config.ConstantKeys;
 
 import com.yc.kernel.impl.exo.ExoMediaPlayer;
 import com.yc.kernel.impl.exo.ExoPlayerFactory;
@@ -31,10 +31,10 @@ import com.yc.kernel.impl.media.AndroidMediaPlayer;
 import com.yc.kernel.impl.media.MediaPlayerFactory;
 import com.yc.kernel.factory.PlayerFactory;
 
-import org.yczbj.ycvideoplayerlib.config.VideoPlayerConfig;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.tool.BaseToast;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
+import com.yc.video.config.VideoPlayerConfig;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.tool.BaseToast;
+import com.yc.video.tool.PlayerUtils;
 
 import java.lang.reflect.Field;
 

+ 9 - 8
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/ad/AdActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.ad;
+package com.yc.ycvideoplayer.newPlayer.ad;
 
 import android.os.Bundle;
 import android.view.View;
@@ -10,14 +10,15 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.bumptech.glide.Glide;
 import com.yc.videocache.HttpProxyCacheServer;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
+import com.yc.ycvideoplayer.ConstantVideo;
+import org.yc.ycvideoplayer.R;
 import com.yc.videocache.cache.ProxyVideoCacheManager;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.tool.BaseToast;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.tool.BaseToast;
+import com.yc.video.ui.view.BasisVideoController;
 
 public class AdActivity extends AppCompatActivity implements View.OnClickListener {
 

+ 7 - 7
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/ad/AdControlView.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdControlView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.ad;
+package com.yc.ycvideoplayer.newPlayer.ad;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,12 +13,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.ui.view.CustomTitleView;
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.controller.ControlWrapper;
+import com.yc.video.ui.view.CustomTitleView;
+import com.yc.video.ui.view.InterControlView;
+import com.yc.video.tool.PlayerUtils;
 
 
 public class AdControlView extends FrameLayout implements InterControlView, View.OnClickListener {

+ 7 - 7
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/clarity/ClarityActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/clarity/ClarityActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.clarity;
+package com.yc.ycvideoplayer.newPlayer.clarity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -9,12 +9,12 @@ import androidx.appcompat.app.AppCompatActivity;
 
 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.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
-import org.yczbj.ycvideoplayerlib.ui.view.CustomBottomView;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.ui.view.BasisVideoController;
+import com.yc.video.ui.view.CustomBottomView;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

+ 5 - 5
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/clarity/DefinitionControlView.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/clarity/DefinitionControlView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.clarity;
+package com.yc.ycvideoplayer.newPlayer.clarity;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -17,10 +17,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.CustomBottomView;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.CustomBottomView;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/danmu/CenteredImageSpan.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/CenteredImageSpan.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.danmu;
+package com.yc.ycvideoplayer.newPlayer.danmu;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;

+ 9 - 9
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/danmu/DanmuActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/DanmuActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.danmu;
+package com.yc.ycvideoplayer.newPlayer.danmu;
 
 import android.os.Handler;
 import android.view.View;
@@ -6,14 +6,14 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 
 import com.bumptech.glide.Glide;
-
-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.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.ui.view.BasisVideoController;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 6 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/danmu/MyDanmakuView.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/MyDanmakuView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.danmu;
+package com.yc.ycvideoplayer.newPlayer.danmu;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -17,11 +17,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.controller.ControlWrapper;
+import com.yc.video.ui.view.InterControlView;
+import com.yc.video.tool.PlayerUtils;
 
 import master.flame.danmaku.controller.DrawHandler;
 import master.flame.danmaku.danmaku.model.BaseDanmaku;

+ 9 - 9
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/ContinuousVideoActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/ContinuousVideoActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,14 +8,14 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 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.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.List;
 

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/OnItemChildClickListener.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/OnItemChildClickListener.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 public interface OnItemChildClickListener {
     void onItemChildClick(int position);

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/OnItemClickListener.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/OnItemClickListener.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 public interface OnItemClickListener {
     void onItemClick(int position);

+ 4 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/PlayerMonitor.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/PlayerMonitor.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.view.View;
 import android.view.animation.Animation;
@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 
 import com.yc.kernel.utils.VideoLogUtils;
 
-import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
+import com.yc.video.controller.ControlWrapper;
+import com.yc.video.ui.view.InterControlView;
+import com.yc.video.tool.PlayerUtils;
 
 
 public class PlayerMonitor implements InterControlView {

+ 11 - 11
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/RecyclerView2Fragment.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerView2Fragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -16,16 +16,16 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yc.pagerlib.recycler.ScrollPageHelper;
-
-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.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.ArrayList;
 import java.util.List;

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/RecyclerViewAutoPlayFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerViewAutoPlayFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.graphics.Rect;
 import android.view.View;

+ 11 - 11
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/RecyclerViewFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerViewFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -15,16 +15,16 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yc.kernel.utils.VideoLogUtils;
-
-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.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.ArrayList;
 import java.util.List;

+ 8 - 8
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/SeamlessPlayFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/SeamlessPlayFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.content.Intent;
 import android.os.Build;
@@ -10,13 +10,13 @@ import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.activity.DetailActivity;
-import org.yczbj.ycvideoplayer.newPlayer.activity.IntentKeys;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
+import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.newPlayer.activity.DetailActivity;
+import com.yc.ycvideoplayer.newPlayer.activity.IntentKeys;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.tool.PlayerUtils;
 
 /**
  * 无缝播放

+ 7 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/TestListActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/TestListActivity.java

@@ -1,10 +1,11 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
-import org.yczbj.ycvideoplayer.BaseActivity;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.tiktok.TikTok1ListFragment;
-import org.yczbj.ycvideoplayer.newPlayer.tiktok.TikTokListFragment;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
+import com.yc.ycvideoplayer.BaseActivity;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.newPlayer.tiktok.TikTok1ListFragment;
+import com.yc.ycvideoplayer.newPlayer.tiktok.TikTokListFragment;
+import com.yc.video.old.other.VideoPlayerManager;
 
 
 /**

+ 4 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/list/VideoRecyclerViewAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/VideoRecyclerViewAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.newPlayer.list;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,9 +12,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.ui.view.CustomPrepareView;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.ui.view.CustomPrepareView;
 
 import java.util.List;
 

+ 8 - 7
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/pip/PipActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/pip/PipActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.pip;
+package com.yc.ycvideoplayer.newPlayer.pip;
 
 import android.os.Bundle;
 import android.view.View;
@@ -9,12 +9,13 @@ import android.widget.ImageView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import com.bumptech.glide.Glide;
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.ui.pip.FloatVideoManager;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.ui.pip.FloatVideoManager;
+import com.yc.video.ui.view.BasisVideoController;
 
 public class PipActivity extends AppCompatActivity{
 

+ 13 - 12
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/pip/PipListActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/pip/PipListActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.pip;
+package com.yc.ycvideoplayer.newPlayer.pip;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
@@ -10,17 +10,18 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
-import org.yczbj.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.pip.FloatVideoManager;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+import com.yc.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
+import com.yc.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.pip.FloatVideoManager;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.List;
 

+ 2 - 2
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/surface/MySurfaceView.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/surface/MySurfaceView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.surface;
+package com.yc.ycvideoplayer.newPlayer.surface;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -14,7 +14,7 @@ import android.view.MotionEvent;
 
 import com.yc.kernel.utils.VideoLogUtils;
 
-import org.yczbj.ycvideoplayer.R;
+import org.yc.ycvideoplayer.R;
 
 public class MySurfaceView extends SurfaceView implements Runnable, SurfaceHolder.Callback {
 

+ 2 - 2
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/surface/TestSurfaceActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/surface/TestSurfaceActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.surface;
+package com.yc.ycvideoplayer.newPlayer.surface;
 
 import android.os.Bundle;
 import android.view.SurfaceHolder;
@@ -8,7 +8,7 @@ import android.widget.RelativeLayout;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.R;
+import org.yc.ycvideoplayer.R;
 
 public class TestSurfaceActivity extends AppCompatActivity {
 

+ 13 - 22
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTok1Activity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1Activity.java

@@ -1,45 +1,36 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
 
-import com.yc.kernel.utils.VideoLogUtils;
 import com.yc.pagerlib.recycler.OnPagerListener;
 import com.yc.pagerlib.recycler.PagerLayoutManager;
-import com.yc.videocache.cache.PreloadManager;
-import com.yc.videocache.cache.ProxyVideoCacheManager;
-
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
-import org.yczbj.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+import com.yc.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
+import com.yc.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
-
 
 /**
  * 模仿抖音短视频,使用RecyclerView,实现了预加载功能

+ 3 - 3
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTok1ListAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1ListAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.VideoInfoBean;
 
 import java.util.List;
 

+ 5 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTok1ListFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1ListFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,9 +10,10 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.VideoInfoBean;
 
 import java.util.ArrayList;
 import java.util.List;

+ 8 - 11
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTok2Activity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok2Activity.java

@@ -1,31 +1,28 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
 import com.yc.kernel.utils.VideoLogUtils;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
+import com.yc.ycvideoplayer.ConstantVideo;
+import org.yc.ycvideoplayer.R;
 
 import com.yc.pagerlib.pager.VerticalViewPager;
 import com.yc.videocache.cache.PreloadManager;
 import com.yc.videocache.cache.ProxyVideoCacheManager;
 
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.BasisVideoController;
 import java.util.ArrayList;
 import java.util.List;
 

+ 3 - 3
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTokListAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokListAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.VideoInfoBean;
 
 import java.util.List;
 

+ 5 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTokListFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokListFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,9 +10,10 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.VideoInfoBean;
 
 import java.util.ArrayList;
 import java.util.List;

+ 3 - 3
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTokRenderView.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokRenderView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.graphics.Bitmap;
 import android.view.View;
@@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
 
 import com.yc.kernel.inter.AbstractVideoPlayer;
 
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.surface.InterSurfaceView;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.surface.InterSurfaceView;
 
 
 /**

+ 4 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTokRenderViewFactory.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokRenderViewFactory.java

@@ -1,10 +1,10 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.content.Context;
 
-import org.yczbj.ycvideoplayerlib.surface.InterSurfaceView;
-import org.yczbj.ycvideoplayerlib.surface.SurfaceFactory;
-import org.yczbj.ycvideoplayerlib.surface.RenderTextureView;
+import com.yc.video.surface.InterSurfaceView;
+import com.yc.video.surface.SurfaceFactory;
+import com.yc.video.surface.RenderTextureView;
 
 
 public class TikTokRenderViewFactory extends SurfaceFactory {

+ 5 - 5
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/TikTokView.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -16,10 +16,10 @@ import androidx.annotation.Nullable;
 
 import com.yc.kernel.utils.VideoLogUtils;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.controller.ControlWrapper;
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.controller.ControlWrapper;
+import com.yc.video.ui.view.InterControlView;
 
 public class TikTokView extends FrameLayout implements InterControlView {
 

+ 3 - 3
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiktok/Tiktok2Adapter.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/Tiktok2Adapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.newPlayer.tiktok;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -14,9 +14,9 @@ import androidx.viewpager.widget.PagerAdapter;
 
 import com.bumptech.glide.Glide;
 
-import org.yczbj.ycvideoplayer.R;
+import org.yc.ycvideoplayer.R;
 import com.yc.videocache.cache.PreloadManager;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
+import com.yc.video.config.VideoInfoBean;
 
 import java.util.ArrayList;
 import java.util.List;

+ 9 - 9
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiny/TestFullActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiny/TestFullActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiny;
+package com.yc.ycvideoplayer.newPlayer.tiny;
 
 import android.os.Build;
 import android.view.View;
@@ -6,14 +6,14 @@ import android.view.WindowManager;
 import android.widget.Button;
 
 import com.bumptech.glide.Glide;
-
-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.OnVideoStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.player.OnVideoStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.ui.view.BasisVideoController;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 12 - 11
Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/tiny/TinyScreenActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiny/TinyScreenActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.newPlayer.tiny;
+package com.yc.ycvideoplayer.newPlayer.tiny;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
@@ -10,16 +10,17 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
-import org.yczbj.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.player.SimpleStateListener;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.ConstantVideo;
+import com.yc.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
+import com.yc.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.player.SimpleStateListener;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.BasisVideoController;
 
 import java.util.List;
 

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/HomeKeyWatcher.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/HomeKeyWatcher.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

+ 6 - 5
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/OldActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/OldActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -10,10 +10,11 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.list.TestListActivity;
-import org.yczbj.ycvideoplayer.newPlayer.surface.TestSurfaceActivity;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
+import com.yc.ycvideoplayer.newPlayer.list.TestListActivity;
+import com.yc.ycvideoplayer.newPlayer.surface.TestSurfaceActivity;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 9 - 9
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestClarityActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestClarityActivity.java

@@ -1,17 +1,17 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.view.View;
 import android.widget.Button;
 
 import com.bumptech.glide.Glide;
-
-import org.yczbj.ycvideoplayer.BaseActivity;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.VideoInfoBean;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.old.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.VideoInfoBean;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.old.controller.VideoPlayerController;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import java.util.ArrayList;
 import java.util.List;

+ 7 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestEightVideoActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestEightVideoActivity.java

@@ -1,15 +1,16 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.BaseActivity;
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import java.util.ArrayList;
 import java.util.List;

+ 6 - 5
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,10 +10,11 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import java.util.ArrayList;
 import java.util.List;

+ 5 - 4
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestFragmentActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestFragmentActivity.java

@@ -1,8 +1,9 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
-import org.yczbj.ycvideoplayer.BaseActivity;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
+import com.yc.ycvideoplayer.BaseActivity;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
 
 
 /**

+ 10 - 10
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestFullActivity2.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestFullActivity2.java

@@ -1,18 +1,18 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.view.View;
 import android.widget.Button;
 
 import com.bumptech.glide.Glide;
-
-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.old.listener.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.old.listener.OnVideoControlListener;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.controller.VideoPlayerController;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 6 - 5
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestListFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestListFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,10 +11,11 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import java.util.ArrayList;
 import java.util.List;

+ 10 - 9
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestNormalActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestNormalActivity.java

@@ -1,15 +1,16 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.widget.ImageView;
 
-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.old.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.old.listener.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.old.controller.VideoPlayerController;
+import com.yc.video.old.listener.OnVideoControlListener;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 7 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestRecyclerActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestRecyclerActivity.java

@@ -1,14 +1,15 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.BaseActivity;
-import org.yczbj.ycvideoplayer.ConstantVideo;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import java.util.ArrayList;
 import java.util.List;

+ 10 - 9
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestSavePosActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestSavePosActivity.java

@@ -1,15 +1,16 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.widget.ImageView;
 
-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.old.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.old.listener.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.old.controller.VideoPlayerController;
+import com.yc.video.old.listener.OnVideoControlListener;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 10 - 10
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestTinyActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestTinyActivity.java

@@ -1,19 +1,19 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-
-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.old.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.old.listener.OnVideoControlListener;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.ConstantVideo;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.old.controller.VideoPlayerController;
+import com.yc.video.old.listener.OnVideoControlListener;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
 

+ 12 - 11
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/TestWindowActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/TestWindowActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -10,16 +10,17 @@ import android.widget.Button;
 
 import androidx.annotation.RequiresApi;
 
-import org.yczbj.ycvideoplayer.BaseActivity;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.newPlayer.tiny.TestFullActivity;
-import org.yczbj.ycvideoplayerlib.old.other.VideoPlayerManager;
-import org.yczbj.ycvideoplayerlib.ui.window.FloatPlayerView;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
-import org.yczbj.ycvideoplayerlib.ui.window.FloatWindow;
-import org.yczbj.ycvideoplayerlib.ui.window.MoveType;
-import org.yczbj.ycvideoplayerlib.ui.window.WindowScreen;
-import org.yczbj.ycvideoplayerlib.ui.window.WindowUtil;
+import com.yc.ycvideoplayer.BaseActivity;
+import com.yc.ycvideoplayer.newPlayer.tiny.TestFullActivity;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.old.other.VideoPlayerManager;
+import com.yc.video.ui.window.FloatPlayerView;
+import com.yc.video.old.player.OldVideoPlayer;
+import com.yc.video.ui.window.FloatWindow;
+import com.yc.video.ui.window.MoveType;
+import com.yc.video.ui.window.WindowScreen;
+import com.yc.video.ui.window.WindowUtil;
 
 
 /**

+ 1 - 1
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/Video.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/Video.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 public class Video {
 

+ 7 - 6
Demo/src/main/java/org/yczbj/ycvideoplayer/oldPlayer/VideoAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/oldPlayer/VideoAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.oldPlayer;
+package com.yc.ycvideoplayer.oldPlayer;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,11 +7,12 @@ import android.view.ViewGroup;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.yczbj.ycvideoplayer.ImageUtil;
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.old.controller.VideoPlayerController;
-import org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer;
+import com.yc.ycvideoplayer.ImageUtil;
+
+import org.yc.ycvideoplayer.R;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.old.controller.VideoPlayerController;
+import com.yc.video.old.player.OldVideoPlayer;
 
 import java.util.List;
 

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

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

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

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

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

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

+ 1 - 1
Demo/src/main/res/layout/activity_full_video2.xml

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

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

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

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

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

+ 1 - 1
Demo/src/main/res/layout/activity_test_video2.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/whiteBg">
 
-    <org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer
+    <com.yc.video.old.player.OldVideoPlayer
         android:id="@+id/nice_video_player"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>

+ 1 - 1
Demo/src/main/res/layout/activity_test_video3.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer
+    <com.yc.video.old.player.OldVideoPlayer
         android:id="@+id/nice_video_player"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>

+ 1 - 1
Demo/src/main/res/layout/activity_test_window.xml

@@ -7,7 +7,7 @@
 
 
     <!--视频播放器-->
-    <org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer
+    <com.yc.video.old.player.OldVideoPlayer
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_height="200dp" />

+ 1 - 1
Demo/src/main/res/layout/activity_video.xml

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

+ 1 - 1
Demo/src/main/res/layout/item_my_video.xml

@@ -4,7 +4,7 @@
     android:layout_height="wrap_content">
 
 
-    <org.yczbj.ycvideoplayerlib.old.player.OldVideoPlayer
+    <com.yc.video.old.player.OldVideoPlayer
         android:id="@+id/nice_video_player"
         android:layout_width="match_parent"
         android:layout_height="240dp"/>

+ 1 - 1
Demo/src/main/res/layout/item_tik_tok.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.yczbj.ycvideoplayer.newPlayer.tiktok.TikTokView
+    <com.yc.ycvideoplayer.newPlayer.tiktok.TikTokView
         android:id="@+id/tiktok_View"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

+ 1 - 1
Demo/src/main/res/layout/item_video.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="200dp"
         android:background="@android:color/black">
-        <org.yczbj.ycvideoplayerlib.ui.view.CustomPrepareView
+        <com.yc.video.ui.view.CustomPrepareView
             android:id="@+id/prepare_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

+ 76 - 0
MusicPlayer/.gitignore

@@ -0,0 +1,76 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+
+
+
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# Keystore files
+*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+.idea/
+
+

+ 32 - 0
MusicPlayer/build.gradle

@@ -0,0 +1,32 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+
+    defaultConfig {
+        minSdkVersion 17
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+}

+ 0 - 0
MusicPlayer/consumer-rules.pro


+ 21 - 0
MusicPlayer/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

+ 5 - 0
MusicPlayer/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.yc.music">
+
+    /
+</manifest>

+ 3 - 3
README.md

@@ -124,11 +124,11 @@
 - 如下所示
     ```
     //视频UI层,必须要有
-    implementation 'cn.yc:VideoPlayer:3.0.1'
+    implementation 'cn.yc:VideoPlayer:3.0.8'
     //视频缓存,如果不需要则可以不依赖
-    implementation 'cn.yc:VideoCache:3.0.0'
+    implementation 'cn.yc:VideoCache:3.0.5'
     //视频内核层,必须有
-    implementation 'cn.yc:VideoKernel:3.0.1'
+    implementation 'cn.yc:VideoKernel:3.0.5'
     ```
 
 #### 4.2 在xml中添加布局

+ 1 - 1
VideoCache/build.gradle

@@ -41,7 +41,7 @@ group = "cn.yc"
 //发布到JCenter上的项目名字,必须填写
 def libName = "YCVideoCacheLib"
 // 版本号,下次更新是只需要更改版本号即可
-version = "3.0.1"
+version = "3.0.5"
 /**  上面配置后上传至jcenter后的编译路径是这样的: compile 'cn.yc:YCVideoCacheLib:1.0.0'  **/
 
 //生成源文件

+ 1 - 1
VideoKernel/build.gradle

@@ -59,7 +59,7 @@ group = "cn.yc"
 //发布到JCenter上的项目名字,必须填写
 def libName = "YCVideoKernelLib"
 // 版本号,下次更新是只需要更改版本号即可
-version = "3.0.1"
+version = "3.0.5"
 /**  上面配置后上传至jcenter后的编译路径是这样的: compile 'cn.yc:YCVideoKernelLib:1.0.0'  **/
 
 //生成源文件

+ 4 - 5
VideoPlayer/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 30
-        versionName "3.0.0"
+        versionCode 38
+        versionName "3.0.8"
     }
 
     buildTypes {
@@ -55,10 +55,9 @@ def gitUrl = 'https://github.com/yangchong211/YCVideoPlayer.git' // project git
 //发布到组织名称名字,必须填写
 group = "cn.yc"
 //发布到JCenter上的项目名字,必须填写
-def libName = "YCVideoPlayerLib"
+def libName = "VideoPlayer"
 // 版本号,下次更新是只需要更改版本号即可
-version = "3.0.0"
-/**  上面配置后上传至jcenter后的编译路径是这样的: compile 'cn.yc:YCVideoPlayerLib:2.4'  **/
+version = "3.0.8"
 
 //生成源文件
 task sourcesJar(type: Jar) {

+ 12 - 4
VideoPlayer/src/main/AndroidManifest.xml

@@ -1,15 +1,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.yczbj.ycvideoplayerlib" >
-
+    package="com.yc.video" >
 
     <!--监听网络状态变化需要的权限-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 
     <application>
-        <receiver android:name=".old.other.BatterReceiver"/>
-        <receiver android:name=".old.other.NetChangedReceiver">
+        <receiver android:name="com.yc.video.old.other.BatterReceiver"/>
+        <receiver android:name="com.yc.video.old.other.NetChangedReceiver">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/config/BuriedPointEvent.java → VideoPlayer/src/main/java/com/yc/video/config/BuriedPointEvent.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.config;
+package com.yc.video.config;
 
 /**
  * <pre>

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/config/ConstantKeys.java → VideoPlayer/src/main/java/com/yc/video/config/ConstantKeys.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
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.config;
+package com.yc.video.config;
 
 
 import androidx.annotation.IntDef;

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/config/VideoInfoBean.java → VideoPlayer/src/main/java/com/yc/video/config/VideoInfoBean.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
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.config;
+package com.yc.video.config;
 
 
 import java.io.Serializable;

+ 5 - 5
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/config/VideoPlayerConfig.java → VideoPlayer/src/main/java/com/yc/video/config/VideoPlayerConfig.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayerlib.config;
+package com.yc.video.config;
 
 
 import android.content.Context;
@@ -7,11 +7,11 @@ import androidx.annotation.Nullable;
 
 import com.yc.kernel.factory.PlayerFactory;
 import com.yc.kernel.impl.media.MediaPlayerFactory;
+import com.yc.video.tool.BaseToast;
 
-import org.yczbj.ycvideoplayerlib.player.ProgressManager;
-import org.yczbj.ycvideoplayerlib.surface.SurfaceFactory;
-import org.yczbj.ycvideoplayerlib.surface.TextureViewFactory;
-import org.yczbj.ycvideoplayerlib.tool.BaseToast;
+import com.yc.video.player.ProgressManager;
+import com.yc.video.surface.SurfaceFactory;
+import com.yc.video.surface.TextureViewFactory;
 
 
 /**

+ 9 - 9
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/BaseVideoController.java → VideoPlayer/src/main/java/com/yc/video/controller/BaseVideoController.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
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.controller;
+package com.yc.video.controller;
 
 import android.app.Activity;
 import android.content.Context;
@@ -31,14 +31,14 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.player.InterVideoPlayer;
-import org.yczbj.ycvideoplayerlib.player.VideoViewManager;
-import org.yczbj.ycvideoplayerlib.player.VideoPlayer;
-import org.yczbj.ycvideoplayerlib.tool.StatesCutoutUtils;
-import org.yczbj.ycvideoplayerlib.tool.NetworkUtils;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.player.InterVideoPlayer;
+import com.yc.video.player.VideoViewManager;
+import com.yc.video.player.VideoPlayer;
+import com.yc.video.tool.StatesCutoutUtils;
+import com.yc.video.tool.NetworkUtils;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.InterControlView;
 
 import com.yc.kernel.utils.VideoLogUtils;
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/ControlWrapper.java → VideoPlayer/src/main/java/com/yc/video/controller/ControlWrapper.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
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.controller;
+package com.yc.video.controller;
 
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
@@ -21,7 +21,7 @@ import android.graphics.Bitmap;
 
 import androidx.annotation.NonNull;
 
-import org.yczbj.ycvideoplayerlib.player.InterVideoPlayer;
+import com.yc.video.player.InterVideoPlayer;
 
 /**
  * 此类的目的是为了在InterControlView接口实现类中既能调用VideoPlayer的api又能调用BaseVideoController的api,

+ 4 - 4
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/GestureVideoController.java → VideoPlayer/src/main/java/com/yc/video/controller/GestureVideoController.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
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.controller;
+package com.yc.video.controller;
 
 import android.app.Activity;
 import android.content.Context;
@@ -28,9 +28,9 @@ import android.view.WindowManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.yczbj.ycvideoplayerlib.config.ConstantKeys;
-import org.yczbj.ycvideoplayerlib.tool.PlayerUtils;
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
+import com.yc.video.config.ConstantKeys;
+import com.yc.video.tool.PlayerUtils;
+import com.yc.video.ui.view.InterControlView;
 
 import java.util.Map;
 

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/IGestureComponent.java → VideoPlayer/src/main/java/com/yc/video/controller/IGestureComponent.java

@@ -13,9 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.controller;
+package com.yc.video.controller;
 
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
+import com.yc.video.ui.view.InterControlView;
 
 public interface IGestureComponent extends InterControlView {
     /**

+ 1 - 1
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/InterVideoController.java → VideoPlayer/src/main/java/com/yc/video/controller/InterVideoController.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
 limitations under the License.
 */
-package org.yczbj.ycvideoplayerlib.controller;
+package com.yc.video.controller;
 
 /**
  * <pre>

+ 2 - 2
VideoPlayer/src/main/java/org/yczbj/ycvideoplayerlib/controller/InterViewController.java → VideoPlayer/src/main/java/com/yc/video/controller/InterViewController.java

@@ -1,6 +1,6 @@
-package org.yczbj.ycvideoplayerlib.controller;
+package com.yc.video.controller;
 
-import org.yczbj.ycvideoplayerlib.ui.view.InterControlView;
+import com.yc.video.ui.view.InterControlView;
 
 /**
  * <pre>

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