From d8d02a1137290b95dccd7beb1aa4996152ff2f85 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 2 Nov 2018 00:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20images.rotate(),=20images.?=
 =?UTF-8?q?concat()=E6=97=8B=E8=BD=AC=E5=92=8C=E6=8B=BC=E6=8E=A5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=EF=BC=8C=E5=8F=82=E8=A7=81=E3=80=8A=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=8B=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/sample/图片与图色处理/图片处理.js  | 55 ++++++++++++++++---
 autojs/src/main/assets/modules/__images__.js  | 20 +++++++
 .../core/ui/dialog/BlockedMaterialDialog.java |  1 +
 .../stardust/autojs/runtime/api/Images.java   | 43 ++++++++++++++-
 4 files changed, 110 insertions(+), 9 deletions(-)

diff --git a/app/src/main/assets/sample/图片与图色处理/图片处理.js b/app/src/main/assets/sample/图片与图色处理/图片处理.js
index 42781886..7c1d02b3 100644
--- a/app/src/main/assets/sample/图片与图色处理/图片处理.js
+++ b/app/src/main/assets/sample/图片与图色处理/图片处理.js
@@ -2,17 +2,33 @@
 
 var url = "https://www.autojs.org/assets/uploads/files/1540386817060-918021-20160416200702191-185324559.jpg";
 var logo = null;
+var currentImg = null;
+
+events.on("exit", function(){
+    if(logo != null){
+        logo.recycle();
+    }
+    if(currentImg != null){
+        currentImg.recycle();
+    }
+});
 
 ui.layout(
     <vertical>
         <img id="img" w="250" h="250" url="{{url}}" />
-        <button id="grayscale" text="灰度化" />
-        <button id="binary" text="二值化" />
-        <button id="adaptiveBinary" text="自适应二值化" />
-        <button id="hsv" text="RGB转HSV" />
-        <button id="blur" text="模糊" />
-        <button id="medianBlur" text="中值滤波" />
-        <button id="gaussianBlur" text="高斯模糊" />
+        <scroll>
+            <vertical>
+                <button id="rotate" text="旋转" />
+                <button id="concat" text="拼接" />
+                <button id="grayscale" text="灰度化" />
+                <button id="binary" text="二值化" />
+                <button id="adaptiveBinary" text="自适应二值化" />
+                <button id="hsv" text="RGB转HSV" />
+                <button id="blur" text="模糊" />
+                <button id="medianBlur" text="中值滤波" />
+                <button id="gaussianBlur" text="高斯模糊" />
+            </vertical>
+        </scroll>
     </vertical>
 );
 
@@ -36,11 +52,36 @@ function processImg(process) {
         }
         //处理图片
         var result = process(logo);
+        if(currentImg != null){
+            currentImg.recycle();
+        }
+        currentImg = result;
         //把处理后的图片设置到图片控件中
         setImage(result);
     }, 0);
 }
 
+var degress = 0;
+
+ui.rotate.on("click", () => {
+    processImg(img => {
+        degress += 90;
+        //旋转degress角度
+        return images.rotate(img, degress);
+    });
+});
+
+ui.concat.on("click", () => {
+    processImg(img => {
+        if(currentImg == null){
+            toast("请先点击其他按钮，再点击本按钮");
+            return img.clone();
+        }
+        //把currentImg拼接在img右边
+        return images.concat(img, currentImg, "right");
+    });
+});
+
 ui.grayscale.on("click", () => {
     processImg(img => {
         //灰度化
diff --git a/autojs/src/main/assets/modules/__images__.js b/autojs/src/main/assets/modules/__images__.js
index 89562ebe..d70c844c 100644
--- a/autojs/src/main/assets/modules/__images__.js
+++ b/autojs/src/main/assets/modules/__images__.js
@@ -189,6 +189,23 @@ module.exports = function (runtime, scope) {
             return images.matToImage(mat);
         }
 
+        images.rotate = function(img, degree, x, y) {
+            if(x == undefined){
+                x = img.width / 2;
+            }
+            if(y == undefined){
+                y = img.height / 2;
+            }
+            return javaImages.rotate(img, x, y, degree);
+        }
+
+        images.concat = function(img1, img2, direction, rect1, rect2) {
+            direction = direction || "right";
+            rect1 = buildRegion(rect1, img1);
+            rect2 = buildRegion(rect2, img1);
+            return javaImages.concat(img1, rect1, img2, rect2, android.view.Gravity[direction.toUpperCase()]);
+        }
+
         images.detectsColor = function (img, color, x, y, threshold, algorithm) {
             color = parseColor(color);
             algorithm = algorithm || "diff";
@@ -345,6 +362,9 @@ module.exports = function (runtime, scope) {
         }
 
         function buildRegion(region, img) {
+            if(region == undefined){
+                region = [];
+            }
             var x = region[0] === undefined ? 0 : region[0];
             var y = region[1] === undefined ? 0 : region[1];
             var width = region[2] === undefined ? img.getWidth() - x : region[2];
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java
index 57cc2951..39e4d8d1 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java
@@ -3,6 +3,7 @@ package com.stardust.autojs.core.ui.dialog;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.location.LocationManager;
 import android.os.Build;
 import android.os.Looper;
 import android.support.annotation.Nullable;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
index 47099ad7..d90ea740 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
@@ -5,14 +5,15 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.media.Image;
 import android.os.Build;
 import android.os.Handler;
 import android.support.annotation.RequiresApi;
 import android.util.Base64;
-import android.view.Display;
-import android.view.WindowManager;
+import android.view.Gravity;
 
 import com.stardust.autojs.annotation.ScriptVariable;
 import com.stardust.autojs.core.image.ColorFinder;
@@ -39,6 +40,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.Arrays;
 
 /**
  * Created by Stardust on 2017/5/20.
@@ -145,6 +147,43 @@ public class Images {
         return image.pixel(x, y);
     }
 
+    public static ImageWrapper concat(ImageWrapper img1, Rect rect1, ImageWrapper img2, Rect rect2, int direction) {
+        if(!Arrays.asList(Gravity.LEFT, Gravity.RIGHT, Gravity.TOP, Gravity.BOTTOM).contains(direction)){
+            throw new IllegalArgumentException("unknown direction " + direction);
+        }
+        int width;
+        int height;
+        if (direction == Gravity.LEFT || direction == Gravity.TOP) {
+            ImageWrapper tmp = img1;
+            img1 = img2;
+            img2 = tmp;
+        }
+        if (direction == Gravity.LEFT || direction == Gravity.RIGHT) {
+            width = rect1.width + rect2.width;
+            height = Math.max(rect1.height, rect2.height);
+        } else {
+            width = Math.max(rect1.width, rect2.height);
+            height = rect1.height + rect2.height;
+        }
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        if (direction == Gravity.LEFT || direction == Gravity.RIGHT) {
+            canvas.drawBitmap(img1.getBitmap(), 0, (height - rect1.height) / 2, paint);
+            canvas.drawBitmap(img2.getBitmap(), rect1.width, (height - rect2.height) / 2, paint);
+        } else {
+            canvas.drawBitmap(img1.getBitmap(), (width - rect1.width) / 2, 0, paint);
+            canvas.drawBitmap(img2.getBitmap(), (width - rect2.width) / 2, rect1.height, paint);
+        }
+        return ImageWrapper.ofBitmap(bitmap);
+    }
+
+    public ImageWrapper rotate(ImageWrapper img, float x, float y, float degree) {
+        Matrix matrix = new Matrix();
+        matrix.postRotate(degree, x, y);
+        return ImageWrapper.ofBitmap(Bitmap.createBitmap(img.getBitmap(), 0, 0, img.getWidth(), img.getHeight(), matrix, true));
+    }
+
     public ImageWrapper clip(ImageWrapper img, int x, int y, int w, int h) {
         return ImageWrapper.ofBitmap(Bitmap.createBitmap(img.getBitmap(), x, y, w, h));
     }