热搜词改回腾讯热搜 收藏可见站点名称 字幕搜索结果过滤 非阿里系字幕搜索默认取剧名 音轨改取language为name 据搜切换站点时偶发性bug

app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java

@@ -270,14 +270,14 @@ public class FastSearchActivity extends BaseActivity {
         }
         String key = spNames.get(spName);
         if(key.isEmpty()) return;
+        mGridView.setVisibility(View.GONE);
+        mGridViewFilter.setVisibility(View.VISIBLE);
 
         if(searchFilterKey == key) return;
         searchFilterKey = key;
 
         List<Movie.Video> list = resultVods.get(key);
         searchAdapterFilter.setNewData(list);
-        mGridView.setVisibility(View.GONE);
-        mGridViewFilter.setVisibility(View.VISIBLE);
     }
 
     private void fenci(){

app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java

@@ -1186,8 +1186,8 @@ public class LivePlayActivity extends BaseActivity {
         @Override
         public void run() {
             if (mVideoView == null) return;
-            tvNetSpeed.setText(String.format("%.2fMB/s", (float)mVideoView.getTcpSpeed() / 1024.0 / 1024.0));
-            tv_right_top_tipnetspeed.setText(String.format("%.2fKB/s",(float)mVideoView.getTcpSpeed()/1024.0));
+            tvNetSpeed.setText(String.format("%.2fMb/s", (float)mVideoView.getTcpSpeed() / 1024.0 / 1024.0));
+            tv_right_top_tipnetspeed.setText(String.format("%.2fKb/s",(float)mVideoView.getTcpSpeed()/1024.0));
             mHandler.postDelayed(this, 1000);
         }
     };

app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java

@@ -269,7 +269,11 @@ public class PlayActivity extends BaseActivity {
                         });
                     }
                 });
-                searchSubtitleDialog.setSearchWord(mVodInfo.playNote);
+                if(mVodInfo.playFlag.contains("Ali")||mVodInfo.playFlag.contains("parse")){
+                    searchSubtitleDialog.setSearchWord(mVodInfo.playNote);
+                }else {
+                    searchSubtitleDialog.setSearchWord(mVodInfo.name);
+                }
                 searchSubtitleDialog.show();
             }
         });
@@ -337,7 +341,9 @@ public class PlayActivity extends BaseActivity {
 
             @Override
             public String getDisplay(TrackInfoBean val) {
-                return val.index + " : " + val.language;
+//                return val.index + " : " + val.language;
+                String str = val.name.substring(val.name.substring(0, val.name.indexOf(",")).length()+1).trim();
+                return val.index + " : " + str;
             }
         }, new DiffUtil.ItemCallback<TrackInfoBean>() {
             @Override

app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java

@@ -253,7 +253,7 @@ public class SearchActivity extends BaseActivity {
         OkGo.<String>get("https://s.video.qq.com/smartbox")
                 .params("plat", 2)
                 .params("ver", 0)
-                .params("num", 10)
+                .params("num", 20)
                 .params("otype", "json")
                 .params("query", key)
                 .execute(new AbsCallback<String>() {
@@ -279,6 +279,30 @@ public class SearchActivity extends BaseActivity {
                         return response.body().string();
                     }
                 });
+//        OkGo.<String>get("https://suggest.video.iqiyi.com/")
+//                .params("if", "mobile")
+//                .params("key", key)
+//                .execute(new AbsCallback<String>() {
+//                    @Override
+//                    public void onSuccess(Response<String> response) {
+//                        try {
+//                            String result = response.body();
+//                            JsonObject json = JsonParser.parseString(result).getAsJsonObject();
+//                            JsonArray itemList = json.get("data").getAsJsonArray();
+//                            for (JsonElement ele : itemList) {
+//                                JsonObject obj = (JsonObject) ele;
+//                                hots.add(obj.get("name").getAsString().trim());
+//                            }
+//                        } catch (Throwable th) {
+//                            th.printStackTrace();
+//                        }
+//                    }
+//
+//                    @Override
+//                    public String convertResponse(okhttp3.Response response) throws Throwable {
+//                        return response.body().string();
+//                    }
+//                });
     }
 
     private void initData() {
@@ -290,17 +314,18 @@ public class SearchActivity extends BaseActivity {
             search(title);
         }
         // 加载热词
-//        OkGo.<String>get("https://node.video.qq.com/x/api/hot_mobilesearch")
-        OkGo.<String>get("https://api.web.360kan.com/v1/rank")
-                .params("cat", "1")
-//                .params("_", System.currentTimeMillis())
+        OkGo.<String>get("https://node.video.qq.com/x/api/hot_mobilesearch")
+//        OkGo.<String>get("https://api.web.360kan.com/v1/rank")
+//                .params("cat", "1")
+                .params("channdlId", "0")
+                .params("_", System.currentTimeMillis())
                 .execute(new AbsCallback<String>() {
                     @Override
                     public void onSuccess(Response<String> response) {
                         try {
                             ArrayList<String> hots = new ArrayList<>();
-//                            JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonObject().get("itemList").getAsJsonArray();
-                            JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonArray();
+                            JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonObject().get("itemList").getAsJsonArray();
+//                            JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonArray();
                             for (JsonElement ele : itemList) {
                                 JsonObject obj = (JsonObject) ele;
                                 hots.add(obj.get("title").getAsString().trim().replaceAll("<|>|《|》|-", "").split(" ")[0]);

app/src/main/java/com/github/tvbox/osc/ui/adapter/CollectAdapter.java

@@ -2,10 +2,12 @@ package com.github.tvbox.osc.ui.adapter;
 
 import android.text.TextUtils;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.github.tvbox.osc.R;
+import com.github.tvbox.osc.api.ApiConfig;
 import com.github.tvbox.osc.cache.VodCollect;
 import com.github.tvbox.osc.picasso.RoundTransformation;
 import com.github.tvbox.osc.util.DefaultConfig;
@@ -23,10 +25,11 @@ public class CollectAdapter extends BaseQuickAdapter<VodCollect, BaseViewHolder>
 
     @Override
     protected void convert(BaseViewHolder helper, VodCollect item) {
-        helper.setVisible(R.id.tvYear, false);
         helper.setVisible(R.id.tvLang, false);
         helper.setVisible(R.id.tvArea, false);
         helper.setVisible(R.id.tvNote, false);
+        TextView tvYear = helper.getView(R.id.tvYear);
+        tvYear.setText(ApiConfig.get().getSource(item.sourceKey).getName());
         helper.setText(R.id.tvName, item.name);
         ImageView ivThumb = helper.getView(R.id.ivThumb);
         //由于部分电视机使用glide报错

app/src/main/java/com/github/tvbox/osc/ui/dialog/SearchSubtitleDialog.java

@@ -114,7 +114,7 @@ public class SearchSubtitleDialog extends BaseDialog {
         wd = wd.replaceAll("(?:：|\\:|）|\\)|\\]|】|\\.)", " ");
         int len = wd.length();
         int finalLen = len >= 36 ? 36 : len;
-        wd = wd.substring(0, finalLen);
+        wd = wd.substring(0, finalLen).trim();
         subtitleSearchEt.setText(wd);
         subtitleSearchEt.setSelection(wd.length());
         subtitleSearchEt.requestFocus();
@@ -145,11 +145,21 @@ public class SearchSubtitleDialog extends BaseDialog {
                     mGridView.post(new Runnable() {
                         @Override
                         public void run() {
-                            Toast.makeText(getContext(), "查询出错", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getContext(), "未查询到匹配字幕", Toast.LENGTH_SHORT).show();
                         }
                     });
                     return;
                 }
+                //过滤结果
+                ArrayList<Subtitle> data_new=new ArrayList<>();
+                for (int i=0;i< data.size();i++){
+                    Subtitle subtitle = data.get(i);
+                    if(subtitle.getName().contains(searchWord)){
+                        data_new.add(subtitle);
+                    }
+                }
+                data = data_new;
+
                 if (data.size() > 0) {
                     mGridView.requestFocus();
                     if (subtitleData.getIsZip()) {

app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java

@@ -269,7 +269,11 @@ public class PlayFragment extends BaseLazyFragment {
                         });
                     }
                 });
-                searchSubtitleDialog.setSearchWord(mVodInfo.playNote);
+                if(mVodInfo.playFlag.contains("Ali")||mVodInfo.playFlag.contains("parse")){
+                    searchSubtitleDialog.setSearchWord(mVodInfo.playNote);
+                }else {
+                    searchSubtitleDialog.setSearchWord(mVodInfo.name);
+                }
                 searchSubtitleDialog.show();
             }
         });
@@ -338,7 +342,9 @@ public class PlayFragment extends BaseLazyFragment {
 
             @Override
             public String getDisplay(TrackInfoBean val) {
-                return val.index + " : " + val.language;
+//                return val.index + " : " + val.language;
+                String str = val.name.substring(val.name.substring(0, val.name.indexOf(",")).length()+1).trim();
+                return val.index + " : " + str;
             }
         }, new DiffUtil.ItemCallback<TrackInfoBean>() {
             @Override