From fdc44e2ce8c2dbcd7d4286c2cc13f38a11d29a40 Mon Sep 17 00:00:00 2001 From: 21561 <215613905@qq.com> Date: Tue, 25 Jul 2023 23:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=97=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDrtp=E5=8D=8F=E8=AE=AE;=E4=BF=AE=E6=AD=A3=E4=B8=80?= =?UTF-8?q?=E5=A4=84T4=20bug;=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=E5=8F=AF?= =?UTF-8?q?=E4=BB=8E=E6=96=87=E4=BB=B6=E5=A4=B9=E5=92=8C=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E8=87=AA=E7=94=B1=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tvbox/osc/picasso/MyOkhttpDownLoader.java | 2 +- .../tvbox/osc/player/controller/VodController.java | 6 ++++++ .../github/tvbox/osc/ui/activity/PlayActivity.java | 1 - .../github/tvbox/osc/ui/fragment/GridFragment.java | 14 +++++++++----- .../github/tvbox/osc/ui/fragment/PlayFragment.java | 2 +- .../github/tvbox/osc/util/live/TxtSubscribe.java | 2 +- .../tvbox/osc/viewmodel/SourceViewModel.java | 8 +++++--- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/picasso/MyOkhttpDownLoader.java b/app/src/main/java/com/github/tvbox/osc/picasso/MyOkhttpDownLoader.java index 10b204d1..f12f1a79 100644 --- a/app/src/main/java/com/github/tvbox/osc/picasso/MyOkhttpDownLoader.java +++ b/app/src/main/java/com/github/tvbox/osc/picasso/MyOkhttpDownLoader.java @@ -76,7 +76,7 @@ public final class MyOkhttpDownLoader implements Downloader { if (url.contains("@Referer=")) referer= url.split("@Referer=")[1].split("@")[0]; url = url.split("@")[0]; - Request.Builder mRequestBuilder = new Request.Builder().url(url); + Request.Builder mRequestBuilder = request.newBuilder().url(url); if(!TextUtils.isEmpty(header)) { JsonObject jsonInfo = new Gson().fromJson(header, JsonObject.class); for (String key : jsonInfo.keySet()) { diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java index d278a27c..dd6d8137 100644 --- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java +++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java @@ -951,4 +951,10 @@ public class VodController extends BaseController { } return false; } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + mHandler.removeCallbacks(myRunnable2); + } } 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 1e227556..43d96428 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 @@ -828,7 +828,6 @@ public class PlayActivity extends BaseActivity { String jp_url= vs.url; mController.showParse(false); if(vs.url.startsWith("tvbox-xg:")){ - jp_url = jp_url.replace("tvbox-xg://","tvbox-xg:"); playUrl(Jianpian.JPUrlDec(jp_url.substring(9)), null); }else { playUrl(Jianpian.JPUrlDec(jp_url), null); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java index d527f792..dce21970 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java @@ -83,7 +83,12 @@ public class GridFragment extends BaseLazyFragment { initData(); } - private void changeView(String id){ + private void changeView(String id,Boolean isFolder){ + if(isFolder){ + this.sortData.flag ="1"; // 修改sortData.flag + }else { + this.sortData.flag =null; // 修改sortData.flag + } initView(); this.sortData.id =id; // 修改sortData.id为新的ID initViewModel(); @@ -96,7 +101,7 @@ public class GridFragment extends BaseLazyFragment { return (sortData == null || sortData.flag == null || sortData.flag.length() ==0 ) ? '0' : sortData.flag.charAt(0); } // 是否允许聚合搜索 sortData.flag的第二个字符为‘1’时允许聚搜 - public boolean enableFastSearch(){ return (sortData.flag == null || sortData.flag.length() < 2 ) ? true : (sortData.flag.charAt(1) =='1'); } + public boolean enableFastSearch(){ return sortData.flag == null || sortData.flag.length() < 2 || (sortData.flag.charAt(1) == '1'); } // 保存当前页面 private void saveCurrentView(){ if(this.mGridView == null) return; @@ -201,11 +206,10 @@ public class GridFragment extends BaseLazyFragment { bundle.putString("id", video.id); bundle.putString("sourceKey", video.sourceKey); bundle.putString("title", video.name); - SourceBean homeSourceBean = ApiConfig.get().getHomeSourceBean(); - if(("12".indexOf(getUITag()) != -1) && video.tag.equals("folder")){ + if(("12".indexOf(getUITag()) != -1) && (video.tag.equals("folder") || video.tag.equals("cover"))){ focusedView = view; - changeView(video.id); + changeView(video.id,video.tag.equals("folder")); } else if(homeSourceBean.isQuickSearch() && Hawk.get(HawkConfig.FAST_SEARCH_MODE, false) && enableFastSearch()){ jumpActivity(FastSearchActivity.class, bundle); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java index b7db80c0..11d7f3e9 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java @@ -755,6 +755,7 @@ public class PlayFragment extends BaseLazyFragment { @Override public void onDestroyView() { super.onDestroyView(); + EventBus.getDefault().unregister(this); if (mVideoView != null) { mVideoView.release(); mVideoView = null; @@ -853,7 +854,6 @@ public class PlayFragment extends BaseLazyFragment { String jp_url= vs.url; mController.showParse(false); if(vs.url.startsWith("tvbox-xg:")){ - jp_url = jp_url.replace("tvbox-xg://","tvbox-xg:"); playUrl(Jianpian.JPUrlDec(jp_url.substring(9)), null); }else { playUrl(Jianpian.JPUrlDec(jp_url), null); diff --git a/app/src/main/java/com/github/tvbox/osc/util/live/TxtSubscribe.java b/app/src/main/java/com/github/tvbox/osc/util/live/TxtSubscribe.java index d6904291..8750ea64 100644 --- a/app/src/main/java/com/github/tvbox/osc/util/live/TxtSubscribe.java +++ b/app/src/main/java/com/github/tvbox/osc/util/live/TxtSubscribe.java @@ -37,7 +37,7 @@ public class TxtSubscribe { String trim2 = split[0].trim(); for (String str2 : split[1].trim().split("#")) { String trim3 = str2.trim(); - if (!trim3.isEmpty() && (trim3.startsWith("http") || trim3.startsWith("rtsp") || trim3.startsWith("rtmp"))) { + if (!trim3.isEmpty() && (trim3.startsWith("http") || trim3.startsWith("rtp") || trim3.startsWith("rtsp") || trim3.startsWith("rtmp"))) { if (!linkedHashMap3.containsKey(trim2)) { arrayList = new ArrayList<>(); linkedHashMap3.put(trim2, arrayList); diff --git a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java index e4cc2fda..b1d062d8 100644 --- a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java +++ b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java @@ -284,15 +284,17 @@ public class SourceViewModel extends ViewModel { } }); }else if (type == 4) { - String ext=""; + String ext= ""; if (sortData.filterSelect != null && sortData.filterSelect.size() > 0) { try { - LOG.i(new JSONObject(sortData.filterSelect).toString()); - ext = Base64.encodeToString(new JSONObject(sortData.filterSelect).toString().getBytes("UTF-8"), Base64.DEFAULT | Base64.NO_WRAP); + String selectExt = new JSONObject(sortData.filterSelect).toString(); + ext = Base64.encodeToString(selectExt.getBytes("UTF-8"), Base64.DEFAULT | Base64.NO_WRAP); LOG.i(ext); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } + }else { + ext = Base64.encodeToString("{}".getBytes(), Base64.DEFAULT | Base64.NO_WRAP); } OkGo.get(homeSourceBean.getApi()) .tag(homeSourceBean.getApi())