refactor skip-by-position implementation

Author: zfdang

app/src/main/java/com/zfdang/touchhelper/PackagePositionDescription.java

@@ -5,37 +5,25 @@ public class PackagePositionDescription {
     public String activityName;
     public int x;
     public int y;
-    public int delay;
-    public int period;
-    public int number;
 
     public PackagePositionDescription() {
         this.packageName = "";
         this.activityName = "";
         this.x = 0;
         this.y = 0;
-        this.delay = 0;
-        this.period = 0;
-        this.number = 0;
     }
 
-    public PackagePositionDescription(String packageName, String activityName, int x, int y, int delay, int period, int number) {
+    public PackagePositionDescription(String packageName, String activityName, int x, int y) {
         this.packageName = packageName;
         this.activityName = activityName;
         this.x = x;
         this.y = y;
-        this.delay = delay;
-        this.period = period;
-        this.number = number;
     }
 
     public PackagePositionDescription(PackagePositionDescription positionDescription) {
         this.packageName = positionDescription.packageName;
         this.activityName = positionDescription.activityName;
         this.x = positionDescription.x;
         this.y = positionDescription.y;
-        this.delay = positionDescription.delay;
-        this.period = positionDescription.period;
-        this.number = positionDescription.number;
     }
 }

app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java

@@ -75,6 +75,11 @@ public class TouchHelperServiceImpl {
     private Set<PackageWidgetDescription> setWidgets;
     private PackagePositionDescription packagePositionDescription;
 
+    // try to click 5 times, first click after 300ms, and delayed for 500ms for future clicks
+    static final int PackagePositionClickFirstDelay = 300;
+    static final int PackagePositionClickRetryInterval = 500;
+    static final int PackagePositionClickRetry = 5;
+
     public TouchHelperServiceImpl(AccessibilityService service) {
         this.service = service;
     }
@@ -290,17 +295,22 @@ public void onAccessibilityEvent(AccessibilityEvent event) {
                     }
 
                     // now to take different methods to skip ads
+
+                    // first method is to skip ads by position in activity
                     if (b_method_by_activity_position) {
-//                        Log.d(TAG, "method by position in STATE_CHANGED");
+                        // run this method for once only
+                        b_method_by_activity_position = false;
+
                         packagePositionDescription = mapPackagePositions.get(currentPackageName);
                         if (packagePositionDescription != null) {
-                            // the following codes might be run multiple times
                             ShowToastInIntentService("正在根据位置跳过广告...");
+
+                            // try to click the position in the activity for multiple times
                             executorService.scheduleAtFixedRate(new Runnable() {
                                 int num = 0;
                                 @Override
                                 public void run() {
-                                    if (num < packagePositionDescription.number) {
+                                    if (num < PackagePositionClickRetry) {
                                         if(currentActivityName.equals(packagePositionDescription.activityName)) {
                                             // current activity is null, or current activity is the target activity
 //                                            Log.d(TAG, "Find skip-ad by position, simulate click now! ");
@@ -311,10 +321,7 @@ public void run() {
                                         throw new RuntimeException();
                                     }
                                 }
-                            }, packagePositionDescription.delay, packagePositionDescription.period, TimeUnit.MILLISECONDS);
-                        } else {
-                            // no customized positions for this package, don't try this method again
-                            b_method_by_activity_position = false;
+                            }, PackagePositionClickFirstDelay, PackagePositionClickRetryInterval, TimeUnit.MILLISECONDS);
                         }
                     }
 
@@ -651,7 +658,7 @@ private void showActivityCustomizationDialog() {
 
 
         final PackageWidgetDescription widgetDescription = new PackageWidgetDescription();
-        final PackagePositionDescription positionDescription = new PackagePositionDescription("", "", 0, 0, 500, 500, 6);
+        final PackagePositionDescription positionDescription = new PackagePositionDescription("", "", 0, 0);
 
         final LayoutInflater inflater = LayoutInflater.from(service);
         // activity customization view