From 463f87860ce8d8b8c401c80a0551d1d3d9ffa67d Mon Sep 17 00:00:00 2001
From: lulee007 <lulee007@live.com>
Date: Wed, 3 Jan 2018 14:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=B1=8F?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E4=B8=BA=E7=9C=9F=E5=AE=9E=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=88=AA=E5=9B=BE=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=E5=92=8C=E5=B1=8F=E5=B9=95=E5=B0=BA=E5=AF=B8=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/stardust/autojs/core/image/ImageWrapper.java  |  1 +
 .../main/java/com/stardust/util/ScreenMetrics.java    | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

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;
         }