From 8eb56482a5e42bec49ba23221d2e1366b0e9709b Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 16 Feb 2024 22:38:28 +0800 Subject: [PATCH 1/2] Revert "Fix jianpian" This reverts commit 1102cf4bd240b7822f8ee1e3d3116abf36b2f72d. --- .../fongmi/android/tv/player/extractor/JianPian.java | 4 +--- jianpian/src/main/java/com/p2p/P2PClass.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 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 f0e5cf5db..9903ec66e 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,9 +46,7 @@ public class JianPian implements Source.Extractor { @Override public void stop() { try { - if (p2p == null || path == null) return; - p2p.P2Pdoxpause(path.getBytes("GBK")); - path = null; + if (p2p != null) p2p.P2Pdoxpause(path.getBytes("GBK")); } 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 1a3978380..95be7271c 100644 --- a/jianpian/src/main/java/com/p2p/P2PClass.java +++ b/jianpian/src/main/java/com/p2p/P2PClass.java @@ -19,13 +19,25 @@ 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 90a95601ce07dd24af475158057d049fc8341521 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 16 Feb 2024 23:10:15 +0800 Subject: [PATCH 2/2] fix JianPian --- .../fongmi/android/tv/player/extractor/JianPian.java | 11 ++++++++++- jianpian/src/main/java/com/p2p/P2PClass.java | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) 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..92bbf09f2 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 @@ -33,11 +33,13 @@ public class JianPian implements Source.Extractor { private void start(String url) { try { + if (path != null) p2p.P2Pdoxdel(path.getBytes("GBK")); path = URLDecoder.decode(url).split("\\|")[0]; path = path.replace("jianpian://pathtype=url&path=", ""); path = path.replace("tvbox-xg://", "").replace("tvbox-xg:", ""); path = path.replace("xg://", "ftp://").replace("xgplay://", "ftp://"); p2p.P2Pdoxstart(path.getBytes("GBK")); + p2p.P2Pdoxadd(path.getBytes("GBK")); } catch (Exception e) { e.printStackTrace(); } @@ -46,7 +48,7 @@ public class JianPian implements Source.Extractor { @Override public void stop() { try { - if (p2p != null) p2p.P2Pdoxpause(path.getBytes("GBK")); + if (p2p != null && path != null) p2p.P2Pdoxpause(path.getBytes("GBK")); } catch (Exception e) { e.printStackTrace(); } @@ -54,6 +56,13 @@ public class JianPian implements Source.Extractor { @Override public void exit() { + try { + if (p2p != null && path != null) p2p.P2Pdoxpause(path.getBytes("GBK")); + if (p2p != null && path != null) p2p.P2Pdoxdel(path.getBytes("GBK")); + if (p2p != null) p2p.P2Pdoxendhttpd(); + } catch (Exception e) { + e.printStackTrace(); + } Path.clear(Path.jpa()); } } diff --git a/jianpian/src/main/java/com/p2p/P2PClass.java b/jianpian/src/main/java/com/p2p/P2PClass.java index 95be7271c..54f4ec830 100644 --- a/jianpian/src/main/java/com/p2p/P2PClass.java +++ b/jianpian/src/main/java/com/p2p/P2PClass.java @@ -15,6 +15,10 @@ public class P2PClass { return doxstarthttpd(bArr, bArr2); } + public void P2Pdoxendhttpd() { + doxendhttpd(); + } + public void P2Pdoxstart(byte[] bArr) { doxstart(bArr); } @@ -33,6 +37,8 @@ public class P2PClass { private native int doxstarthttpd(byte[] bArr, byte[] bArr2); + private native int doxendhttpd(); + private native int doxstart(byte[] bArr); private native int doxadd(byte[] bArr);