fix(android): onGlobalLayout use root view size (Tencent#3982)

Co-authored-by: maxli <[email protected]>
siguangli · Aug 6, 2024 · ef47810 · ef47810
1 parent 0fe0be4
commit ef47810
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/TimeMonitor.java b/modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/TimeMonitor.java
@@ -157,9 +157,9 @@ void end() {
 
         void print() {
             if (mMonitorPoints != null) {
-                LogUtils.i(TAG, "group " + name + ", totalTime " + totalTime + "ms");
+                LogUtils.e(TAG, "group " + name + ", totalTime " + totalTime + "ms");
                 for (MonitorPoint monitorPoint : mMonitorPoints) {
-                    LogUtils.i(TAG,
+                    LogUtils.e(TAG,
                             monitorPoint.key + ": " + (monitorPoint.endTime - monitorPoint.startTime)
                                     + "ms");
                 }

diff --git a/renderer/native/android/src/main/java/com/tencent/mtt/hippy/HippyRootView.java b/renderer/native/android/src/main/java/com/tencent/mtt/hippy/HippyRootView.java
@@ -34,6 +34,7 @@
 import com.tencent.renderer.NativeRenderContext;
 import com.tencent.renderer.NativeRendererManager;
 
+import java.lang.ref.WeakReference;
 import java.util.Map;
 
 import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
@@ -116,14 +117,19 @@ protected void onDetachedFromWindow() {
 
     private GlobalLayoutListener getGlobalLayoutListener() {
         if (mGlobalLayoutListener == null) {
-            mGlobalLayoutListener = new GlobalLayoutListener();
+            mGlobalLayoutListener = new GlobalLayoutListener(this);
         }
         return mGlobalLayoutListener;
     }
 
     private class GlobalLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener {
 
         private int mOrientation = ORIENTATION_UNDEFINED;
+        private final WeakReference<View> mRootViewRef;
+
+        GlobalLayoutListener(View rootView) {
+            mRootViewRef = new WeakReference<>(rootView);
+        }
 
         @Override
         public void onGlobalLayout() {
@@ -137,7 +143,10 @@ public void onGlobalLayout() {
                 sendOrientationChangeEvent(mOrientation);
                 NativeRender nativeRenderer = NativeRendererManager.getNativeRenderer(context);
                 if (nativeRenderer != null) {
-                    nativeRenderer.updateDimension(-1, -1);
+                    View rootView = mRootViewRef.get();
+                    int width = (rootView != null) ? rootView.getWidth() : -1;
+                    int height = (rootView != null) ? rootView.getHeight() : -1;
+                    nativeRenderer.updateDimension(width, height);
                 }
             }
         }