xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle more overlay events

Browse Source
This commit is contained in:
Hannes Janetzek 2012-11-13 14:35:50 +01:00
parent b863882302
commit adc808f505
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/org/oscim/view/TouchHandler.java
View File

@ -22,7 +22,6 @@ import org.oscim.overlay.OverlayManager;
import android.content.Context; import android.content.Context;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Log;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.GestureDetector.OnDoubleTapListener; import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener; import android.view.GestureDetector.OnGestureListener;
@ -104,22 +103,25 @@ final class TouchHandler implements OnGestureListener, OnScaleGestureListener, O
mScaleGestureDetector.onTouchEvent(event); mScaleGestureDetector.onTouchEvent(event);
int action = getAction(event); int action = getAction(event);
boolean ret = false;
if (action == MotionEvent.ACTION_DOWN) { if (action == MotionEvent.ACTION_DOWN) {
ret = onActionDown(event); if (mOverlayManager.onDown(event, mMapView))
return true;
return onActionDown(event);
} else if (action == MotionEvent.ACTION_MOVE) { } else if (action == MotionEvent.ACTION_MOVE) {
ret = onActionMove(event); return onActionMove(event);
} else if (action == MotionEvent.ACTION_UP) { } else if (action == MotionEvent.ACTION_UP) {
ret = onActionUp(event); return onActionUp(event);
} else if (action == MotionEvent.ACTION_CANCEL) { } else if (action == MotionEvent.ACTION_CANCEL) {
ret = onActionCancel(); return onActionCancel();
} else if (action == MotionEvent.ACTION_POINTER_DOWN) { } else if (action == MotionEvent.ACTION_POINTER_DOWN) {
return onActionPointerDown(event); return onActionPointerDown(event);
} else if (action == MotionEvent.ACTION_POINTER_UP) { } else if (action == MotionEvent.ACTION_POINTER_UP) {
ret = onActionPointerUp(event); return onActionPointerUp(event);
} }
return ret; return false;
} }
private static int getAction(MotionEvent motionEvent) { private static int getAction(MotionEvent motionEvent) {
@ -286,14 +288,11 @@ final class TouchHandler implements OnGestureListener, OnScaleGestureListener, O
@Override @Override
public void onShowPress(MotionEvent e) { public void onShowPress(MotionEvent e) {
Log.d(TAG, "show press"); mOverlayManager.onShowPress(e, mMapView);
// TODO Auto-generated method stub
} }
@Override @Override
public boolean onSingleTapUp(MotionEvent e) { public boolean onSingleTapUp(MotionEvent e) {
Log.d(TAG, "single tap up");
return mOverlayManager.onSingleTapUp(e, mMapView); return mOverlayManager.onSingleTapUp(e, mMapView);
} }
@ -309,8 +308,6 @@ final class TouchHandler implements OnGestureListener, OnScaleGestureListener, O
fling = false; fling = false;
} }
// Log.d(TAG, "tap");
return true; return true;
} }
@ -427,23 +424,21 @@ final class TouchHandler implements OnGestureListener, OnScaleGestureListener, O
/******************* DoubleTapListener ****************/ /******************* DoubleTapListener ****************/
@Override @Override
public boolean onSingleTapConfirmed(MotionEvent e) { public boolean onSingleTapConfirmed(MotionEvent e) {
// Log.d(TAG, "single tap confirmed");
return mOverlayManager.onSingleTapConfirmed(e, mMapView); return mOverlayManager.onSingleTapConfirmed(e, mMapView);
} }
@Override @Override
public boolean onDoubleTap(MotionEvent e) { public boolean onDoubleTap(MotionEvent e) {
Log.d(TAG, "double tap"); if (mOverlayManager.onDoubleTap(e, mMapView))
return true;
// TODO Auto-generated method stub mLongPress = true;
return false;
return true;
} }
@Override @Override
public boolean onDoubleTapEvent(MotionEvent e) { public boolean onDoubleTapEvent(MotionEvent e) {
mLongPress = true;
Log.d(TAG, "double tap event");
// TODO Auto-generated method stub
return false; return false;
} }