直播列表加载rtp协议;修正一处T4 bug;分类列表可从文件夹和封面形式自由切换

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()) {

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

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

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

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

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

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.<String>get(homeSourceBean.getApi())
                 .tag(homeSourceBean.getApi())