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 336e6b37..8df0794e 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 @@ -14,7 +14,7 @@ public class AbsJson implements Serializable { public int code; // : 1 public String limit; // : "20" public ArrayList list; // : [{vod_id: 71930, type_id: 22, type_id_1: 20, group_id: 0, vod_name: "意式情歌",…},…] - public String msg; // : "数据列表" + public String msg; // : "提示信息" public int page; // : "2" public int pagecount; // : 209 public int total; // : 4166 @@ -169,6 +169,7 @@ public class AbsJson implements Serializable { } movie.videoList = videoList; xml.movie = movie; + xml.msg = msg; return xml; } } \ No newline at end of file diff --git a/app/src/main/java/com/github/tvbox/osc/bean/AbsXml.java b/app/src/main/java/com/github/tvbox/osc/bean/AbsXml.java index ebcbbeae..1b3b35c5 100644 --- a/app/src/main/java/com/github/tvbox/osc/bean/AbsXml.java +++ b/app/src/main/java/com/github/tvbox/osc/bean/AbsXml.java @@ -13,4 +13,7 @@ import java.io.Serializable; public class AbsXml implements Serializable { @XStreamAlias("list") public Movie movie; + + @XStreamAlias("msg") + public String msg; } \ No newline at end of file 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 f7a95d34..1bb1143c 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 @@ -601,6 +601,11 @@ public class DetailActivity extends BaseActivity { public void onChanged(AbsXml absXml) { if (absXml != null && absXml.movie != null && absXml.movie.videoList != null && absXml.movie.videoList.size() > 0) { showSuccess(); + if(!TextUtils.isEmpty(absXml.msg) && !absXml.msg.equals("数据列表")){ + Toast.makeText(DetailActivity.this, absXml.msg, Toast.LENGTH_SHORT).show(); + showEmpty(); + return; + } mVideo = absXml.movie.videoList.get(0); mVideo.id = vodId; diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java index a7adb8b3..85f96c15 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java @@ -464,6 +464,7 @@ public class HomeActivity extends BaseActivity { } else { mExitTime = System.currentTimeMillis(); Toast.makeText(mContext, "再按一次返回键退出应用", Toast.LENGTH_SHORT).show(); + showEmpty(); } } 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 076a3349..9a1d9998 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 @@ -597,8 +597,18 @@ public class PlayActivity extends BaseActivity { boolean parse = info.optString("parse", "1").equals("1"); boolean jx = info.optString("jx", "0").equals("1"); playSubtitle = info.optString("subt", /*"https://dash.akamaized.net/akamai/test/caption_test/ElephantsDream/ElephantsDream_en.vtt"*/""); + if(playSubtitle.isEmpty() && info.has("subs")) { + try { + playSubtitle = info.getJSONArray("subs").optJSONObject(0).optString("url", ""); + } catch (Throwable th) { + } + } subtitleCacheKey = info.optString("subtKey", null); String playUrl = info.optString("playUrl", ""); + String msg = info.optString("msg", ""); + if(!msg.isEmpty()){ + Toast.makeText(PlayActivity.this, msg, Toast.LENGTH_SHORT).show(); + } String flag = info.optString("flag"); String url = info.getString("url"); HashMap headers = null; @@ -631,12 +641,9 @@ public class PlayActivity extends BaseActivity { playUrl(playUrl + url, headers); } } catch (Throwable th) { -// errorWithRetry("获取播放信息错误", true); -// Toast.makeText(mContext, "获取播放信息错误1", Toast.LENGTH_SHORT).show(); } } else { errorWithRetry("获取播放信息错误", true); -// Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); } } }); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java index 83168c2d..c850cbff 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java @@ -39,6 +39,7 @@ public class GridAdapter extends BaseQuickAdapter { ImageView ivThumb = helper.getView(R.id.ivThumb); //由于部分电视机使用glide报错 if (!TextUtils.isEmpty(item.pic)) { + item.pic=item.pic.trim(); Picasso.get() .load(DefaultConfig.checkReplaceProxy(item.pic)) .transform(new RoundTransformation(MD5.string2MD5(item.pic + "position=" + helper.getLayoutPosition())) @@ -88,6 +89,7 @@ public class GridAdapter extends BaseQuickAdapter { ImageView ivThumb = helper.getView(R.id.ivThumb); //由于部分电视机使用glide报错 if (!TextUtils.isEmpty(item.pic)) { + item.pic=item.pic.trim(); Picasso.get() .load(DefaultConfig.checkReplaceProxy(item.pic)) .transform(new RoundTransformation(MD5.string2MD5(item.pic + "position=" + helper.getLayoutPosition())) 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 9ecdbee5..76559b39 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 @@ -609,8 +609,18 @@ public class PlayFragment extends BaseLazyFragment { boolean parse = info.optString("parse", "1").equals("1"); boolean jx = info.optString("jx", "0").equals("1"); playSubtitle = info.optString("subt", /*"https://dash.akamaized.net/akamai/test/caption_test/ElephantsDream/ElephantsDream_en.vtt"*/""); + if(playSubtitle.isEmpty() && info.has("subs")) { + try { + playSubtitle = info.getJSONArray("subs").optJSONObject(0).optString("url", ""); + } catch (Throwable th) { + } + } subtitleCacheKey = info.optString("subtKey", null); String playUrl = info.optString("playUrl", ""); + String msg = info.optString("msg", ""); + if(!msg.isEmpty()){ + Toast.makeText(mContext, msg, Toast.LENGTH_SHORT).show(); + } String flag = info.optString("flag"); String url = info.getString("url"); HashMap headers = null; diff --git a/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java b/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java index f9a7d74c..ce1c94a2 100644 --- a/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java +++ b/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java @@ -107,7 +107,7 @@ public class OkGoHelper { } catch (Throwable th) { th.printStackTrace(); } - builder.cache(new Cache(new File(App.getInstance().getCacheDir().getAbsolutePath(), "dohcache"), 10 * 1024 * 1024)); + builder.cache(new Cache(new File(App.getInstance().getCacheDir().getAbsolutePath(), "dohcache"), 100 * 1024 * 1024)); OkHttpClient dohClient = builder.build(); String dohUrl = getDohUrl(Hawk.get(HawkConfig.DOH_URL, 0)); dnsOverHttps = new DnsOverHttps.Builder().client(dohClient).url(dohUrl.isEmpty() ? null : HttpUrl.get(dohUrl)).build();