增加 images图片处理函数

.idea/dictionaries/Stardust.xml

@@ -1,11 +1,14 @@
 <component name="ProjectDictionaryState">
   <dictionary name="Stardust">
     <words>
+      <w>autojs</w>
       <w>capturer</w>
       <w>dismissable</w>
       <w>flowable</w>
+      <w>imgproc</w>
       <w>interruptible</w>
       <w>loopers</w>
+      <w>opencv</w>
       <w>prefill</w>
       <w>scriptable</w>
       <w>storages</w>

app/src/main/assets/sample/图片与图色处理/图片处理.js

@@ -0,0 +1,82 @@
+"ui";
+
+var url = "https://www.autojs.org/assets/uploads/profile/3-profileavatar.png";
+var logo = null;
+
+ui.layout(
+    <vertical>
+        <img id="img" w="150" h="150" url="{{url}}" />
+        <button id="grayscale" text="灰度化" />
+        <button id="binary" text="二值化" />
+        <button id="hsv" text="RGB转HSV" />
+        <button id="blur" text="模糊" />
+        <button id="medianBlur" text="中值滤波" />
+        <button id="gaussianBlur" text="高斯模糊" />
+    </vertical>
+);
+
+//把一张图片设置到图片控件中
+function setImage(img) {
+    ui.run(() => {
+        ui.img.setImageBitmap(img.bitmap);
+    });
+}
+
+//启动一个处理图片的线程
+var imgProcess = threads.start(function () {
+    setInterval(() => { }, 1000);
+});
+
+//处理图片的函数，把任务交给图片处理线程处理
+function processImg(process) {
+    imgProcess.setTimeout(() => {
+        if (logo == null) {
+            logo = images.load(url);
+        }
+        //处理图片
+        var result = process(logo);
+        //把处理后的图片设置到图片控件中
+        setImage(result);
+    }, 0);
+}
+
+ui.grayscale.on("click", () => {
+    processImg(img => {
+        //灰度化
+        return images.grayscale(img);
+    });
+});
+
+ui.binary.on("click", () => {
+    processImg(img => {
+        //二值化，取灰度为30到200之间的图片
+        return images.threshold(images.grayscale(img), 100, 200);
+    });
+});
+
+ui.hsv.on("click", () => {
+    processImg(img => {
+        //RGB转HSV
+        return images.cvtColor(img, "BGR2HSV");
+    });
+});
+
+ui.blur.on("click", () => {
+    processImg(img => {
+        //RGB转HSV
+        return images.blur(img, [10, 10]);
+    });
+});
+
+ui.medianBlur.on("click", () => {
+    processImg(img => {
+        //RGB转HSV
+        return images.medianBlur(img, 10);
+    });
+});
+ui.gaussianBlur.on("click", () => {
+    processImg(img => {
+        //RGB转HSV
+        return images.gaussianBlur(img, [5, 5]);
+    });
+});

autojs/src/main/assets/modules/__app__.js

@@ -99,7 +99,7 @@ module.exports = function(runtime, global){
         return arr;
     }
 
-    app.getUriForFile = function(file){
+    app.getUriForFile = function(path){
         return android.support.v4.content.FileProvider.getUriForFile(context,
             "org.autojs.autojs.fileprovider", new java.io.File(files.path(path)));
     };

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

@@ -1,6 +1,8 @@
 
 module.exports = function (__runtime__, scope) {
     const defaultColorThreshold = 4;
+    importPackage(org.opencv.core);
+    const Imgproc = org.opencv.imgproc.Imgproc;
 
     var images = {};
     var colors = Object.create(__runtime__.colors);
@@ -60,6 +62,58 @@ module.exports = function(__runtime__, scope){
 
     images.pixel = rtImages.pixel;
 
+    images.grayscale = function (img, dstCn) {
+        return images.cvtColor(img, "BGR2GRAY", dstCn);
+    }
+
+    images.threshold = function (img, threshold, maxVal, type) {
+        var mat = newMat();
+        type = type || "binary";
+        type = Imgproc["THRESH_" + type.toUpperCase()];
+        Imgproc.threshold(img.mat, mat, threshold, maxVal, type);
+        return matToImage(mat);
+    }
+
+    images.blur = function (img, size, point, type) {
+        var mat = newMat();
+        size = newSize(size);
+        type = Imgproc["BORDER_" + (type || "CONSTANT")];
+        if (point == undefined) {
+            Imgproc.blur(img.mat, mat, size);
+        } else {
+            Imgproc.blur(img.mat, mat, size, new Point(point[0], point[1]), type);
+        }
+        return matToImage(mat);
+    }
+
+    images.medianBlur = function (img, size) {
+        var mat = newMat();
+        Imgproc.medianBlur(img.mat, mat, size);
+        return matToImage(mat);
+    }
+
+
+    images.gaussianBlur = function (img, size, sigmaX, sigmaY, type) {
+        var mat = newMat();
+        size = newSize(size);
+        sigmaX = sigmaX == undefined ? 0 : sigmaX;
+        sigmaY = sigmaY == undefined ? 0 : sigmaY;
+        type = Imgproc["BORDER_" + (type || "DEFAULT")];
+        Imgproc.GaussianBlur(img.mat, mat, size, sigmaX, sigmaY, type);
+        return matToImage(mat);
+    }
+
+    images.cvtColor = function (img, code, dstCn) {
+        var mat = newMat();
+        code = Imgproc["COLOR_" + code];
+        if (dstCn == undefined) {
+            Imgproc.cvtColor(img.mat, mat, code);
+        } else {
+            Imgproc.cvtColor(img.mat, mat, code, dstCn);
+        }
+        return matToImage(mat);
+    }
+
     images.detectsColor = function (img, color, x, y, threshold, algorithm) {
         color = parseColor(color);
         algorithm = algorithm || "diff";
@@ -228,6 +282,24 @@ module.exports = function(__runtime__, scope){
         return color;
     }
 
+    function newMat() {
+        return new org.opencv.core.Mat();
+    }
+
+    function matToImage(mat) {
+        return com.stardust.autojs.core.image.ImageWrapper.ofMat(mat);
+    }
+
+    function newSize(size) {
+        if (!Array.isArray(size)) {
+            size = [size, size];
+        }
+        if (size.length == 1) {
+            size = [size[0], size[0]];
+        }
+        return new Size(size[0], size[1]);
+    }
+
     scope.__asGlobal__(images, ['requestScreenCapture', 'captureScreen', 'findImage', 'findImageInRegion', 'findColor', 'findColorInRegion', 'findColorEquals', 'findMultiColors']);
 
     scope.colors = colors;

autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java

@@ -282,13 +282,22 @@ public class StardustConsole extends AbstractConsole {
         }
         if (options != null && options.length > 0) {
             StringBuilder sb = new StringBuilder(data == null ? "" : data.toString());
+            ArrayList<Object> newOptions = new ArrayList<>();
             for (Object option : options) {
                 if (option instanceof Throwable) {
                     sb.append(getStackTrace((Throwable) option)).append(" ");
+                } else {
+                    newOptions.add(option);
                 }
             }
             data = sb.toString();
+            if (newOptions.isEmpty()) {
+                super.error(data, newOptions.toArray());
+            } else {
+                super.error(data);
             }
+        } else {
             super.error(data, options);
         }
     }
+}

autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java

@@ -26,19 +26,19 @@ public class ImageWrapper {
     private int mHeight;
     private Bitmap mBitmap;
 
-    public ImageWrapper(Mat mat) {
+    protected ImageWrapper(Mat mat) {
         mMat = mat;
         mWidth = mat.cols();
         mHeight = mat.rows();
     }
 
-    public ImageWrapper(Bitmap bitmap) {
+    protected ImageWrapper(Bitmap bitmap) {
         mBitmap = bitmap;
         mWidth = bitmap.getWidth();
         mHeight = bitmap.getHeight();
     }
 
-    public ImageWrapper(Bitmap bitmap, Mat mat) {
+    protected ImageWrapper(Bitmap bitmap, Mat mat) {
         mBitmap = bitmap;
         mMat = mat;
         mWidth = bitmap.getWidth();
@@ -58,6 +58,14 @@ public class ImageWrapper {
         return new ImageWrapper(toBitmap(image));
     }
 
+    public static ImageWrapper ofMat(Mat mat) {
+        if (mat == null) {
+            return null;
+        }
+        return new ImageWrapper(mat);
+    }
+
+
     public static ImageWrapper ofBitmap(Bitmap bitmap) {
         if (bitmap == null) {
             return null;
@@ -123,6 +131,10 @@ public class ImageWrapper {
 
     public Bitmap getBitmap() {
         ensureNotRecycled();
+        if (mBitmap == null && mMat != null) {
+            mBitmap = Bitmap.createBitmap(mMat.width(), mMat.height(), Bitmap.Config.ARGB_8888);
+            Utils.matToBitmap(mMat, mBitmap);
+        }
         return mBitmap;
     }
 
@@ -142,4 +154,21 @@ public class ImageWrapper {
         if (mBitmap == null && mMat == null)
             throw new IllegalStateException("image has been recycled");
     }
+
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+        recycle();
+    }
+
+    public ImageWrapper clone() {
+        ensureNotRecycled();
+        if (mBitmap == null) {
+            return ImageWrapper.ofMat(mMat.clone());
+        }
+        if (mMat == null) {
+            return ImageWrapper.ofBitmap(mBitmap.copy(mBitmap.getConfig(), true));
+        }
+        return new ImageWrapper(mBitmap.copy(mBitmap.getConfig(), true), mMat.clone());
+    }
 }

autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java

@@ -44,7 +44,7 @@ public class TimerThread extends ThreadCompat {
         new Handler().post(mTarget);
         try {
             Looper.loop();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             if (!ScriptInterruptedException.causedByInterrupted(e)) {
                 mRuntime.console.error(Thread.currentThread().toString() + ": ", e);
             }

autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java

@@ -30,9 +30,11 @@ import com.stardust.concurrent.VolatileDispose;
 import com.stardust.pio.UncheckedIOException;
 import com.stardust.util.ScreenMetrics;
 
+import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.core.Point;
 import org.opencv.core.Rect;
+import org.opencv.imgproc.Imgproc;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
@@ -130,14 +132,7 @@ public class Images {
     }
 
     public ImageWrapper copy(ImageWrapper image) {
-        image.ensureNotRecycled();
+        return image.clone();
-        if (image.getBitmap() == null) {
-            return new ImageWrapper(image.getMat().clone());
-        }
-        if (image.getMat() == null) {
-            return new ImageWrapper(image.getBitmap().copy(image.getBitmap().getConfig(), true));
-        }
-        return new ImageWrapper(image.getBitmap().copy(image.getBitmap().getConfig(), true), image.getMat().clone());
     }
 
     public boolean save(ImageWrapper image, String path, String format, int quality) throws IOException {
@@ -279,5 +274,4 @@ public class Images {
         return point;
     }
 
-
 }