Merge remote-tracking branch 'origin/dev' into dev

app/build.gradle

@@ -94,8 +94,6 @@ dependencies {
     implementation project(':forcetech')
     implementation project(':ijkplayer')
     pythonImplementation project(':pyramid')
-    implementation project(':media-lib-database')
-    implementation project(':media-lib-datasource')
     implementation project(':media-lib-datasource-okhttp')
     implementation project(':media-lib-datasource-rtmp')
     implementation project(':media-lib-decoder-av1')
@@ -105,10 +103,7 @@ dependencies {
     implementation project(':media-lib-exoplayer-hls')
     implementation project(':media-lib-exoplayer-rtsp')
     implementation project(':media-lib-exoplayer-smoothstreaming')
-    implementation project(':media-lib-extractor')
-    implementation project(':media-lib-session')
     implementation project(':media-lib-ui')
-    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.20')
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.biometric:biometric:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0'

app/src/main/java/com/fongmi/android/tv/player/extractor/JianPian.java

@@ -46,7 +46,9 @@ public class JianPian implements Source.Extractor {
     @Override
     public void stop() {
         try {
-            if (p2p != null) p2p.P2Pdoxpause(path.getBytes("GBK"));
+            if (p2p == null || path == null) return;
+            p2p.P2Pdoxpause(path.getBytes("GBK"));
+            path = null;
         } catch (Exception e) {
             e.printStackTrace();
         }

jianpian/src/main/java/com/p2p/P2PClass.java

@@ -19,25 +19,13 @@ public class P2PClass {
         doxstart(bArr);
     }
 
-    public void P2Pdoxadd(byte[] bArr) {
-        doxadd(bArr);
-    }
-
     public void P2Pdoxpause(byte[] bArr) {
         doxpause(bArr);
     }
 
-    public void P2Pdoxdel(byte[] bArr) {
-        doxdel(bArr);
-    }
-
     private native int doxstarthttpd(byte[] bArr, byte[] bArr2);
 
     private native int doxstart(byte[] bArr);
 
-    private native int doxadd(byte[] bArr);
-
     private native int doxpause(byte[] bArr);
-
-    private native int doxdel(byte[] bArr);
 }