diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index f241d9959..9b3295bf9 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -292,10 +292,10 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
@Override
protected void initView() {
- mKeyDown = CustomKeyDownVod.create(this, mBinding.video);
mFrameParams = mBinding.video.getLayoutParams();
mClock = Clock.create(mBinding.widget.time);
mDanmakuContext = DanmakuContext.create();
+ mKeyDown = CustomKeyDownVod.create(this);
mPlayers = new Players().init(this);
mBroken = new ArrayList<>();
mR1 = this::hideControl;
@@ -1447,34 +1447,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
return super.dispatchKeyEvent(event);
}
- @Override
- public void onBright(int progress) {
- mBinding.widget.bright.setVisibility(View.VISIBLE);
- mBinding.widget.brightProgress.setProgress(progress);
- if (progress < 35) mBinding.widget.brightIcon.setImageResource(R.drawable.ic_widget_bright_low);
- else if (progress < 70) mBinding.widget.brightIcon.setImageResource(R.drawable.ic_widget_bright_medium);
- else mBinding.widget.brightIcon.setImageResource(R.drawable.ic_widget_bright_high);
- }
-
- @Override
- public void onBrightEnd() {
- mBinding.widget.bright.setVisibility(View.GONE);
- }
-
- @Override
- public void onVolume(int progress) {
- mBinding.widget.volume.setVisibility(View.VISIBLE);
- mBinding.widget.volumeProgress.setProgress(progress);
- if (progress < 35) mBinding.widget.volumeIcon.setImageResource(R.drawable.ic_widget_volume_low);
- else if (progress < 70) mBinding.widget.volumeIcon.setImageResource(R.drawable.ic_widget_volume_medium);
- else mBinding.widget.volumeIcon.setImageResource(R.drawable.ic_widget_volume_high);
- }
-
- @Override
- public void onVolumeEnd() {
- mBinding.widget.volume.setVisibility(View.GONE);
- }
-
@Override
public void onSeeking(int time) {
mBinding.widget.exoDuration.setText(mPlayers.getDurationTime());
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java
index 9e8300a0a..dda943289 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java
@@ -1,54 +1,35 @@
package com.fongmi.android.tv.ui.custom;
import android.app.Activity;
-import android.content.Context;
-import android.media.AudioManager;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
import androidx.annotation.NonNull;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.Constant;
import com.fongmi.android.tv.utils.KeyUtil;
-import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Util;
public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
private final GestureDetector detector;
- private final AudioManager manager;
private final Listener listener;
- private final Activity activity;
- private final View videoView;
- private boolean changeBright;
- private boolean changeVolume;
private boolean changeSpeed;
- private boolean touch;
private boolean full;
- private float bright;
- private float volume;
private int holdTime;
- public static CustomKeyDownVod create(Activity activity, View videoView) {
- return new CustomKeyDownVod(activity, videoView);
+ public static CustomKeyDownVod create(Activity activity) {
+ return new CustomKeyDownVod(activity);
}
- private CustomKeyDownVod(Activity activity, View videoView) {
- this.manager = (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
+ private CustomKeyDownVod(Activity activity) {
this.detector = new GestureDetector(activity, this);
this.listener = (Listener) activity;
- this.videoView = videoView;
- this.activity = activity;
}
public boolean onTouchEvent(MotionEvent e) {
if (!full) return false;
- if (changeBright && e.getAction() == MotionEvent.ACTION_UP) listener.onBrightEnd();
- if (changeVolume && e.getAction() == MotionEvent.ACTION_UP) listener.onVolumeEnd();
return detector.onTouchEvent(e);
}
@@ -86,27 +67,6 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
}
}
- @Override
- public boolean onDown(@NonNull MotionEvent e) {
- if (!full) return false;
- volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
- bright = Util.getBrightness(activity);
- changeBright = false;
- changeVolume = false;
- touch = true;
- return true;
- }
-
- @Override
- public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) {
- if (!full) return false;
- float deltaY = e1.getY() - e2.getY();
- if (touch) checkFunc(distanceX, distanceY, e2);
- if (changeBright) setBright(deltaY);
- if (changeVolume) setVolume(deltaY);
- return true;
- }
-
@Override
public boolean onDoubleTap(@NonNull MotionEvent e) {
listener.onDoubleTap();
@@ -131,50 +91,8 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
holdTime = 0;
}
- private void checkFunc(float distanceX, float distanceY, MotionEvent e2) {
- if (Math.abs(distanceX) < Math.abs(distanceY)) checkSide(e2);
- touch = false;
- }
-
- private void checkSide(MotionEvent e2) {
- int half = ResUtil.getScreenWidthNav() / 2;
- if (e2.getX() > half) changeVolume = true;
- else changeBright = true;
- }
-
- private void setBright(float deltaY) {
- int height = videoView.getMeasuredHeight();
- if (bright == -1.0f) bright = 0.5f;
- float brightness = deltaY * 2 / height + bright;
- if (brightness < 0) brightness = 0f;
- if (brightness > 1.0f) brightness = 1.0f;
- WindowManager.LayoutParams attributes = activity.getWindow().getAttributes();
- attributes.screenBrightness = brightness;
- activity.getWindow().setAttributes(attributes);
- listener.onBright((int) (brightness * 100));
- }
-
- private void setVolume(float deltaY) {
- int height = videoView.getMeasuredHeight();
- int maxVolume = manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
- float deltaV = deltaY * 2 / height * maxVolume;
- float index = volume + deltaV;
- if (index > maxVolume) index = maxVolume;
- if (index < 0) index = 0;
- manager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) index, 0);
- listener.onVolume((int) (index / maxVolume * 100));
- }
-
public interface Listener {
- void onBright(int progress);
-
- void onBrightEnd();
-
- void onVolume(int progress);
-
- void onVolumeEnd();
-
void onSeeking(int time);
void onSeekTo(int time);
diff --git a/app/src/leanback/res/layout/view_widget_vod.xml b/app/src/leanback/res/layout/view_widget_vod.xml
index a3a9b6869..050e7c2be 100644
--- a/app/src/leanback/res/layout/view_widget_vod.xml
+++ b/app/src/leanback/res/layout/view_widget_vod.xml
@@ -172,67 +172,4 @@
android:src="@drawable/ic_widget_forward"
android:visibility="gone" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/view_widget_vod.xml b/app/src/mobile/res/layout/view_widget_vod.xml
index 1df573903..e5feb0aa2 100644
--- a/app/src/mobile/res/layout/view_widget_vod.xml
+++ b/app/src/mobile/res/layout/view_widget_vod.xml
@@ -149,12 +149,4 @@
app:trackColor="@color/grey_500" />
-
-
-
\ No newline at end of file