fix(android): modal crash when destroy root

siguangli2018 · siguangli2018 · commit b5e90020fac4 · 2025-02-14T11:36:45.000+08:00
diff --git a/renderer/native/android/src/main/java/com/tencent/mtt/hippy/views/modal/HippyModalHostManager.java b/renderer/native/android/src/main/java/com/tencent/mtt/hippy/views/modal/HippyModalHostManager.java
@@ -61,8 +61,7 @@ protected HippyModalHostView createModalHostView(Context context) {
     @Override
     public void onViewDestroy(HippyModalHostView hippyModalHostView) {
         super.onViewDestroy(hippyModalHostView);
-        int rootId = NativeRendererManager.getRootId(hippyModalHostView.getContext());
-        hippyModalHostView.onInstanceDestroy(rootId);
+        hippyModalHostView.onDestroy();
     }
 
     @HippyControllerProps(name = "animationType", defaultType = HippyControllerProps.STRING,
diff --git a/renderer/native/android/src/main/java/com/tencent/mtt/hippy/views/modal/HippyModalHostView.java b/renderer/native/android/src/main/java/com/tencent/mtt/hippy/views/modal/HippyModalHostView.java
@@ -110,6 +110,10 @@ public void onInstancePause() {
 
     @Override
     public void onInstanceDestroy(int rootId) {
+        dismiss();
+    }
+
+    public void onDestroy() {
         if (mNativeRenderer != null) {
             mNativeRenderer.removeInstanceLifecycleEventListener(this);
         }
diff --git a/renderer/native/android/src/main/java/com/tencent/renderer/NativeRenderer.java b/renderer/native/android/src/main/java/com/tencent/renderer/NativeRenderer.java
@@ -491,6 +491,7 @@ public void destroyRoot(int rootId) {
             for (HippyInstanceLifecycleEventListener listener : mInstanceLifecycleEventListeners) {
                 listener.onInstanceDestroy(rootId);
             }
+            mInstanceLifecycleEventListeners.clear();
         }
         ChoreographerUtils.unregisterDoFrameListener(getInstanceId(), rootId);
         mRenderManager.deleteNode(rootId, rootId);

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ protected HippyModalHostView createModalHostView(Context context) {`
`61`	`61`	`@Override`
`62`	`62`	`public void onViewDestroy(HippyModalHostView hippyModalHostView) {`
`63`	`63`	`super.onViewDestroy(hippyModalHostView);`
`64`		`- int rootId = NativeRendererManager.getRootId(hippyModalHostView.getContext());`
`65`		`- hippyModalHostView.onInstanceDestroy(rootId);`
	`64`	`+ hippyModalHostView.onDestroy();`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`@HippyControllerProps(name = "animationType", defaultType = HippyControllerProps.STRING,`
Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,7 @@ public void destroyRoot(int rootId) {`
`491`	`491`	`for (HippyInstanceLifecycleEventListener listener : mInstanceLifecycleEventListeners) {`
`492`	`492`	`listener.onInstanceDestroy(rootId);`
`493`	`493`	`}`
	`494`	`+ mInstanceLifecycleEventListeners.clear();`
`494`	`495`	`}`
`495`	`496`	`ChoreographerUtils.unregisterDoFrameListener(getInstanceId(), rootId);`
`496`	`497`	`mRenderManager.deleteNode(rootId, rootId);`