新增设置截图横竖屏方法

qiushui95 · Dec 15, 2023 · fd7f4d9 · fd7f4d9
1 parent bbb2589
commit fd7f4d9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/autojs/src/main/assets/modules/__images__.js b/autojs/src/main/assets/modules/__images__.js
@@ -101,7 +101,7 @@ module.exports = function (runtime, scope) {
     function images() {
     }
     if (android.os.Build.VERSION.SDK_INT >= 21) {
-        util.__assignFunctions__(runtime.images, images, ['captureScreen', 'read', 'copy', 'load', 'clip', 'pixel'])
+        util.__assignFunctions__(runtime.images, images, ['captureScreen','setPortrait','setLandscape', 'read', 'copy', 'load', 'clip', 'pixel'])
     }
     images.opencvImporter = JavaImporter(
         org.opencv.core.Point,

diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java
@@ -101,6 +101,12 @@ public void setOrientation(int orientation) {
         mOrientation = orientation;
         mDetectedOrientation = mContext.getResources().getConfiguration().orientation;
         refreshVirtualDisplay(mOrientation == ORIENTATION_AUTO ? mDetectedOrientation : mOrientation);
+
+        Image oldImage = mCachedImage.getAndSet(mImageReader.acquireNextImage());
+
+        if (oldImage != null) {
+            oldImage.close();
+        }
     }
 
 

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
@@ -99,6 +99,12 @@ public ScriptPromiseAdapter requestScreenCapture(int orientation) {
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public synchronized ImageWrapper captureScreen() {
+        try {
+            throw new RuntimeException();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
         ScriptRuntime.requiresApi(21);
         if (mScreenCapturer == null) {
             throw new SecurityException("No screen capture permission");
@@ -126,6 +132,23 @@ public boolean captureScreen(String path) {
         return false;
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public void setPortrait() {
+
+        if (mScreenCapturer == null) return;
+
+        mScreenCapturer.setOrientation(ScreenCapturer.ORIENTATION_PORTRAIT);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public void setLandscape() {
+
+        if (mScreenCapturer == null) return;
+
+        mScreenCapturer.setOrientation(ScreenCapturer.ORIENTATION_LANDSCAPE);
+
+    }
+
     public ImageWrapper copy(ImageWrapper image) {
         return image.clone();
     }
@@ -140,7 +163,7 @@ public boolean save(ImageWrapper image, String path, String format, int quality)
             boolean compress = bitmap.compress(compressFormat, quality, outputStream);
             outputStream.flush();
             return compress;
-        }finally {
+        } finally {
             outputStream.close();
         }
     }