commit 1d857d3df7100f5fac3856668ad8e71672c870ed
author 东煜 <yayun.dyy@alibaba-inc.com> Thu Nov 14 16:08:12 2019 +0800
committer 东煜 <yayun.dyy@alibaba-inc.com> Thu Nov 14 16:27:43 2019 +0800
tree 2b286838dbef105c4d766cf25fc72c356bd5e2b1
parent b623198961ae5ba96c8253774da884c677caefef

Fix Poplayer multi Thread Native Crash

android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index cc3a8c8..a770415 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -2394,14 +2394,34 @@
   }
 
   public void OnVSync() {
-    boolean forceLayout = WXBridgeManager.getInstance().notifyLayout(getInstanceId());
-    if(forceLayout) {
+    boolean fixMultiThreadBug = false;
+
+    IWXConfigAdapter adapter = WXSDKManager.getInstance().getWxConfigAdapter();
+    if (adapter != null) {
+      String config = adapter.getConfig("android_weex_ext_config", "fixMultiThreadBug", "true");
+      fixMultiThreadBug = Boolean.parseBoolean(config);
+    }
+
+    if(fixMultiThreadBug) {
       WXBridgeManager.getInstance().post(new Runnable() {
         @Override
         public void run() {
-          WXBridgeManager.getInstance().forceLayout(getInstanceId());
+          boolean forceLayout = WXBridgeManager.getInstance().notifyLayout(getInstanceId());
+          if(forceLayout) {
+            WXBridgeManager.getInstance().forceLayout(getInstanceId());
+          }
         }
       });
+    } else  {
+      boolean forceLayout = WXBridgeManager.getInstance().notifyLayout(getInstanceId());
+      if(forceLayout) {
+        WXBridgeManager.getInstance().post(new Runnable() {
+          @Override
+          public void run() {
+            WXBridgeManager.getInstance().forceLayout(getInstanceId());
+          }
+        });
+      }
     }
   }
 

android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java

diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 72843a7..c4c7b2f 100755
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -3473,7 +3473,6 @@
    * @param instanceId
    * @return
    */
-  @UiThread
   public boolean notifyLayout(String instanceId) {
     if (isSkipFrameworkInit(instanceId) || isJSFrameworkInit()) {
       return mWXBridge.notifyLayout(instanceId);
@@ -3481,7 +3480,6 @@
     return false;
   }
 
-  @UiThread
   public void forceLayout(String instanceId) {
     if (isSkipFrameworkInit(instanceId) || isJSFrameworkInit()) {
       mWXBridge.forceLayout(instanceId);