fix(android): add custom display metrics (#3965)

siguangli · siguangli2018 · open-hippy · siguangli2018 · commit ca405ecf3799 · 2024-11-04T10:45:08.000+08:00
Co-authored-by: maxli &lt;maxli@tencent.com&gt;
Co-authored-by: OpenHippy &lt;124017524+open-hippy@users.noreply.github.com&gt;
diff --git a/modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/DimensionsUtil.java b/modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/DimensionsUtil.java
@@ -173,7 +173,7 @@ public static HippyMap getDimensions(int ww, int wh, Context context) {
         if (context == null) {
             return null;
         }
-        DisplayMetrics windowDisplayMetrics = PixelUtil.getMetrics();
+        DisplayMetrics windowDisplayMetrics = PixelUtil.getCustomDisplayMetrics();
         if (windowDisplayMetrics == null) {
             windowDisplayMetrics = context.getResources().getDisplayMetrics();
         }
diff --git a/modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/PixelUtil.java b/modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/PixelUtil.java
@@ -21,12 +21,18 @@
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.WindowManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class PixelUtil {
 
     private static DisplayMetrics sDisplayMetrics = null;
+    private static DisplayMetrics sCustomDisplayMetrics = null;
 
     public static DisplayMetrics getMetrics() {
+        if (sCustomDisplayMetrics != null) {
+            return sCustomDisplayMetrics;
+        }
         if (sDisplayMetrics == null) {
             sDisplayMetrics = new DisplayMetrics();
             WindowManager windowManager = (WindowManager) ContextHolder.getAppContext()
@@ -37,12 +43,17 @@ public static DisplayMetrics getMetrics() {
         return sDisplayMetrics;
     }
 
+    @Nullable
+    public static DisplayMetrics getCustomDisplayMetrics() {
+        return sCustomDisplayMetrics;
+    }
+
     /**
      * Set display metrics, call by host app
      */
     @SuppressWarnings("unused")
-    public static void setDisplayMetrics(DisplayMetrics metrics) {
-        sDisplayMetrics = metrics;
+    public static void setDisplayMetrics(@NonNull DisplayMetrics metrics) {
+        sCustomDisplayMetrics = metrics;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static HippyMap getDimensions(int ww, int wh, Context context) {`
`173`	`173`	`if (context == null) {`
`174`	`174`	`return null;`
`175`	`175`	`}`
`176`		`- DisplayMetrics windowDisplayMetrics = PixelUtil.getMetrics();`
	`176`	`+ DisplayMetrics windowDisplayMetrics = PixelUtil.getCustomDisplayMetrics();`
`177`	`177`	`if (windowDisplayMetrics == null) {`
`178`	`178`	`windowDisplayMetrics = context.getResources().getDisplayMetrics();`
`179`	`179`	`}`