Блокировка выполнения следующей команды при обычной паузе

This commit is contained in:
Victor 2015-05-05 16:34:51 +03:00
parent 106c4cce7c
commit 31e219258e

View File

@ -67,7 +67,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
private Map<String, AnimatableImageView> spriteInContainer; private Map<String, AnimatableImageView> spriteInContainer;
private DisplayMetrics displayMetrics; private DisplayMetrics displayMetrics;
private boolean blockTap; private transient boolean blockTap, cancelNextStep;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -182,7 +182,10 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
public void onTouchGesture(TouchGestureType type) { public void onTouchGesture(TouchGestureType type) {
switch (type) { switch (type) {
case SINGLE_TAP: case SINGLE_TAP:
if (!blockTap) Parser.getInstance().next(); if (blockTap) return;
cancelNextStep = true;
Parser.getInstance().next();
break; break;
case SWIPE: case SWIPE:
Dialogs.with(this).showMenu(R.array.menu_items, menu); Dialogs.with(this).showMenu(R.array.menu_items, menu);
@ -401,6 +404,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
public void pause(final long duration, final boolean hard) { public void pause(final long duration, final boolean hard) {
blockTap = hard; blockTap = hard;
cancelNextStep = false;
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -630,7 +634,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
@Override @Override
public void run() { public void run() {
blockTap = false; blockTap = false;
Parser.getInstance().next(); if (!cancelNextStep) Parser.getInstance().next();
} }
}; };