From 7e25842448038c3802d89a95af8df2a05b8fce4d Mon Sep 17 00:00:00 2001 From: thanatos518 <675530973@qq.com> Date: Sun, 24 Jul 2022 14:54:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9flv|avi|mkv|rm|w?= =?UTF-8?q?mv|mpg=E7=AD=89=E5=87=A0=E7=A7=8D=E8=A7=86=E9=A2=91=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/github/tvbox/osc/util/DefaultConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java b/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java index 49dc6914..59e8778f 100644 --- a/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java +++ b/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java @@ -105,9 +105,9 @@ public class DefaultConfig { return start > -1 ? fileName.substring(0, start) : fileName; } - - private static final Pattern snifferMatch = Pattern.compile("http((?!http).){26,}?\\.(m3u8|mp4)\\?.*|http((?!http).){26,}\\.(m3u8|mp4)|http((?!http).){26,}?/m3u8\\?pt=m3u8.*|http((?!http).)*?default\\.ixigua\\.com/.*|http((?!http).)*?cdn-tos[^\\?]*|http((?!http).)*?/obj/tos[^\\?]*|http.*?/player/m3u8play\\.php\\?url=.*|http.*?/player/.*?[pP]lay\\.php\\?url=.*|http.*?/playlist/m3u8/\\?vid=.*|http.*?\\.php\\?type=m3u8&.*|http.*?/download.aspx\\?.*|http.*?/api/up_api.php\\?.*|https.*?\\.66yk\\.cn.*|http((?!http).)*?netease\\.com/file/.*"); - + //增加对flv|avi|mkv|rm|wmv|mpg等几种视频格式的支持 + //private static final Pattern snifferMatch = Pattern.compile("http((?!http).){26,}?\\.(m3u8|mp4)\\?.*|http((?!http).){26,}\\.(m3u8|mp4)|http((?!http).){26,}?/m3u8\\?pt=m3u8.*|http((?!http).)*?default\\.ixigua\\.com/.*|http((?!http).)*?cdn-tos[^\\?]*|http((?!http).)*?/obj/tos[^\\?]*|http.*?/player/m3u8play\\.php\\?url=.*|http.*?/player/.*?[pP]lay\\.php\\?url=.*|http.*?/playlist/m3u8/\\?vid=.*|http.*?\\.php\\?type=m3u8&.*|http.*?/download.aspx\\?.*|http.*?/api/up_api.php\\?.*|https.*?\\.66yk\\.cn.*|http((?!http).)*?netease\\.com/file/.*"); + private static final Pattern snifferMatch = Pattern.compile("http((?!http).){26,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)\\?.*|http((?!http).){26,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)|http((?!http).){26,}?/m3u8\\?pt=m3u8.*|http((?!http).)*?default\\.ixigua\\.com/.*|http((?!http).)*?cdn-tos[^\\?]*|http((?!http).)*?/obj/tos[^\\?]*|http.*?/player/m3u8play\\.php\\?url=.*|http.*?/player/.*?[pP]lay\\.php\\?url=.*|http.*?/playlist/m3u8/\\?vid=.*|http.*?\\.php\\?type=m3u8&.*|http.*?/download.aspx\\?.*|http.*?/api/up_api.php\\?.*|https.*?\\.66yk\\.cn.*|http((?!http).)*?netease\\.com/file/.*"); public static boolean isVideoFormat(String url) { if (url.contains("=http") || url.contains("=https") || url.contains("=https%3a%2f") || url.contains("=http%3a%2f")) { return false; From d02f5e0d08369584834355ad42bc5eb3f7953c32 Mon Sep 17 00:00:00 2001 From: thanatos518 <675530973@qq.com> Date: Sun, 24 Jul 2022 15:34:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=97=B6=E4=B8=8A=E4=B8=80=E9=9B=86=E4=B8=8E?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=9B=86=E6=92=AD=E6=94=BE=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E7=9B=B8=E5=8F=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tvbox/osc/ui/activity/PlayActivity.java | 32 ++++++++++++++++--- .../osc/ui/fragment/ModelSettingFragment.java | 2 +- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java index 2040af3d..63726f73 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java @@ -416,13 +416,25 @@ public class PlayActivity extends BaseActivity { if (mVodInfo == null || mVodInfo.seriesMap.get(mVodInfo.playFlag) == null) { hasNext = false; } else { - hasNext = mVodInfo.playIndex + 1 < mVodInfo.seriesMap.get(mVodInfo.playFlag).size(); +//修正倒序排序时上一集与下一集播放顺序相反的问题 +// hasNext = mVodInfo.playIndex + 1 < mVodInfo.seriesMap.get(mVodInfo.playFlag).size(); + if (mVodInfo.reverseSort){ + hasNext = mVodInfo.playIndex - 1 >= 0; + } else { + hasNext = mVodInfo.playIndex + 1 < mVodInfo.seriesMap.get(mVodInfo.playFlag).size(); + } } if (!hasNext) { Toast.makeText(this, "已经是最后一集了!", Toast.LENGTH_SHORT).show(); return; } - mVodInfo.playIndex++; +//修正倒序排序时上一集与下一集播放顺序相反的问题 +// mVodInfo.playIndex++; + if (mVodInfo.reverseSort){ + mVodInfo.playIndex--; + } else { + mVodInfo.playIndex++; + } play(); } @@ -431,13 +443,25 @@ public class PlayActivity extends BaseActivity { if (mVodInfo == null || mVodInfo.seriesMap.get(mVodInfo.playFlag) == null) { hasPre = false; } else { - hasPre = mVodInfo.playIndex - 1 >= 0; +//修正倒序排序时上一集与下一集播放顺序相反的问题 +// hasPre = mVodInfo.playIndex - 1 >= 0; + if (mVodInfo.reverseSort){ + hasPre = mVodInfo.playIndex + 1 < mVodInfo.seriesMap.get(mVodInfo.playFlag).size(); + } else { + hasPre = mVodInfo.playIndex - 1 >= 0; + } } if (!hasPre) { Toast.makeText(this, "已经是第一集了!", Toast.LENGTH_SHORT).show(); return; } - mVodInfo.playIndex--; +//修正倒序排序时上一集与下一集播放顺序相反的问题 +// mVodInfo.playIndex--; + if (mVodInfo.reverseSort){ + mVodInfo.playIndex++; + } else { + mVodInfo.playIndex--; + } play(); } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java index 25033c07..122801dc 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java @@ -44,7 +44,7 @@ import tv.danmaku.ijk.media.player.IjkMediaPlayer; /** * @author pj567 * @date :2020/12/23 - * @description: + * @description: 设置页面 */ public class ModelSettingFragment extends BaseLazyFragment { private TextView tvDebugOpen;