From 1102cf4bd240b7822f8ee1e3d3116abf36b2f72d Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 15 Feb 2024 11:25:36 +0800 Subject: [PATCH 1/4] Fix jianpian --- .../fongmi/android/tv/player/extractor/JianPian.java | 4 +++- jianpian/src/main/java/com/p2p/P2PClass.java | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/JianPian.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/JianPian.java index 9903ec66e..f0e5cf5db 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/JianPian.java +++ b/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(); } diff --git a/jianpian/src/main/java/com/p2p/P2PClass.java b/jianpian/src/main/java/com/p2p/P2PClass.java index 95be7271c..1a3978380 100644 --- a/jianpian/src/main/java/com/p2p/P2PClass.java +++ b/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); } From 44531d06dc132ad119f7561ece319399dedf640d Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 15 Feb 2024 11:41:39 +0800 Subject: [PATCH 2/4] Clean gradle --- app/build.gradle | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a3373972c..0245d1f38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,26 +94,21 @@ 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') implementation project(':media-lib-decoder-ffmpeg') + implementation project(':media-lib-decoder-midi') implementation project(':media-lib-exoplayer') implementation project(':media-lib-exoplayer-dash') 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' implementation 'androidx.room:room-runtime:2.6.1' - implementation 'androidx.media:media:1.7.0' implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0' implementation 'com.github.bumptech.glide:glide:4.16.0' From b403dab985e92415f44909ecef7e542db0562d9b Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 15 Feb 2024 11:54:29 +0800 Subject: [PATCH 3/4] Fix build --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 0245d1f38..f3ecf8c78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,6 +109,7 @@ dependencies { implementation 'androidx.biometric:biometric:1.1.0' implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0' implementation 'androidx.room:room-runtime:2.6.1' + implementation 'androidx.media:media:1.7.0' implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0' implementation 'com.github.bumptech.glide:glide:4.16.0' From fe9949ce8087576e2be9e3621c6f359f6842a71d Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 15 Feb 2024 13:35:46 +0800 Subject: [PATCH 4/4] Update build.gradle --- app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f3ecf8c78..ed1278737 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,6 @@ dependencies { implementation project(':media-lib-datasource-rtmp') implementation project(':media-lib-decoder-av1') implementation project(':media-lib-decoder-ffmpeg') - implementation project(':media-lib-decoder-midi') implementation project(':media-lib-exoplayer') implementation project(':media-lib-exoplayer-dash') implementation project(':media-lib-exoplayer-hls')