diff --git a/app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java b/app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java index 7bc14145..336e6b37 100644 --- a/app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java +++ b/app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java @@ -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; diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java index 815f6c45..a58b6514 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java @@ -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); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java index a705a160..db56643b 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java @@ -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; 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 7ac33e39..201d6165 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 @@ -1347,9 +1347,9 @@ public class PlayActivity extends BaseActivity { } WebResourceResponse checkIsVideo(String url, HashMap 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)) { diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java index 62a775d5..9dca9402 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java @@ -314,7 +314,7 @@ public class SearchActivity extends BaseActivity { search(title); } // 加载热词 - OkGo.get("https://node.video.qq.com/x/api/hot_mobilesearch") + OkGo.get("https://node.video.qq.com/x/api/hot_search") // OkGo.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 response) { try { ArrayList 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; 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 59671d26..971cc925 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 @@ -1358,9 +1358,9 @@ public class PlayFragment extends BaseLazyFragment { } WebResourceResponse checkIsVideo(String url, HashMap 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)) { diff --git a/app/src/main/res/layout/player_vod_control_view.xml b/app/src/main/res/layout/player_vod_control_view.xml index 7e7c0f88..d5e4c46b 100644 --- a/app/src/main/res/layout/player_vod_control_view.xml +++ b/app/src/main/res/layout/player_vod_control_view.xml @@ -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" /> + android:textSize="@dimen/ts_20" /> @@ -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" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20"/> @@ -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" /> + android:textSize="@dimen/ts_20" /> + android:textSize="@dimen/ts_20" /> @@ -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" /> + android:textSize="@dimen/ts_20" />