Merge branch 'dev' into release

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" }
     }
 

drpy/build.gradle

@@ -8,6 +8,7 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
+        ndk { abiFilters "armeabi-v7a" }
     }
 }
 

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);
         });
     }
 

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"));

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<String, String> headers) {
-        setVideoURI(Uri.parse(path), headers);
+        setVideoURI(Uri.parse(path.trim()), headers);
     }
 
     public void setVideoURI(Uri uri, Map<String, String> 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);