From 2916eca378bbed1e73f2c751606e6379f40ee089 Mon Sep 17 00:00:00 2001
From: TonyJiangWJ <tonyjiangwj@gmail.com>
Date: Tue, 7 Dec 2021 22:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddevice.width=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autojs/src/main/java/com/stardust/autojs/AutoJs.java        | 1 +
 .../main/java/com/stardust/autojs/runtime/api/Device.java   | 6 ++++--
 common/src/main/java/com/stardust/util/ScreenMetrics.java   | 6 +-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/autojs/src/main/java/com/stardust/autojs/AutoJs.java b/autojs/src/main/java/com/stardust/autojs/AutoJs.java
index 5613c9f5..7bd1b107 100644
--- a/autojs/src/main/java/com/stardust/autojs/AutoJs.java
+++ b/autojs/src/main/java/com/stardust/autojs/AutoJs.java
@@ -159,6 +159,7 @@ public abstract class AutoJs {
 
             @Override
             public void onActivityResumed(Activity activity) {
+                ScreenMetrics.initIfNeeded(activity);
                 mAppUtils.setCurrentActivity(activity);
             }
         });
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java
index bf2608f4..22df12d9 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java
@@ -38,9 +38,9 @@ import ezy.assist.compat.SettingsCompat;
 
 public class Device {
 
-    public static final int width = ScreenMetrics.getDeviceScreenWidth();
+    public static int width = ScreenMetrics.getDeviceScreenWidth();
 
-    public static final int height = ScreenMetrics.getDeviceScreenHeight();
+    public static int height = ScreenMetrics.getDeviceScreenHeight();
 
     public static final String buildId = Build.ID;
 
@@ -93,6 +93,8 @@ public class Device {
 
     public Device(Context context) {
         mContext = context;
+        width = ScreenMetrics.getDeviceScreenWidth();
+        height = ScreenMetrics.getDeviceScreenHeight();
     }
 
     @SuppressLint("HardwareIds")
diff --git a/common/src/main/java/com/stardust/util/ScreenMetrics.java b/common/src/main/java/com/stardust/util/ScreenMetrics.java
index 9072a80b..aa46f796 100644
--- a/common/src/main/java/com/stardust/util/ScreenMetrics.java
+++ b/common/src/main/java/com/stardust/util/ScreenMetrics.java
@@ -2,12 +2,8 @@ package com.stardust.util;
 
 import android.app.Activity;
 import android.content.res.Configuration;
-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.
@@ -22,7 +18,7 @@ public class ScreenMetrics {
     private static Display display;
 
     public static void initIfNeeded(Activity activity) {
-        if (initialized)
+        if (initialized && deviceScreenHeight != 0)
             return;
         DisplayMetrics metrics = new DisplayMetrics();
         activity.getWindowManager().getDefaultDisplay().getRealMetrics(metrics);