diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java index e0612826..e706c51c 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java +++ b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java @@ -75,6 +75,7 @@ public class ImageWrapper { int rowPadding = plane.getRowStride() - pixelStride * image.getWidth(); Bitmap bitmap = Bitmap.createBitmap(image.getWidth() + rowPadding / pixelStride, image.getHeight(), Bitmap.Config.ARGB_8888); bitmap.copyPixelsFromBuffer(buffer); + bitmap = Bitmap.createBitmap(bitmap, 0, 0, image.getWidth(), image.getHeight()); return bitmap; } diff --git a/common/src/main/java/com/stardust/util/ScreenMetrics.java b/common/src/main/java/com/stardust/util/ScreenMetrics.java index a0227e3e..4014bd85 100644 --- a/common/src/main/java/com/stardust/util/ScreenMetrics.java +++ b/common/src/main/java/com/stardust/util/ScreenMetrics.java @@ -1,10 +1,13 @@ package com.stardust.util; import android.app.Activity; +import android.graphics.Point; import android.util.DisplayMetrics; import android.view.Display; import android.view.Surface; +import static java.lang.System.out; + /** * Created by Stardust on 2017/4/26. */ @@ -21,9 +24,13 @@ public class ScreenMetrics { if (!initialized) { DisplayMetrics metrics = new DisplayMetrics(); activity.getWindowManager().getDefaultDisplay().getMetrics(metrics); - deviceScreenHeight = metrics.heightPixels; - deviceScreenWidth = metrics.widthPixels; +// deviceScreenHeight = metrics.heightPixels; +// deviceScreenWidth = metrics.widthPixels; deviceScreenDensity = metrics.densityDpi; + Point size = new Point(); + activity.getWindowManager().getDefaultDisplay().getRealSize(size); + deviceScreenHeight = size.y; + deviceScreenWidth = size.x; display = activity.getWindowManager().getDefaultDisplay(); initialized = true; }