From 74ef7855b38bbe87b95af45345acacce809f11bd Mon Sep 17 00:00:00 2001 From: okjackcaptain <378702538@qq.com> Date: Sun, 18 Dec 2022 12:26:01 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=A6=96=E9=A1=B5=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E7=AB=99=E7=82=B9=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=97=B6=E6=9C=80=E5=B7=A6=E4=BE=A7=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20(by=20okjack)=20-=20=E6=92=AD=E6=94=BE=E5=BA=95=E6=A0=8F?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?bug=20(by=20okjack)=20-=20=E6=92=AD=E6=94=BE=E5=BA=95=E6=A0=8F?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=9B=86=E6=8C=89=E9=92=AE=E5=BE=80=E5=B7=A6?= =?UTF-8?q?=E6=8C=89=EF=BC=8C=E7=84=A6=E7=82=B9=E6=98=AF=E7=89=87=E5=A4=B4?= =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E6=8C=89=E9=92=AE=20(by=20okjack)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 ++ .../osc/player/controller/VodController.java | 22 +++++++++++++++++++ .../tvbox/osc/ui/activity/PlayActivity.java | 18 --------------- .../tvbox/osc/ui/fragment/PlayFragment.java | 18 --------------- app/src/main/res/layout/fragment_user.xml | 10 +++++---- 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 189a1a3d..09eca588 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -44,7 +44,9 @@ + + diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java index 2cbad2de..563e35dc 100644 --- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java +++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java @@ -584,6 +584,25 @@ public class VodController extends BaseController { hideBottom(); } }); + mNextBtn.setNextFocusLeftId(R.id.play_time_start); + } + + private void hideLiveAboutBtn() { + if (mControlWrapper != null && mControlWrapper.getDuration() == 0) { + mPlayerSpeedBtn.setVisibility(GONE); + mPlayerTimeStartEndText.setVisibility(GONE); + mPlayerTimeStartBtn.setVisibility(GONE); + mPlayerTimeSkipBtn.setVisibility(GONE); + mPlayerTimeResetBtn.setVisibility(GONE); + mNextBtn.setNextFocusLeftId(R.id.zimu_select); + } else { + mPlayerSpeedBtn.setVisibility(View.VISIBLE); + mPlayerTimeStartEndText.setVisibility(View.VISIBLE); + mPlayerTimeStartBtn.setVisibility(View.VISIBLE); + mPlayerTimeSkipBtn.setVisibility(View.VISIBLE); + mPlayerTimeResetBtn.setVisibility(View.VISIBLE); + mNextBtn.setNextFocusLeftId(R.id.play_time_start); + } } public void initLandscapePortraitBtnInfo() { @@ -793,6 +812,7 @@ public class VodController extends BaseController { break; case VideoView.STATE_PREPARED: mPlayLoadNetSpeed.setVisibility(GONE); + hideLiveAboutBtn(); listener.prepared(); break; case VideoView.STATE_BUFFERED: @@ -831,6 +851,8 @@ public class VodController extends BaseController { int keyCode = event.getKeyCode(); int action = event.getAction(); if (isBottomVisible()) { + mHandler.removeMessages(1002); + mHandler.removeMessages(1003); myHandle.postDelayed(myRunnable, myHandleSeconds); return super.dispatchKeyEvent(event); } 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 fdd9bfbc..e078d390 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 @@ -231,29 +231,11 @@ public class PlayActivity extends BaseActivity { @Override public void prepared() { initSubtitleView(); - initVideoDurationSomeThing(); } }); mVideoView.setVideoController(mController); } - void initVideoDurationSomeThing() { - videoDuration = mVideoView.getMediaPlayer().getDuration(); - if (videoDuration ==0) { - mController.mPlayerSpeedBtn.setVisibility(View.GONE); - mController.mPlayerTimeStartEndText.setVisibility(View.GONE); - mController.mPlayerTimeStartBtn.setVisibility(View.GONE); - mController.mPlayerTimeSkipBtn.setVisibility(View.GONE); - mController.mPlayerTimeResetBtn.setVisibility(View.GONE); - }else { - mController.mPlayerSpeedBtn.setVisibility(View.VISIBLE); - mController.mPlayerTimeStartEndText.setVisibility(View.VISIBLE); - mController.mPlayerTimeStartBtn.setVisibility(View.VISIBLE); - mController.mPlayerTimeSkipBtn.setVisibility(View.VISIBLE); - mController.mPlayerTimeResetBtn.setVisibility(View.VISIBLE); - } - } - //设置字幕 void setSubtitle(String path) { if (path != null && path .length() > 0) { 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 52979ec4..e65c1227 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 @@ -241,29 +241,11 @@ public class PlayFragment extends BaseLazyFragment { @Override public void prepared() { initSubtitleView(); - initVideoDurationSomeThing(); } }); mVideoView.setVideoController(mController); } - void initVideoDurationSomeThing() { - videoDuration = mVideoView.getMediaPlayer().getDuration(); - if (videoDuration == 0) { - mController.mPlayerSpeedBtn.setVisibility(View.GONE); - mController.mPlayerTimeStartEndText.setVisibility(View.GONE); - mController.mPlayerTimeStartBtn.setVisibility(View.GONE); - mController.mPlayerTimeSkipBtn.setVisibility(View.GONE); - mController.mPlayerTimeResetBtn.setVisibility(View.GONE); - }else { - mController.mPlayerSpeedBtn.setVisibility(View.VISIBLE); - mController.mPlayerTimeStartEndText.setVisibility(View.VISIBLE); - mController.mPlayerTimeStartBtn.setVisibility(View.VISIBLE); - mController.mPlayerTimeSkipBtn.setVisibility(View.VISIBLE); - mController.mPlayerTimeResetBtn.setVisibility(View.VISIBLE); - } - } - //设置字幕 void setSubtitle(String path) { if (path != null && path .length() > 0) { diff --git a/app/src/main/res/layout/fragment_user.xml b/app/src/main/res/layout/fragment_user.xml index 1fb3913c..b57dcb34 100644 --- a/app/src/main/res/layout/fragment_user.xml +++ b/app/src/main/res/layout/fragment_user.xml @@ -29,6 +29,7 @@ android:clipChildren="false" android:clipToPadding="false" android:focusable="true" + android:nextFocusLeft="@+id/tvSetting" android:orientation="horizontal" android:paddingLeft="@dimen/vs_15" android:paddingTop="@dimen/vs_15" @@ -226,6 +227,7 @@ android:clipChildren="false" android:clipToPadding="false" android:focusable="true" + android:nextFocusRight="@+id/tvHistory" android:orientation="horizontal" android:paddingLeft="@dimen/vs_15" android:paddingTop="@dimen/vs_15" @@ -264,9 +266,9 @@ android:clipChildren="false" android:clipToPadding="false" android:layout_below="@+id/tvUserHome" - android:paddingLeft="@dimen/vs_0" + android:paddingLeft="@dimen/vs_5" android:paddingTop="@dimen/vs_40" - android:paddingRight="@dimen/vs_0" + android:paddingRight="@dimen/vs_5" android:paddingBottom="@dimen/vs_20" app:tv_horizontalSpacingWithMargins="@dimen/vs_10" app:tv_layoutManager="V7GridLayoutManager" @@ -282,9 +284,9 @@ android:clipToPadding="false" android:layout_below="@+id/tvUserHome" android:orientation="horizontal" - android:paddingLeft="@dimen/vs_0" + android:paddingLeft="@dimen/vs_5" android:paddingTop="@dimen/vs_40" - android:paddingRight="@dimen/vs_0" + android:paddingRight="@dimen/vs_5" android:paddingBottom="@dimen/vs_40" app:tv_horizontalSpacingWithMargins="@dimen/vs_10" app:tv_layoutManager="V7LinearLayoutManager"