diff --git a/app/build.gradle b/app/build.gradle index ecfbe562a..9f713db90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 33 - versionCode 50 - versionName "1.5.0" + versionCode 51 + versionName "1.5.1" ndk { abiFilters "armeabi-v7a" } } diff --git a/drpy/build.gradle b/drpy/build.gradle index 6f8449194..011cf48c2 100644 --- a/drpy/build.gradle +++ b/drpy/build.gradle @@ -8,6 +8,7 @@ android { defaultConfig { minSdk 21 targetSdk 33 + ndk { abiFilters "armeabi-v7a" } } } diff --git a/drpy/src/main/java/com/hiker/drpy/Spider.java b/drpy/src/main/java/com/hiker/drpy/Spider.java index 05f9be827..047fa1c99 100644 --- a/drpy/src/main/java/com/hiker/drpy/Spider.java +++ b/drpy/src/main/java/com/hiker/drpy/Spider.java @@ -84,8 +84,8 @@ public class Spider extends com.github.catvod.crawler.Spider { public void destroy() { submit(() -> { + executor.shutdownNow(); QuickJSContext.destroy(ctx); - QuickJSContext.destroyRuntime(ctx); }); } diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java index bc44f331d..061e551c2 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java @@ -165,11 +165,13 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { private PowerManager.WakeLock mWakeLock = null; private boolean mScreenOnWhilePlaying; private boolean mStayAwake; + private boolean dotOpen; private int mVideoWidth; private int mVideoHeight; private int mVideoSarNum; private int mVideoSarDen; + private int dotPort; private String mDataSource; @@ -379,7 +381,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { } private String encodeSpaceChinese(String str) throws UnsupportedEncodingException { - Pattern p = Pattern.compile("[\u4e00-\u9fa5 ]+"); + Pattern p = Pattern.compile("[\u4e00-\u9fa5]"); Matcher m = p.matcher(str); StringBuffer b = new StringBuffer(); while (m.find()) m.appendReplacement(b, URLEncoder.encode(m.group(0), "UTF-8")); diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java index ab0317df9..d444d4c33 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java @@ -145,7 +145,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl } public void setMediaSource(String path, Map headers) { - setVideoURI(Uri.parse(path), headers); + setVideoURI(Uri.parse(path.trim()), headers); } public void setVideoURI(Uri uri, Map headers) { @@ -507,7 +507,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl mIjkPlayer.setOption(format, "http-detect-range-support", 0); mIjkPlayer.setOption(player, "enable-accurate-seek", 0); mIjkPlayer.setOption(player, "framedrop", 1); - mIjkPlayer.setOption(player, "max-buffer-size", 15 * 1024 * 1024); + mIjkPlayer.setOption(player, "max-buffer-size", 50 * 1024 * 1024); mIjkPlayer.setOption(player, "mediacodec", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-auto-rotate", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-handle-resolution-change", mCurrentDecode);