diff --git a/app/src/main/java/com/fongmi/bear/player/Players.java b/app/src/main/java/com/fongmi/bear/player/Players.java index 0a355ea6c..4b44c98f9 100644 --- a/app/src/main/java/com/fongmi/bear/player/Players.java +++ b/app/src/main/java/com/fongmi/bear/player/Players.java @@ -74,6 +74,11 @@ public class Players implements Player.Listener { }); } + public void toggle() { + if (exoPlayer.isPlaying()) exoPlayer.pause(); + else exoPlayer.play(); + } + public void pause() { if (exoPlayer != null) { exoPlayer.pause(); diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/PlayActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/PlayActivity.java index 0c1a85131..a349ee352 100644 --- a/app/src/main/java/com/fongmi/bear/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/fongmi/bear/ui/activity/PlayActivity.java @@ -77,7 +77,7 @@ public class PlayActivity extends BaseActivity implements KeyDownImpl { @Override public void onKeyCenter() { - mBinding.video.showController(); + Players.get().toggle(); } @Override diff --git a/app/src/main/java/com/fongmi/bear/ui/presenter/VodPresenter.java b/app/src/main/java/com/fongmi/bear/ui/presenter/VodPresenter.java index 9909e1057..9b43547ea 100644 --- a/app/src/main/java/com/fongmi/bear/ui/presenter/VodPresenter.java +++ b/app/src/main/java/com/fongmi/bear/ui/presenter/VodPresenter.java @@ -31,8 +31,8 @@ public class VodPresenter extends Presenter { @Override public Presenter.ViewHolder onCreateViewHolder(ViewGroup parent) { ViewHolder holder = new ViewHolder(AdapterVodBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - holder.binding.getRoot().getLayoutParams().width = ResUtil.dp2px(mCount == 5 ? 150 : 144); - holder.binding.getRoot().getLayoutParams().height = ResUtil.dp2px(mCount == 5 ? 200 : 192); + holder.binding.getRoot().getLayoutParams().width = ResUtil.getScreenWidthPx() / mCount - mCount * ResUtil.dp2px(4); + holder.binding.getRoot().getLayoutParams().height = (int) (holder.binding.getRoot().getLayoutParams().width / 0.75f); return holder; } diff --git a/app/src/main/java/com/fongmi/bear/utils/ResUtil.java b/app/src/main/java/com/fongmi/bear/utils/ResUtil.java index e4fdb44a2..65ef1456f 100644 --- a/app/src/main/java/com/fongmi/bear/utils/ResUtil.java +++ b/app/src/main/java/com/fongmi/bear/utils/ResUtil.java @@ -12,6 +12,10 @@ public class ResUtil { return App.get().getResources().getDisplayMetrics(); } + public static int getScreenWidthPx() { + return getDisplayMetrics().widthPixels; + } + public static int dp2px(int dpValue) { return Math.round(dpValue * getDisplayMetrics().density); } diff --git a/app/src/main/res/layout/activity_play.xml b/app/src/main/res/layout/activity_play.xml index 4af7a5c5a..06fab3a90 100644 --- a/app/src/main/res/layout/activity_play.xml +++ b/app/src/main/res/layout/activity_play.xml @@ -10,6 +10,7 @@ android:id="@+id/video" android:layout_width="match_parent" android:layout_height="match_parent" + app:auto_show="false" app:controller_layout_id="@layout/view_controller" app:resize_mode="fill" /> diff --git a/app/src/main/res/layout/view_controller.xml b/app/src/main/res/layout/view_controller.xml index 09f2dce8f..42bb48439 100644 --- a/app/src/main/res/layout/view_controller.xml +++ b/app/src/main/res/layout/view_controller.xml @@ -27,18 +27,24 @@ android:textSize="16sp" /> @@ -47,6 +53,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:background="@drawable/selector_text" + android:focusable="true" + android:focusableInTouchMode="true" android:text="重播本集" android:textColor="@color/white" /> @@ -63,6 +71,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:background="@drawable/selector_text" + android:focusable="true" + android:focusableInTouchMode="true" android:text="x1.0" android:textColor="@color/white" /> @@ -79,6 +89,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:background="@drawable/selector_text" + android:focusable="true" + android:focusableInTouchMode="true" android:text="預設" android:textColor="@color/white" /> @@ -107,6 +119,7 @@ android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:layout_weight="1" + android:nextFocusUp="@+id/next" app:buffered_color="@color/grey_700" app:played_color="@color/grey_900" app:scrubber_color="@color/blue_500"