hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug

Browse Source
pull/589/head
FongMi 8 months ago
parent 7c7fc7e505
commit 7439e29375
2 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java
  2. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java

8
app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java
Unescape View File

@ -52,7 +52,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener {
if (changeSpeed && e.getAction() == MotionEvent.ACTION_UP) listener.onSpeedEnd(); if (changeSpeed && e.getAction() == MotionEvent.ACTION_UP) listener.onSpeedEnd();
if (changeBright && e.getAction() == MotionEvent.ACTION_UP) listener.onBrightEnd(); if (changeBright && e.getAction() == MotionEvent.ACTION_UP) listener.onBrightEnd();
if (changeVolume && e.getAction() == MotionEvent.ACTION_UP) listener.onVolumeEnd(); if (changeVolume && e.getAction() == MotionEvent.ACTION_UP) listener.onVolumeEnd();
return e.getPointerCount() == 1 && detector.onTouchEvent(e); return detector.onTouchEvent(e);
} }
public void setLock(boolean lock) { public void setLock(boolean lock) {
@ -65,7 +65,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener {
@Override @Override
public boolean onDown(@NonNull MotionEvent e) { public boolean onDown(@NonNull MotionEvent e) {
if (isEdge(e) || lock) return true; if (isEdge(e) || lock || e.getPointerCount() > 1) return true;
volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC); volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
bright = Util.getBrightness(activity); bright = Util.getBrightness(activity);
changeBright = false; changeBright = false;
@ -79,14 +79,14 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener {
@Override @Override
public void onLongPress(@NonNull MotionEvent e) { public void onLongPress(@NonNull MotionEvent e) {
if (isEdge(e) || lock) return; if (isEdge(e) || lock || e.getPointerCount() > 1) return;
changeSpeed = true; changeSpeed = true;
listener.onSpeedUp(); listener.onSpeedUp();
} }
@Override @Override
public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) {
if (isEdge(e1) || lock) return true; if (isEdge(e1) || lock || e1.getPointerCount() > 1) return true;
float deltaX = e2.getX() - e1.getX(); float deltaX = e2.getX() - e1.getX();
float deltaY = e1.getY() - e2.getY(); float deltaY = e1.getY() - e2.getY();
if (touch) checkFunc(distanceX, distanceY, e2); if (touch) checkFunc(distanceX, distanceY, e2);

8
app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java
Unescape View File

@ -47,7 +47,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
if (changeSpeed && e.getAction() == MotionEvent.ACTION_UP) listener.onSpeedEnd(); if (changeSpeed && e.getAction() == MotionEvent.ACTION_UP) listener.onSpeedEnd();
if (changeBright && e.getAction() == MotionEvent.ACTION_UP) listener.onBrightEnd(); if (changeBright && e.getAction() == MotionEvent.ACTION_UP) listener.onBrightEnd();
if (changeVolume && e.getAction() == MotionEvent.ACTION_UP) listener.onVolumeEnd(); if (changeVolume && e.getAction() == MotionEvent.ACTION_UP) listener.onVolumeEnd();
return e.getPointerCount() == 1 && detector.onTouchEvent(e); return detector.onTouchEvent(e);
} }
public void setLock(boolean lock) { public void setLock(boolean lock) {
@ -60,7 +60,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
@Override @Override
public boolean onDown(@NonNull MotionEvent e) { public boolean onDown(@NonNull MotionEvent e) {
if (isEdge(e) || lock) return true; if (isEdge(e) || lock || e.getPointerCount() > 1) return true;
volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC); volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
bright = Util.getBrightness(activity); bright = Util.getBrightness(activity);
changeBright = false; changeBright = false;
@ -73,14 +73,14 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
@Override @Override
public void onLongPress(@NonNull MotionEvent e) { public void onLongPress(@NonNull MotionEvent e) {
if (isEdge(e) || lock) return; if (isEdge(e) || lock || e.getPointerCount() > 1) return;
changeSpeed = true; changeSpeed = true;
listener.onSpeedUp(); listener.onSpeedUp();
} }
@Override @Override
public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) {
if (isEdge(e1) || lock) return true; if (isEdge(e1) || lock || e1.getPointerCount() > 1) return true;
float deltaX = e2.getX() - e1.getX(); float deltaX = e2.getX() - e1.getX();
float deltaY = e1.getY() - e2.getY(); float deltaY = e1.getY() - e2.getY();
if (touch) checkFunc(distanceX, distanceY, e2); if (touch) checkFunc(distanceX, distanceY, e2);

Write Preview
Loading…
Cancel
Save