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

Co-authored-by: maxli <maxli@tencent.com> Co-authored-by: OpenHippy <124017524+open-hippy@users.noreply.github.com>
siguangli · Aug 6, 2024 · 0fe0be4 · 0fe0be4
1 parent 7ca089c
commit 0fe0be4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
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;
     }
 
     /**