Procházet zdrojové kódy

完善音频维护

yangchong před 3 roky
rodič
revize
587c4970d9
42 změnil soubory, kde provedl 76 přidání a 118 odebrání
  1. 15 45
      Demo/src/main/AndroidManifest.xml
  2. 1 4
      Demo/src/main/java/com/yc/ycvideoplayer/MainActivity.java
  3. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/m3u8/M3u8Activity.java
  4. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/activity/DetailActivity.java
  5. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/activity/IntentKeys.java
  6. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/activity/MultipleActivity.java
  7. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/activity/NormalActivity.java
  8. 11 11
      Demo/src/main/java/com/yc/ycvideoplayer/video/activity/TypeActivity.java
  9. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/ad/AdActivity.java
  10. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/ad/AdControlView.java
  11. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/clarity/ClarityActivity.java
  12. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/clarity/DefinitionControlView.java
  13. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/CenteredImageSpan.java
  14. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/DanmuActivity.java
  15. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/MyDanmakuView.java
  16. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/ContinuousVideoActivity.java
  17. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/OnItemChildClickListener.java
  18. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/OnItemClickListener.java
  19. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/PlayerMonitor.java
  20. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerView2Fragment.java
  21. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerViewAutoPlayFragment.java
  22. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerViewFragment.java
  23. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/SeamlessPlayFragment.java
  24. 3 11
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/TestListActivity.java
  25. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/list/VideoRecyclerViewAdapter.java
  26. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/pip/PipActivity.java
  27. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/video/pip/PipListActivity.java
  28. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/surface/MySurfaceView.java
  29. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/surface/TestSurfaceActivity.java
  30. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1Activity.java
  31. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1ListAdapter.java
  32. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1ListFragment.java
  33. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok2Activity.java
  34. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokListAdapter.java
  35. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokListFragment.java
  36. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokRenderView.java
  37. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokRenderViewFactory.java
  38. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokView.java
  39. 1 1
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/Tiktok2Adapter.java
  40. 1 2
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiny/TestFullActivity.java
  41. 3 3
      Demo/src/main/java/com/yc/ycvideoplayer/video/tiny/TinyScreenActivity.java
  42. 1 1
      Demo/src/main/res/layout/item_tik_tok.xml

+ 15 - 45
Demo/src/main/AndroidManifest.xml

@@ -27,80 +27,50 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.activity.TypeActivity"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestTinyActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.activity.TypeActivity"/>
+        <activity android:name="com.yc.ycvideoplayer.video.list.TestListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestClarityActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.tiny.TestFullActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestRecyclerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestFragmentActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestEightVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.list.TestListActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestWindowActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestNormalActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiny.TestFullActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestSavePosActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.surface.TestSurfaceActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.surface.TestSurfaceActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
 <!--        <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="com.yc.ycvideoplayer.newPlayer.activity.MultipleActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiktok.TikTok2Activity"
+        <activity android:name="com.yc.ycvideoplayer.video.activity.NormalActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiktok.TikTok1Activity"
+        <activity android:name="com.yc.ycvideoplayer.video.activity.MultipleActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.TestFullActivity2"
+        <activity android:name="com.yc.ycvideoplayer.video.tiktok.TikTok2Activity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.danmu.DanmuActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.tiktok.TikTok1Activity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.ad.AdActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.danmu.DanmuActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.list.ContinuousVideoActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.ad.AdActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.clarity.ClarityActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.list.ContinuousVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.tiny.TinyScreenActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.clarity.ClarityActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.oldPlayer.OldActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.tiny.TinyScreenActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.pip.PipActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.pip.PipActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.newPlayer.pip.PipListActivity"
+        <activity android:name="com.yc.ycvideoplayer.video.pip.PipListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
         <activity android:name="com.yc.ycvideoplayer.demo.DemoActivity"/>

+ 1 - 4
Demo/src/main/java/com/yc/ycvideoplayer/MainActivity.java

@@ -34,9 +34,7 @@ import com.yc.ycvideoplayer.audio.AudioActivity;
 import com.yc.ycvideoplayer.demo.DemoActivity;
 import com.yc.ycvideoplayer.m3u8.M3u8Activity;
 import com.yc.ycvideoplayer.music.MusicPlayerActivity;
-import com.yc.ycvideoplayer.newPlayer.activity.TypeActivity;
-import com.yc.ycvideoplayer.oldPlayer.OldActivity;
-
+import com.yc.ycvideoplayer.video.activity.TypeActivity;
 import java.util.List;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;
@@ -107,7 +105,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 startActivity(TypeActivity.class);
                 break;
             case R.id.tv_3:
-                startActivity(OldActivity.class);
                 break;
             case R.id.tv_4:
                 startCheckService();

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/m3u8/M3u8Activity.java

@@ -18,7 +18,7 @@ import com.yc.m3u8.manager.M3u8LiveManger;
 import com.yc.m3u8.task.M3u8DownloadTask;
 import com.yc.m3u8.utils.M3u8FileUtils;
 import com.yc.m3u8.utils.NetSpeedUtils;
-import com.yc.ycvideoplayer.newPlayer.activity.NormalActivity;
+import com.yc.ycvideoplayer.video.activity.NormalActivity;
 
 import org.yc.ycvideoplayer.R;
 

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/DetailActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/activity/DetailActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.video.activity;
 
 import android.content.Intent;
 import android.os.Build;

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

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

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/MultipleActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/activity/MultipleActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.video.activity;
 
 import android.os.Bundle;
 

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/NormalActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/activity/NormalActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.video.activity;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;

+ 11 - 11
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/TypeActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/activity/TypeActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.activity;
+package com.yc.ycvideoplayer.video.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -12,16 +12,16 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
 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.ycvideoplayer.video.ad.AdActivity;
+import com.yc.ycvideoplayer.video.clarity.ClarityActivity;
+import com.yc.ycvideoplayer.video.danmu.DanmuActivity;
+import com.yc.ycvideoplayer.video.list.ContinuousVideoActivity;
+import com.yc.ycvideoplayer.video.list.TestListActivity;
+import com.yc.ycvideoplayer.video.pip.PipActivity;
+import com.yc.ycvideoplayer.video.pip.PipListActivity;
+import com.yc.ycvideoplayer.video.surface.TestSurfaceActivity;
+import com.yc.ycvideoplayer.video.tiny.TestFullActivity;
+import com.yc.ycvideoplayer.video.tiny.TinyScreenActivity;
 import com.yc.video.config.ConstantKeys;
 
 import com.yc.kernel.impl.exo.ExoMediaPlayer;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/ad/AdActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.ad;
+package com.yc.ycvideoplayer.video.ad;
 
 import android.os.Bundle;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdControlView.java → Demo/src/main/java/com/yc/ycvideoplayer/video/ad/AdControlView.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.ad;
+package com.yc.ycvideoplayer.video.ad;
 
 import android.app.Activity;
 import android.content.Context;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/clarity/ClarityActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/clarity/ClarityActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.clarity;
+package com.yc.ycvideoplayer.video.clarity;
 
 import android.os.Bundle;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/clarity/DefinitionControlView.java → Demo/src/main/java/com/yc/ycvideoplayer/video/clarity/DefinitionControlView.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.clarity;
+package com.yc.ycvideoplayer.video.clarity;
 
 import android.content.Context;
 import android.graphics.Color;

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

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

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/DanmuActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/DanmuActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.danmu;
+package com.yc.ycvideoplayer.video.danmu;
 
 import android.os.Handler;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/MyDanmakuView.java → Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/MyDanmakuView.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.danmu;
+package com.yc.ycvideoplayer.video.danmu;
 
 import android.content.Context;
 import android.graphics.Canvas;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/ContinuousVideoActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/ContinuousVideoActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 import android.os.Bundle;
 import android.view.View;

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

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

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

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

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/PlayerMonitor.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/PlayerMonitor.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 import android.view.View;
 import android.view.animation.Animation;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerView2Fragment.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerView2Fragment.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;

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

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

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/RecyclerViewFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerViewFragment.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;

+ 3 - 3
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/SeamlessPlayFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/SeamlessPlayFragment.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 import android.content.Intent;
 import android.os.Build;
@@ -11,8 +11,8 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 
 import org.yc.ycvideoplayer.R;
-import com.yc.ycvideoplayer.newPlayer.activity.DetailActivity;
-import com.yc.ycvideoplayer.newPlayer.activity.IntentKeys;
+import com.yc.ycvideoplayer.video.activity.DetailActivity;
+import com.yc.ycvideoplayer.video.activity.IntentKeys;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.VideoViewManager;

+ 3 - 11
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/TestListActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/TestListActivity.java

@@ -1,11 +1,10 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 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;
+import com.yc.ycvideoplayer.video.tiktok.TikTok1ListFragment;
+import com.yc.ycvideoplayer.video.tiktok.TikTokListFragment;
 
 
 /**
@@ -13,13 +12,6 @@ import com.yc.video.old.other.VideoPlayerManager;
  */
 public class TestListActivity extends BaseActivity {
 
-    @Override
-    public void onBackPressed() {
-        if (VideoPlayerManager.instance().onBackPressed()) {
-            return;
-        }
-        super.onBackPressed();
-    }
 
     @Override
     public int getContentView() {

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/VideoRecyclerViewAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/video/list/VideoRecyclerViewAdapter.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.list;
+package com.yc.ycvideoplayer.video.list;
 
 import android.view.LayoutInflater;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/pip/PipActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/pip/PipActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.pip;
+package com.yc.ycvideoplayer.video.pip;
 
 import android.os.Bundle;
 import android.view.View;

+ 3 - 3
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/pip/PipListActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/pip/PipListActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.pip;
+package com.yc.ycvideoplayer.video.pip;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yc.ycvideoplayer.ConstantVideo;
-import com.yc.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
-import com.yc.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
+import com.yc.ycvideoplayer.video.list.OnItemChildClickListener;
+import com.yc.ycvideoplayer.video.list.VideoRecyclerViewAdapter;
 
 import org.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/surface/MySurfaceView.java → Demo/src/main/java/com/yc/ycvideoplayer/video/surface/MySurfaceView.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.surface;
+package com.yc.ycvideoplayer.video.surface;
 
 import android.content.Context;
 import android.graphics.Bitmap;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/surface/TestSurfaceActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/surface/TestSurfaceActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.surface;
+package com.yc.ycvideoplayer.video.surface;
 
 import android.os.Bundle;
 import android.view.SurfaceHolder;

+ 3 - 3
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1Activity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1Activity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.content.Context;
 import android.content.Intent;
@@ -16,8 +16,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.yc.pagerlib.recycler.OnPagerListener;
 import com.yc.pagerlib.recycler.PagerLayoutManager;
 import com.yc.ycvideoplayer.ConstantVideo;
-import com.yc.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
-import com.yc.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
+import com.yc.ycvideoplayer.video.list.OnItemChildClickListener;
+import com.yc.ycvideoplayer.video.list.VideoRecyclerViewAdapter;
 
 import org.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1ListAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1ListAdapter.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.view.LayoutInflater;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok1ListFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1ListFragment.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTok2Activity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok2Activity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.content.Context;
 import android.content.Intent;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokListAdapter.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokListAdapter.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.view.LayoutInflater;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokListFragment.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokListFragment.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokRenderView.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokRenderView.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.graphics.Bitmap;
 import android.view.View;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokRenderViewFactory.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokRenderViewFactory.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.content.Context;
 

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokView.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokView.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.content.Context;
 import android.util.AttributeSet;

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/Tiktok2Adapter.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/Tiktok2Adapter.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiktok;
+package com.yc.ycvideoplayer.video.tiktok;
 
 import android.content.Context;
 import android.view.LayoutInflater;

+ 1 - 2
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiny/TestFullActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiny/TestFullActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiny;
+package com.yc.ycvideoplayer.video.tiny;
 
 import android.os.Build;
 import android.view.View;
@@ -11,7 +11,6 @@ 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;
 

+ 3 - 3
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiny/TinyScreenActivity.java → Demo/src/main/java/com/yc/ycvideoplayer/video/tiny/TinyScreenActivity.java

@@ -1,4 +1,4 @@
-package com.yc.ycvideoplayer.newPlayer.tiny;
+package com.yc.ycvideoplayer.video.tiny;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yc.ycvideoplayer.ConstantVideo;
-import com.yc.ycvideoplayer.newPlayer.list.OnItemChildClickListener;
-import com.yc.ycvideoplayer.newPlayer.list.VideoRecyclerViewAdapter;
+import com.yc.ycvideoplayer.video.list.OnItemChildClickListener;
+import com.yc.ycvideoplayer.video.list.VideoRecyclerViewAdapter;
 
 import org.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;

+ 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">
 
-    <com.yc.ycvideoplayer.newPlayer.tiktok.TikTokView
+    <com.yc.ycvideoplayer.video.tiktok.TikTokView
         android:id="@+id/tiktok_View"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>