Merge pull request #72 from LYS86/master

PR#72 - LYS86 - findMultiColors调整

app/src/main/assets/modules/__images__.js

@@ -333,11 +333,21 @@ module.exports = function (scriptRuntime, scope) {
                         list[i * 3 + 2] = colors.toInt(color);
                     }
                     let opt = options || {};
+                    let findAll = opt.All || false;
+                
+                    if (findAll) {
+                        return Array.from(rtImages.colorFinder.findAllMultiColors(img,
+                            colors.toInt(firstColor),
+                            _.parseThreshold(opt),
+                            'region' in opt ? _.buildRegion(img, opt.region) : null,
+                            list));
+                    } else {
                         return rtImages.colorFinder.findMultiColors(img,
                             colors.toInt(firstColor),
                             _.parseThreshold(opt),
                             'region' in opt ? _.buildRegion(img, opt.region) : null,
                             list);
+                    }
                 },
                 findImage(img, template, options) {
                     _.initIfNeeded();

app/src/main/java/org/autojs/autojs/core/image/ColorFinder.java

@@ -13,6 +13,10 @@ import org.opencv.core.Point;
 import org.opencv.core.Rect;
 import org.opencv.core.Scalar;
 
+import java.util.List;
+import java.util.ArrayList;
+
+
 /**
  * Created by Stardust on 2017/5/18.
  */
@@ -109,6 +113,21 @@ public class ColorFinder {
         return result;
     }
     
+    public Point[] findAllMultiColors(ImageWrapper image, int firstColor, int threshold, Rect rect, int[] points) {
+    Point[] firstPoints = findAllPointsForColor(image, firstColor, threshold, rect);
+    List<Point> resultPoints = new ArrayList<>();
+    for (Point firstPoint : firstPoints) {
+        if (firstPoint != null) {
+            if (checksPath(image, firstPoint, threshold, points)) {
+                resultPoints.add(firstPoint);
+            }
+        }
+    }
+    image.shoot();
+    return resultPoints.toArray(new Point[0]);
+}
+
+
     private boolean checksPath(ImageWrapper image, Point startingPoint, int threshold, int[] points) {
         for (int i = 0; i < points.length; i += 3) {
             int x = points[i];