diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 0f313e4b6..90edfd3ca 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -362,7 +362,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick view.requestFocus(); setR2Callback(); hideInfo(); - hideUI(); } private void hideControl() { @@ -721,7 +720,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onDoubleTap() { - if (isVisible(mBinding.control.getRoot())) hideControl(); + if (isVisible(mBinding.recycler)) hideUI(); + else if (isVisible(mBinding.control.getRoot())) hideControl(); else onMenu(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java index ce32c44f6..70c3b23e6 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.utils.Prefers; +import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Utils; public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { @@ -91,7 +92,10 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { @Override public boolean onSingleTapConfirmed(@NonNull MotionEvent e) { - if (listener.dispatch(false)) listener.onSingleTap(); + if (!listener.dispatch(false)) return true; + int half = ResUtil.getScreenWidthNav() / 2; + if (e.getX() > half) listener.onDoubleTap(); + else listener.onSingleTap(); return true; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java index 0165b5438..46fee5a86 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java @@ -87,7 +87,10 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { @Override public boolean onSingleTapConfirmed(@NonNull MotionEvent e) { - if (!lock) listener.onSingleTap(); + if (lock) return true; + int half = ResUtil.getScreenWidthNav() / 2; + if (e.getX() > half) listener.onDoubleTap(); + else listener.onSingleTap(); return true; }