hg
/
JY-TVBoxOS
mirror of https://github.com/q215613905/TVBoxOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

热搜词修正 优化聚搜逻辑 以及其他小调整

Browse Source
pull/54/head
21561 4 years ago
parent 38b7df4fff
commit 0d949e3493
7 changed files with 46 additions and 47 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java
  2. 4
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  3. 4
      app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java
  4. 12
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  5. 4
      app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
  6. 12
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  7. 53
      app/src/main/res/layout/player_vod_control_view.xml

4
app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java
Unescape View File

@ -24,7 +24,7 @@ public class AbsJson implements Serializable {
public int group_id; //: 0
public int type_id; //: 32
public int type_id_1; //: 31
// public String type_name; //: "国产剧"
public String type_name; //: "国产剧"
public String vod_actor; //: "黄小戈,赵旭东,时男,傅隽,张佳琳"
public String vod_area; //: "中国大陆"
public String vod_author; //: ""
@ -112,7 +112,7 @@ public class AbsJson implements Serializable {
video.id = vod_id;
video.tid = type_id;
video.name = vod_name;
video.type = "";
video.type = type_name;
// video.dt = vod_play_from == null ? "" : vod_play_from.replace("$$$", ",");
video.pic = vod_pic;
video.lang = vod_lang;

4
app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
Unescape View File

@ -264,7 +264,7 @@ public class DetailActivity extends BaseActivity {
//获取剪切板管理器
ClipboardManager cm = (ClipboardManager)getSystemService(mContext.CLIPBOARD_SERVICE);
//设置内容到剪切板
cm.setPrimaryClip(ClipData.newPlainText(null, tvPlayUrl.getText().toString().replace("播放地址: ","")));
cm.setPrimaryClip(ClipData.newPlainText(null, tvPlayUrl.getText().toString().replace("播放地址：","")));
Toast.makeText(DetailActivity.this, "已复制", Toast.LENGTH_SHORT).show();
}
});
@ -532,7 +532,7 @@ public class DetailActivity extends BaseActivity {
flag.selected = false;
}
//设置播放地址
setTextShow(tvPlayUrl, "播放地址: ", vodInfo.seriesMap.get(vodInfo.playFlag).get(0).url);
setTextShow(tvPlayUrl, "播放地址：", vodInfo.seriesMap.get(vodInfo.playFlag).get(0).url);
seriesFlagAdapter.setNewData(vodInfo.seriesFlags);
mGridViewFlag.scrollToPosition(flagScrollTo);

4
app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java
Unescape View File

@ -268,10 +268,10 @@ public class FastSearchActivity extends BaseActivity {
mGridViewFilter.setVisibility(View.GONE);
return;
}
String key = spNames.get(spName);
if(key.isEmpty()) return;
mGridView.setVisibility(View.GONE);
mGridViewFilter.setVisibility(View.VISIBLE);
String key = spNames.get(spName);
if(key.isEmpty()) return;
if(searchFilterKey == key) return;
searchFilterKey = key;

12
app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
Unescape View File

@ -1347,9 +1347,9 @@ public class PlayActivity extends BaseActivity {
}
WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
// if (url.endsWith("/favicon.ico")) {
// return new WebResourceResponse("image/png", null, null);
// }
if (url.endsWith("/favicon.ico")) {
return null;
}
LOG.i("shouldInterceptRequest url:" + url);
boolean ad;
if (!loadedUrls.containsKey(url)) {
@ -1520,9 +1520,9 @@ public class PlayActivity extends BaseActivity {
public XWalkWebResourceResponse shouldInterceptLoadRequest(XWalkView view, XWalkWebResourceRequest request) {
String url = request.getUrl().toString();
// suppress favicon requests as we don't display them anywhere
// if (url.endsWith("/favicon.ico")) {
// return createXWalkWebResourceResponse("image/png", null, null);
// }
if (url.endsWith("/favicon.ico")) {
return null;
}
LOG.i("shouldInterceptLoadRequest url:" + url);
boolean ad;
if (!loadedUrls.containsKey(url)) {

4
app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
Unescape View File

@ -314,7 +314,7 @@ public class SearchActivity extends BaseActivity {
search(title);
}
// 加载热词
OkGo.<String>get("https://node.video.qq.com/x/api/hot_mobilesearch")
OkGo.<String>get("https://node.video.qq.com/x/api/hot_search")
// OkGo.<String>get("https://api.web.360kan.com/v1/rank")
// .params("cat", "1")
.params("channdlId", "0")
@ -324,7 +324,7 @@ public class SearchActivity extends BaseActivity {
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").getAsJsonObject().get("mapResult").getAsJsonObject().get("0").getAsJsonObject().get("listInfo").getAsJsonArray();
// JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonArray();
for (JsonElement ele : itemList) {
JsonObject obj = (JsonObject) ele;

12
app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
Unescape View File

@ -1358,9 +1358,9 @@ public class PlayFragment extends BaseLazyFragment {
}
WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
// if (url.endsWith("/favicon.ico")) {
// return new WebResourceResponse("image/png", null, null);
// }
if (url.endsWith("/favicon.ico")) {
return null;
}
LOG.i("shouldInterceptRequest url:" + url);
boolean ad;
if (!loadedUrls.containsKey(url)) {
@ -1531,9 +1531,9 @@ public class PlayFragment extends BaseLazyFragment {
public XWalkWebResourceResponse shouldInterceptLoadRequest(XWalkView view, XWalkWebResourceRequest request) {
String url = request.getUrl().toString();
// suppress favicon requests as we don't display them anywhere
// if (url.endsWith("/favicon.ico")) {
// return createXWalkWebResourceResponse("image/png", null, null);
// }
if (url.endsWith("/favicon.ico")) {
return null;
}
LOG.i("shouldInterceptLoadRequest url:" + url);
boolean ad;
if (!loadedUrls.containsKey(url)) {

53
app/src/main/res/layout/player_vod_control_view.xml
Unescape View File

@ -29,7 +29,7 @@
android:paddingLeft="@dimen/vs_20"
android:text="http://"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/tv_videosize"
@ -42,7 +42,7 @@
android:tag="vod_video_size"
android:text="[ 1024 x 768 ]"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
</LinearLayout>
@ -54,8 +54,7 @@
android:visibility="gone"
tools:visibility="visible"
android:layout_gravity="right"
android:layout_marginStart="@dimen/vs_20"
android:layout_marginLeft="@dimen/vs_20"
android:layout_marginRight="@dimen/vs_20"
android:layout_marginTop="@dimen/vs_10"
android:orientation="vertical">
@ -71,7 +70,7 @@
android:tag="vod_control_pause_time"
android:text="00:00:00"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/tv_play_load_net_speed_right_top"
@ -84,7 +83,7 @@
android:tag="vod_control_pause_time"
android:text="0Kb/s"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
</LinearLayout>
<com.github.tvbox.osc.subtitle.widget.SimpleSubtitleView
@ -140,7 +139,7 @@
android:paddingRight="@dimen/vs_10"
android:text="播放"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_next"
@ -154,7 +153,7 @@
android:padding="@dimen/vs_10"
android:text="下一集"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_pre"
@ -168,7 +167,7 @@
android:padding="@dimen/vs_10"
android:text="上一集"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_retry"
@ -182,7 +181,7 @@
android:padding="@dimen/vs_10"
android:text="重播"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_refresh"
@ -196,7 +195,7 @@
android:padding="@dimen/vs_10"
android:text="刷新"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_scale"
@ -210,7 +209,7 @@
android:padding="@dimen/vs_10"
android:text="16:9"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_speed"
@ -224,7 +223,7 @@
android:padding="@dimen/vs_10"
android:text="x1.0"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_player"
@ -238,7 +237,7 @@
android:padding="@dimen/vs_10"
android:text="系统播放器"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_ijk"
@ -252,7 +251,7 @@
android:padding="@dimen/vs_10"
android:text="硬解码"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:singleLine="true"
@ -263,7 +262,7 @@
android:padding="@dimen/vs_10"
android:text="片头片尾"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_time_start"
@ -277,7 +276,7 @@
android:padding="@dimen/vs_10"
android:text="01:00"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_time_end"
@ -291,7 +290,7 @@
android:padding="@dimen/vs_10"
android:text="01:00"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_time_step"
@ -305,7 +304,7 @@
android:padding="@dimen/vs_10"
android:text="1S"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<!--添加片头片尾重置按钮-->
<TextView
@ -320,7 +319,7 @@
android:padding="@dimen/vs_10"
android:text="重置"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/zimu_select"
@ -334,7 +333,7 @@
android:padding="@dimen/vs_10"
android:text="字幕"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/audio_track_select"
@ -348,7 +347,7 @@
android:visibility="gone"
android:text="音轨"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24"/>
android:textSize="@dimen/ts_20"/>
</LinearLayout>
</HorizontalScrollView>
@ -371,7 +370,7 @@
android:paddingRight="@dimen/vs_10"
android:text="解析"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<com.owen.tvrecyclerview.widget.TvRecyclerView
android:id="@+id/mGridView"
@ -399,7 +398,7 @@
android:paddingRight="@dimen/vs_10"
android:text="00:00"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
<SeekBar
android:id="@+id/seekBar"
@ -428,7 +427,7 @@
android:paddingLeft="@dimen/vs_10"
android:text="00:00"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
</LinearLayout>
@ -462,7 +461,7 @@
android:paddingLeft="@dimen/vs_20"
android:text="http://"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
</LinearLayout>
<LinearLayout
@ -571,6 +570,6 @@
android:tag="play_load_net_speed"
android:text="0"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/ts_24" />
android:textSize="@dimen/ts_20" />
</FrameLayout>

Write Preview
Loading…
Cancel
Save