From 9b5ee444cb784644502e8463efe32b520a406b04 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 13 Aug 2022 19:41:54 +0800 Subject: [PATCH] Add error message for video play --- .../tv/ui/activity/DetailActivity.java | 7 ++++- .../leanback/res/layout/activity_detail.xml | 8 ++++++ .../res/layout/view_controller_center.xml | 8 +++--- .../com/fongmi/android/tv/player/Players.java | 8 ++++-- .../main/res/drawable-hdpi/ic_vod_error.png | Bin 0 -> 3238 bytes .../main/res/drawable-mdpi/ic_vod_error.png | Bin 0 -> 2507 bytes .../main/res/drawable-xhdpi/ic_vod_error.png | Bin 0 -> 3960 bytes .../main/res/drawable-xxhdpi/ic_vod_error.png | Bin 0 -> 5511 bytes .../main/res/drawable-xxxhdpi/ic_empty.png | Bin 11945 -> 0 bytes .../res/drawable-xxxhdpi/ic_img_error.png | Bin 2725 -> 0 bytes .../res/drawable-xxxhdpi/ic_img_loading.png | Bin 2188 -> 0 bytes app/src/main/res/layout/view_error.xml | 26 ++++++++++++++++++ app/src/main/res/values-zh-rCN/strings.xml | 9 +++--- app/src/main/res/values-zh-rTW/strings.xml | 5 ++-- app/src/main/res/values/strings.xml | 3 +- 15 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_vod_error.png create mode 100644 app/src/main/res/drawable-mdpi/ic_vod_error.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_vod_error.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_vod_error.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_empty.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_img_error.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_img_loading.png create mode 100644 app/src/main/res/layout/view_error.xml diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index bdb787e1e..0674f0dd3 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -181,6 +181,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { if (mFullscreen) Notify.show(ResUtil.getString(R.string.play_ready, item.getName())); mSiteViewModel.playerContent(getKey(), getVodFlag().getFlag(), item.getUrl()); mBinding.progress.getRoot().setVisibility(View.VISIBLE); + mBinding.error.getRoot().setVisibility(View.GONE); updateHistory(item, replay); } @@ -389,6 +390,8 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { case 0: checkPosition(); break; + case Player.STATE_IDLE: + break; case Player.STATE_BUFFERING: mBinding.progress.getRoot().setVisibility(View.VISIBLE); break; @@ -399,8 +402,10 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { onNext(); break; default: + Players.get().stop(); mBinding.progress.getRoot().setVisibility(View.GONE); - Notify.show(event.getMsg()); + mBinding.error.getRoot().setVisibility(View.VISIBLE); + mBinding.error.text.setText(event.getMsg()); break; } } diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml index 2dc312160..1175af221 100644 --- a/app/src/leanback/res/layout/activity_detail.xml +++ b/app/src/leanback/res/layout/activity_detail.xml @@ -29,6 +29,14 @@ layout="@layout/view_progress" android:visibility="gone" /> + + - @@ -18,7 +19,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index ee92f8202..ef9bef554 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -108,7 +108,9 @@ public class Players implements Player.Listener { } public void setMediaSource(Result result) { - if (result.getParse().equals("1")) { + if (result.getUrl().isEmpty()) { + EventBus.getDefault().post(new PlayerEvent(ResUtil.getString(R.string.error_play_load))); + } else if (result.getParse().equals("1")) { loadWebView(result.getUrl()); } else { setMediaSource(getPlayHeader(result), result.getUrl()); @@ -152,7 +154,7 @@ public class Players implements Player.Listener { public void stop() { if (exoPlayer != null) { exoPlayer.stop(); - exoPlayer.seekTo(0); + exoPlayer.clearMediaItems(); exoPlayer.setPlaybackSpeed(1.0f); } if (webView != null) { @@ -192,7 +194,7 @@ public class Players implements Player.Listener { @Override public void onPlayerError(@NonNull PlaybackException error) { - EventBus.getDefault().post(new PlayerEvent(ResUtil.getString(R.string.error_play))); + EventBus.getDefault().post(new PlayerEvent(ResUtil.getString(R.string.error_play_format))); } @Override diff --git a/app/src/main/res/drawable-hdpi/ic_vod_error.png b/app/src/main/res/drawable-hdpi/ic_vod_error.png new file mode 100644 index 0000000000000000000000000000000000000000..40715e1cb012c368010c319d36464a88aeb9645c GIT binary patch literal 3238 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 BV;leg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_vod_error.png b/app/src/main/res/drawable-xxhdpi/ic_vod_error.png new file mode 100644 index 0000000000000000000000000000000000000000..e73afcaa1a71c0df5b40f2e5e02f12fe2890284e GIT binary patch literal 5511 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 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_error.png b/app/src/main/res/drawable-xxxhdpi/ic_img_error.png deleted file mode 100644 index 3cf8315d3f7a9686242fd45fa5b9fbd9bf8c4ab1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2725 zcmds(S5y<)5{5%iN(hNk4!x-mkSfxPLP7^aC?-+`5s0W)deNvrC;}qqs8lHiM4}=+ zphyWKHAn~`C;~<>f;2-97|4xxt^07_&f{HY*4lgj^RQ>{ZyshQ4TZE721$be0D!Q) zos}#1Wd2?Pyxd(dL+UXA07Rgi+^sqPP~&3$L&^T{uo_ANLb&NBN4g^2FwqT8j&>J< z$RWOkudm0nm)vrXP0`zlw0+hxA>J?c)^hQp*UFq{QsT=ygSblwho;N;%7Ap9ZmACI z+lK6dL*>T%Gjar>Apmh!9_{>O_0RVLMteu+ZL~MW4lm@{i;Nd}P(hk&Iu@rB7>egJ zUrkBIJwnx%`5y?R@bUKQ@8;*|Zi9av`*H8wNmkXFrJu)>mA>C)s(=1N^kb=OJzXYi zUCReMz+Wf()w{LpT@P^Ugz&KR7m3Lci1{e=R1`8^*scoz;CHdNvUHD~Sf1KJhy_aW zhc;`PRNjTu>s42(+LuyZ1d`M=73(`U6@hOQ5oNkMqz_s;BXBTDM8uV%EG~Ei$7wJU z%bAL!#+Br!=FaV%jR`un7T88Ar_q+1bpA*zJ54Q z_@H&*GaDFSw?Us!0#>v^lxeM*N{OGKK&FJoL#q!SyA471nr z=zN&C_W}p}BM{S``en{c??#^sGvr>=F*})R>DaG3D=SgzjXkskXwLlUtelr^Bek@f zgN&=aJFX2|r1LAUYnTv!X#t*Drtqqz}5_F_bEl@o2__;}L4j zjEi!UDsscF;3!JcF_Ca=!;6&72&GQx0bkFHy+HZf0}WPUr6P;MpbF zU!eIZp1#PT2v1VelnH4ihv9Z@I*%Ed<4lj?~=zJkqUBHnAmCjHh?5fnjQ z*3+{9!uM=ZAX6>+Cx??ZKeRPuP)A~GSQboy$Sl{1wgtfHk zX7e`Ju)Gwp!}mTOQRIOfBMXn0-_~8km-QQBv#+iJ2!k3hFZy(Hz9~5SxgnO03V!%N zITYtJ78iX*1Ycia6c0CVD_n}7HNWLC@gx?X0@-{OUI*OT)Qvtu`0YkrH~s{OXgP8s zc%Vv3b@USBBG16)TGyl+gow(@b_=Z`Q$&Tjm$+fj$b=5Kwk?i~b5X<7a4~)-snyR38AA`J!{FFY)N=B;&x(LrFq_3`j z@bY!rch42vdBFOnm-xoEAnCc61}r<13#1Y%wk2h6rVLiQeot*~Hv;OgMQ{aXSYlYB zb%_c!N<`Ly=#tPWpnp76lF)rHXgo1hT1xWNXfK&b=;q^t>YM095@`tpL?#q08bUg-Odvn$YISLuoerDM&p7o!HXagbvY6VQ?|_q94oZC~qh1_tUgjWTj)$5=Kc@ zv%u6pvF>yokxY=RO)2-6c6utIs%hN^xK;NpNAG4EJ}n3XA|HgP6fi*K3^^ygH*mm; zU2`sWOa*YmcG5Aj2?neV)28jfYnpmVR-9oazVX2@b(-U@*@=&j@*|Jac#FYH%ZuTv zG!I{e8qC=hhtlAeTkd3E2Kl;#$P|h4vng+mRa~bVys+^t2^qPX2;@Mk=9nA;6^*Fk wTZuDGRA|Ym?q5~;bmVV#t^am7+09*reIGT)KB)FIcTfP>TO+Ni;C_k!22WBxKmY&$ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png b/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png deleted file mode 100644 index 04af817a7aba4c89bab19e11e2fa971fd9d9ed96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2188 zcmd^ASx^&(7R^F{B8wLF6+(1?VvKB()({A*fDs{K2_*s{iAupr)Bu`<1~d^7l_y%m zQd71{2$g+WloWy_0t&KdrDX|Q5JFudiEJTaLUG2KzK{3u-tT*N=ALus&fJ-MKJK|! z!tq!$6KfLy0ALn;Ffek1)gRIryn&zOT9pF;z^?GnsG#-#r`XW`KPfj;P|e-YR(K{7 zPk8g9qxgh$EH@pOPdXz zN4#BfRWG_cF-a!1DB+*K^mBh-85q7zrv0*De?<^lXAF7#bQ5iL4V6FF4er`32tY9Q zl>h(`d2pbA6ifDILPyyeWMibRaSA!~`|h9NW{!t;)INRIxW8*5LpJMq(Nl#-I`1AZ z=m@xRG^OBTNW`4Vj6Ism9x2hz4=DS`)mpu2ubA>E)2CNC{~aAQ@;SipGb#u89|8`* zuBj|o0ws^c9Bk;@=8YVImL+WO>uUG5X3;LiAiwY>NCqqV_*S}LQx_Mv+{6=PgHlmv zEkDE_M9+&s5w-I4#EHH%smGdxm@e0Zf4plx3rU)Cy@6**9_7YoHy^fYJah|}(4(klEe zNBui-UU{u}s6>lP6KO|@TD_sBB^vziqy+u|)_;3jy8 zYq6j)Nh+$SUFu9K6Y|<^MyA}4+la7du$}PfUp#*xudnEa`#|iZi)&JBKz-`$Of`c| z{ghQqkARO`bz}Dtg&G*jNC|_}v`?~QX6oi;V3O#hDT|+at%CjC{Z8rm_jxy7AtBdTcioq*o(9d4IV@QZK=)_JYNst*11=vs{%Ce5&jK2XmRYCv0#?Lq@J{ zR_Tv}SQcACF=Ov4uCYOBg8(%qP<<-WPxXAKVDa8LwY}Y{^A%1Z0^<;h>a!nMKgRo%R}}ERRreF^#;Zx*&eQWh^}aU1xLQWD4h8vP_f&l*nL4{^ zm>G)m!y>BC3}@!$LZ*s;o0AugPvNj#jiZOFoXR_j2u{$qV}s*&C*(#;_l`G%EPD~w zXb1EOUlq5F^vh$8c^v*Nr$jFwUfsN2(0!nN0@JWXNwZ+>41;Bqqss#d2_$M2GlzmH zd6|-LbVihV)l59}D6WQ5H#1Xe8Q_<*v57P}=@y149CAe|OI8BoY{tHyz1)k4R?Eaq zYh86X9FBc&+>WG9KJv`osY)dMu^w2%LSm!vhTKXJpM;;|C_d0b&evdmEMCY_fcb|v zDDL|Q(*-b*_F=&QVW32E^x3UeS5D#KJOg8 zuEj`y@7mdE9|q7dI-j+&>0o zU_JqFBK;HPt4UC4M{)gpu&1avpL?C=LeV!v`hl>+_-e`N_SogL(r<>KPyH1FW2K(F zm{vNVZU|K#Tjqqb9(Mq({!E=wZdlVFmLxLX zL~=?^F!z7%32CBu^kl_P5@4FRyM|3+9>H1hdV*6~^9i#TvecW9*4tH#jLvl7v4umD z`c*`wbqe?8EprI9Xdx=PKr{f1kH<$+i&nPAW{Y$PVY1#4ZngKfI9sx~cd36S^(KJV z_VrO`V0;ArH>s`o^>eR5%$@pfdHCdd7evTjh>+U0CAZ`1tidfbmjmFO6`$?NrY|_Q zS?5JI4sP>5UxJJw|MmR;HiCa!HTKB!uTdv`ajv7rE-8`#)P)?h{0LOqVM9+G@=?() zff=bQ+!~*s?wgRBEJ(8#-mtIKtXul;W7!=ka(A-@U}{28=|xxbjFq9+Wizl6Mkh5% z$#I^%<(30th;cj=9iHiH=rO%UZzdMM4uwO9TW*jM+jJj#v_{~6VXDCT#rK + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 70f140366..dd213d10c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -5,7 +5,7 @@ 再按一次返回键退出 - 正在载入配置 + 正在加载配置 点播 @@ -25,7 +25,7 @@ 远程 - 手机或电脑连接同一个局域网,扫描 QR Code 或浏览器输入网址\n%s + 手机或电脑连接同一个局域网,扫描 QR Code 或浏览器输入地址\n%s 站源:%s @@ -61,8 +61,9 @@ 配置解析失败 已经是最后一集了! 已经是第一集了! - 无法解析网址 - 不支援的影片格式 + 播放地址解析失败 + 播放信息加载失败 + 不支援的影片格式 找不到数据 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ff121a3ed..09b06109e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -61,8 +61,9 @@ 配置解析失敗 已經是最後一集了! 已經是第一集了! - 無法解析網址 - 不支援的影片格式 + 播放網址解析失敗 + 播放資料載入失敗 + 不支援的影片格式 找不到資料 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 423438eb4..975d00ba8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,7 +62,8 @@ It\'s the last episode! It\'s the first episode! Unable to parse url - Unsupported video format + Unable to load url + Unsupported video format Not found