Add anim when flip up down

pull/590/head
FongMi 10 months ago
parent ab4ef13cfb
commit 26509526cc
  1. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  2. 7
      app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java
  3. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  4. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  5. 7
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java
  6. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.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

@ -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)) {

@ -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

@ -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);

@ -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();
}
}

@ -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();
}
}

Loading…
Cancel
Save