From f0da98bc7bf706345dae345f32b91307277c110e Mon Sep 17 00:00:00 2001 From: 21561 <215613905@qq.com> Date: Thu, 15 Sep 2022 15:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=B9=95=E5=85=BC=E5=AE=B9=E8=80=81?= =?UTF-8?q?=E7=8C=AB=E6=A0=BC=E5=BC=8F=EF=BC=88subt=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java | 1 + .../main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java | 1 + app/src/main/res/layout/player_vod_control_view.xml | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) 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 a8a79c2d..49491588 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 @@ -282,6 +282,7 @@ public class PlayActivity extends BaseActivity { zimuUrl = new String(Base64.decode(zimuBase64Url, Base64.DEFAULT)); mController.mSubtitleView.setVisibility(View.GONE); } + if(zimuUrl.isEmpty())zimuUrl=playSubtitle; if (zimuUrl != null && zimuUrl .length() > 0) { // 绑定MediaPlayer mController.mSubtitleView.bindToMediaPlayer(mVideoView.getMediaPlayer()); 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 65668568..30a2a7d1 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 @@ -280,6 +280,7 @@ public class PlayFragment extends BaseLazyFragment { zimuUrl = new String(Base64.decode(zimuBase64Url, Base64.DEFAULT)); mController.mSubtitleView.setVisibility(View.GONE); } + if(zimuUrl.isEmpty())zimuUrl=playSubtitle; if (zimuUrl != null && zimuUrl .length() > 0) { // 绑定MediaPlayer mController.mSubtitleView.bindToMediaPlayer(mVideoView.getMediaPlayer()); 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 3f6667e6..8a545c71 100644 --- a/app/src/main/res/layout/player_vod_control_view.xml +++ b/app/src/main/res/layout/player_vod_control_view.xml @@ -81,7 +81,6 @@ android:ellipsize="end" android:maxLines="1" android:paddingRight="@dimen/vs_20" - android:paddingTop="@dimen/vs_10" android:tag="vod_control_pause_time" android:text="0Kb/s" android:textColor="@android:color/white"