diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml index cc12ec266..5681f60ee 100644 --- a/app/src/mobile/AndroidManifest.xml +++ b/app/src/mobile/AndroidManifest.xml @@ -16,7 +16,6 @@ android:name=".ui.activity.MainActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" android:exported="true" - android:launchMode="singleTask" android:screenOrientation="userPortrait" android:windowSoftInputMode="adjustPan"> @@ -33,6 +32,7 @@ { - TrackDialog.create(this).player(mPlayers).type(item.getItemId()).show(getSupportFragmentManager(), null); + TrackDialog.create().player(mPlayers).type(item.getItemId()).listener(this).show(getSupportFragmentManager(), null); return true; }); if (popup.getMenu().size() > 0) { @@ -651,6 +651,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void checkFlag(Vod item) { + mBinding.reverse.setVisibility(item.getVodFlags().isEmpty() ? View.GONE : View.VISIBLE); mBinding.flag.setVisibility(item.getVodFlags().isEmpty() ? View.GONE : View.VISIBLE); if (isVisible(mBinding.flag)) checkHistory(item); else ErrorEvent.episode(); @@ -895,8 +896,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis super.onConfigurationChanged(newConfig); if (Utils.hasPIP() && isInPictureInPictureMode()) return; if (isFullscreen()) Utils.hideSystemUI(this); - if (ResUtil.isLand(this)) enterFullscreen(); - if (ResUtil.isPort(this) && !isRotate()) exitFullscreen(); + if (ResUtil.isLand(this) && !isFullscreen()) enterFullscreen(); + if (ResUtil.isPort(this) && isFullscreen() && !isRotate()) exitFullscreen(); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index 090a6801f..a4a5f5fd9 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -70,18 +70,15 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit mBinding.wall.setOnClickListener(view -> ConfigDialog.create(this).type(2).show()); mBinding.vodHistory.setOnClickListener(view -> HistoryDialog.create(this).type(0).show()); mBinding.liveHistory.setOnClickListener(view -> HistoryDialog.create(this).type(1).show()); - mBinding.version.setOnClickListener(view -> Updater.get().force().start()); mBinding.wallDefault.setOnClickListener(view -> setWallDefault()); mBinding.wallRefresh.setOnClickListener(view -> setWallRefresh()); + mBinding.version.setOnLongClickListener(view -> onVersion(true)); + mBinding.version.setOnClickListener(view -> onVersion(false)); mBinding.player.setOnClickListener(view -> setPlayer()); mBinding.decode.setOnClickListener(view -> setDecode()); mBinding.render.setOnClickListener(view -> setRender()); mBinding.scale.setOnClickListener(view -> setScale()); mBinding.size.setOnClickListener(view -> setSize()); - mBinding.version.setOnLongClickListener(v -> { - Updater.get().force().branch("dev").start(); - return true; - }); } @Override @@ -161,6 +158,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit LiveConfig.get().setHome(item); } + private boolean onVersion(boolean dev) { + if (dev) Updater.get().force().dev().start(); + else Updater.get().force().start(); + return true; + } + private void setPlayer() { int index = Prefers.getPlayer(); String[] array = ResUtil.getStringArray(R.array.select_player); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index cced8643b..cc045baeb 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -178,6 +178,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal @Override public boolean canBack() { + if (mBinding.pager.getAdapter() == null) return true; return getFragment().canBack(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java index 4b478e3f9..65ef0f7e1 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java @@ -152,7 +152,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac @Override public boolean canBack() { - if (mTypeIds.size() == 0) return true; + if (mTypeIds.size() < 2) return true; refresh(2); return false; } diff --git a/app/src/mobile/res/layout/activity_detail.xml b/app/src/mobile/res/layout/activity_detail.xml index dcfbd513d..58209788d 100644 --- a/app/src/mobile/res/layout/activity_detail.xml +++ b/app/src/mobile/res/layout/activity_detail.xml @@ -219,7 +219,8 @@ android:layout_height="20dp" android:layout_marginStart="8dp" android:background="?attr/selectableItemBackgroundBorderless" - android:src="@drawable/ic_detail_reverse" /> + android:src="@drawable/ic_detail_reverse" + android:visibility="gone" /> diff --git a/app/src/mobile/res/layout/activity_main.xml b/app/src/mobile/res/layout/activity_main.xml index 2fb5c293a..df84cf336 100644 --- a/app/src/mobile/res/layout/activity_main.xml +++ b/app/src/mobile/res/layout/activity_main.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="@color/white_60" + android:background="@color/white_70" app:elevation="0dp" app:menu="@menu/menu_nav" />