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 dd59823e3..036f6ce53 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 @@ -918,12 +918,14 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onKeyUp() { - prevChannel(); + if (Setting.isInvert()) nextChannel(); + else prevChannel(); } @Override public void onKeyDown() { - nextChannel(); + if (Setting.isInvert()) prevChannel(); + else nextChannel(); } @Override 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 02095ac3d..1caab46c7 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 @@ -9,7 +9,6 @@ import androidx.annotation.NonNull; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Constant; -import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.utils.KeyUtil; import com.fongmi.android.tv.utils.ResUtil; @@ -56,11 +55,9 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { } else if (event.getAction() == KeyEvent.ACTION_DOWN && KeyUtil.isRightKey(event)) { listener.onSeeking(addTime()); } else if (event.getAction() == KeyEvent.ACTION_DOWN && KeyUtil.isUpKey(event)) { - if (Setting.isInvert()) listener.onKeyDown(); - else listener.onKeyUp(); + listener.onKeyUp(); } else if (event.getAction() == KeyEvent.ACTION_DOWN && KeyUtil.isDownKey(event)) { - if (Setting.isInvert()) listener.onKeyUp(); - else listener.onKeyDown(); + listener.onKeyDown(); } else if (event.getAction() == KeyEvent.ACTION_UP && KeyUtil.isLeftKey(event)) { listener.onKeyLeft(holdTime); } else if (event.getAction() == KeyEvent.ACTION_UP && KeyUtil.isRightKey(event)) { 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 20de00c7b..f4981dd2f 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 @@ -137,7 +137,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override protected void initView(Bundle savedInstanceState) { - mKeyDown = CustomKeyDownLive.create(this, mBinding.video); + mKeyDown = CustomKeyDownLive.create(this, mBinding.exo); setPadding(mBinding.control.getRoot()); setPadding(mBinding.recycler, true); mPlayers = Players.create(this); @@ -975,12 +975,14 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override public void onFlingUp() { - prevChannel(); + if (Setting.isInvert()) nextChannel(); + else prevChannel(); } @Override public void onFlingDown() { - nextChannel(); + if (Setting.isInvert()) prevChannel(); + else nextChannel(); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 14d3f4b18..08495bc23 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -279,7 +279,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override protected void initView(Bundle savedInstanceState) { - mKeyDown = CustomKeyDownVod.create(this, mBinding.video); + mKeyDown = CustomKeyDownVod.create(this, mBinding.exo); mFrameParams = mBinding.video.getLayoutParams(); mBinding.progressLayout.showProgress(); mBinding.swipeLayout.setEnabled(false); 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 e33706a53..4119df0d5 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 @@ -10,7 +10,6 @@ import android.view.WindowManager; import androidx.annotation.NonNull; -import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Util; @@ -137,11 +136,9 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { } else if (e2.getX() - e1.getX() > DISTANCE && Math.abs(velocityX) > VELOCITY) { listener.onFlingRight(); } else if (e1.getY() - e2.getY() > DISTANCE && Math.abs(velocityY) > VELOCITY) { - if (Setting.isInvert()) listener.onFlingDown(); - else listener.onFlingUp(); + videoView.animate().translationYBy(-80).setDuration(150).withEndAction(() -> videoView.animate().translationY(0).setDuration(100).withEndAction(listener::onFlingUp).start()).start(); } else if (e2.getY() - e1.getY() > DISTANCE && Math.abs(velocityY) > VELOCITY) { - if (Setting.isInvert()) listener.onFlingUp(); - else listener.onFlingDown(); + videoView.animate().translationYBy(80).setDuration(150).withEndAction(() -> videoView.animate().translationY(0).setDuration(100).withEndAction(listener::onFlingDown).start()).start(); } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index 3a9e44fab..27d3edf0e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -130,9 +130,9 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { private void checkFunc(MotionEvent e1, MotionEvent e2, float velocityY) { if (e1.getY() - e2.getY() > DISTANCE && Math.abs(velocityY) > VELOCITY) { - listener.onFlingUp(); + videoView.animate().translationYBy(-80).setDuration(150).withEndAction(() -> videoView.animate().translationY(0).setDuration(100).withEndAction(listener::onFlingUp).start()).start(); } else if (e2.getY() - e1.getY() > DISTANCE && Math.abs(velocityY) > VELOCITY) { - listener.onFlingDown(); + videoView.animate().translationYBy(80).setDuration(150).withEndAction(() -> videoView.animate().translationY(0).setDuration(100).withEndAction(listener::onFlingDown).start()).start(); } }