fix(android): call bridge destroy after destroy driver

Tencent · Aug 8, 2023 · 04debb2 · 04debb2
1 parent c227cb4
commit 04debb2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java
@@ -1038,7 +1038,6 @@ public void destroy(boolean isReload) {
             if (!isReload) {
                 mDomManager.destroy();
             }
-            mBridgeManager.destroy();
             mModuleManager.destroy();
             mVfsManager.destroy();
             onDestroyVfs(mVfsManager.getId());

diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java
@@ -213,6 +213,9 @@ public void Call(long result, Message message, String action, String reason) {
                 mCallFunctionCallback = null;
             }
         }, (msg.arg1 == DESTROY_RELOAD));
+        // When the driver is destroyed, the corresponding scope is also cleared, so there can
+        // be no more call function calls, destroy needs to be called here.
+        destroy();
     }
 
     @Override

diff --git a/framework/examples/android-demo/src/main/java/com/openhippy/example/HippyEngineHelper.kt b/framework/examples/android-demo/src/main/java/com/openhippy/example/HippyEngineHelper.kt
@@ -41,6 +41,10 @@ class HippyEngineHelper {
             hippyEngineList.remove(hippyEngineWrapper)
             abandonHippyEngineList.add(hippyEngineWrapper)
         }
+
+        fun clearAbandonHippyEngine() {
+            abandonHippyEngineList.clear()
+        }
     }
 
 }
diff --git a/framework/examples/android-demo/src/main/java/com/openhippy/example/MainActivity.kt b/framework/examples/android-demo/src/main/java/com/openhippy/example/MainActivity.kt
@@ -40,6 +40,11 @@ class MainActivity : AppCompatActivity() {
         setContentView(activityMainRoot)
     }
 
+    override fun onResume() {
+        super.onResume()
+        HippyEngineHelper.clearAbandonHippyEngine()
+    }
+
     private fun intPageMain() {
         val pageManagementButton = activityMainRoot.findViewById<View>(R.id.page_management_button)
         val pageManagementImage =

diff --git a/renderer/native/android/src/main/java/com/tencent/renderer/node/VirtualNodeManager.java b/renderer/native/android/src/main/java/com/tencent/renderer/node/VirtualNodeManager.java
@@ -43,6 +43,7 @@
 import com.tencent.renderer.utils.PropertyUtils;
 import com.tencent.renderer.utils.PropertyUtils.PropertyMethodHolder;
 
+import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -61,10 +62,10 @@ public class VirtualNodeManager {
      */
     private final Map<Integer, List<VirtualNode>> mUpdateNodes = new HashMap<>();
     @NonNull
-    private final NativeRender mNativeRenderer;
+    private final WeakReference<NativeRender> mNativeRendererRef;
 
     public VirtualNodeManager(@NonNull NativeRender nativeRenderer) {
-        mNativeRenderer = nativeRenderer;
+        mNativeRendererRef = new WeakReference<>(nativeRenderer);
     }
 
     /**
@@ -250,9 +251,11 @@ private void invokePropertyMethod(@NonNull VirtualNode node, @NonNull Map props,
                         PropertyUtils.convertProperty(methodHolder.paramTypes[0], value));
             }
         } catch (Exception exception) {
-            mNativeRenderer.handleRenderException(
-                    PropertyUtils
-                            .makePropertyConvertException(exception, key, methodHolder.method));
+            if (mNativeRendererRef.get() != null) {
+                mNativeRendererRef.get().handleRenderException(
+                        PropertyUtils
+                                .makePropertyConvertException(exception, key, methodHolder.method));
+            }
         }
     }
 
@@ -279,17 +282,21 @@ private void updateProps(@NonNull VirtualNode node, @Nullable Map<String, Object
     @Nullable
     private VirtualNode createVirtualNode(int rootId, int id, int pid, int index,
             @NonNull String className, @Nullable Map<String, Object> props) {
-        VirtualNode node = mNativeRenderer.createVirtualNode(rootId, id, pid, index, className,
+        NativeRender nativeRender = mNativeRendererRef.get();
+        if (nativeRender == null) {
+            return null;
+        }
+        VirtualNode node = nativeRender.createVirtualNode(rootId, id, pid, index, className,
                 props);
         VirtualNode parent = getVirtualNode(rootId, pid);
         // Only text、text child and text input need to create virtual node.
         if (className.equals(TEXT_CLASS_NAME)) {
             if (!(node instanceof TextVirtualNode)) {
-                node = new TextVirtualNode(rootId, id, pid, index, mNativeRenderer);
+                node = new TextVirtualNode(rootId, id, pid, index, nativeRender);
             }
         } else if (className.equals(IMAGE_CLASS_NAME) && parent != null) {
             if (!(node instanceof ImageVirtualNode)) {
-                node = new ImageVirtualNode(rootId, id, pid, index, mNativeRenderer);
+                node = new ImageVirtualNode(rootId, id, pid, index, nativeRender);
             }
         } else if (className.equals(TEXT_INPUT_CLASS_NAME)) {
             if (!(node instanceof TextInputVirtualNode)) {