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"