diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index deb861135..56deb5174 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -202,8 +202,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List mBinding.control.action.text.setOnLongClickListener(view -> onTextLong()); mBinding.control.action.player.setOnLongClickListener(view -> onChoose()); mBinding.control.action.speed.setOnLongClickListener(view -> onSpeedLong()); - mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event)); mBinding.control.action.getRoot().setOnTouchListener(this::onActionTouch); + mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event)); } private void setRecyclerView() { @@ -303,9 +303,12 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void setWidth(Live live) { - int base = ResUtil.dp2px(44); - for (Group group : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(group.getName(), 14))); - mBinding.group.getLayoutParams().width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + base, ResUtil.dp2px(180)); + int def = ResUtil.dp2px(160); + int logo = ResUtil.dp2px(56); + int group = ResUtil.dp2px(44); + for (Group item : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(item.getName(), 14))); + mBinding.group.getLayoutParams().width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + group, def); + mBinding.channel.getLayoutParams().width = live.getLogo().isEmpty() ? def : logo; mBinding.divide1.setVisibility(live.getWidth() == 0 ? View.GONE : View.VISIBLE); } diff --git a/app/src/mobile/res/drawable/shape_live_list.xml b/app/src/mobile/res/drawable/shape_live_list.xml index a2664c9fd..4a1d94d7d 100644 --- a/app/src/mobile/res/drawable/shape_live_list.xml +++ b/app/src/mobile/res/drawable/shape_live_list.xml @@ -5,7 +5,7 @@ diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml index 63c52c703..4924c37d1 100644 --- a/app/src/mobile/res/layout/activity_live.xml +++ b/app/src/mobile/res/layout/activity_live.xml @@ -80,7 +80,7 @@ + android:background="@color/grey_700" + android:visibility="gone" />