[Android] fix ConcurrentModificationException for analyzerList && pri…

…nt error log when exception (#2647)
apache · Jul 3, 2019 · 45da9ef · 45da9ef
1 parent 4695a70
commit 45da9ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -1652,6 +1652,7 @@ public void onChangeElement(WXComponent component, boolean isOutOfScreen) {
 
   public void onRenderError(final String errCode, final String msg) {
     if (mRenderListener != null && mContext != null) {
+      WXLogUtils.e("onRenderError "+errCode +","+msg);
       runOnUiThread(new Runnable() {
 
         @Override
@@ -1667,6 +1668,7 @@ public void run() {
   public void onJSException(final String errCode, final String function, final String exception) {
     hasException = true;
     if (mRenderListener != null && mContext != null) {
+      WXLogUtils.e("onJSException "+errCode +","+exception);
       runOnUiThread(new Runnable() {
 
         @Override

diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXAnalyzerDataTransfer.java b/android/sdk/src/main/java/com/taobao/weex/performance/WXAnalyzerDataTransfer.java
@@ -16,6 +16,7 @@
  */
 package com.taobao.weex.performance;
 
+import java.util.Iterator;
 import java.util.List;
 
 import android.util.Log;
@@ -71,8 +72,10 @@ public static void transferPerformance(String instanceId,String type,String key,
         return;
       }
 
-      for (IWXAnalyzer transfer : transferList) {
-          transfer.transfer(MODULE_WX_APM, instance.getInstanceId(), type, data);
+      Iterator<IWXAnalyzer> itr = transferList.iterator();
+      while (itr.hasNext()){
+          IWXAnalyzer item = itr.next();
+          item.transfer(MODULE_WX_APM, instance.getInstanceId(), type, data);
       }
   }
 

diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java b/android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java
@@ -47,7 +47,7 @@ public static WXStateRecord getInstance() {
 
     private WXStateRecord() {
         mExceptionHistory = new RecordList<>(5);
-        mActionHistory = new RecordList<>(10);
+        mActionHistory = new RecordList<>(20);
         mJsfmInitHistory = new RecordList<>(3);
         mJscCrashHistory = new RecordList<>(3);
         mJscReloadHistory = new RecordList<>(5);

diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
@@ -109,6 +109,7 @@ public static void commitCriticalExceptionRT(@Nullable final String instanceId,
 												 @Nullable final Map<String,String> extParams ) {
 
         try {
+            WXLogUtils.e("weex","commitCriticalExceptionRT :"+errCode+"exception"+exception);
             WXStateRecord.getInstance().recordException(instanceId,exception);
             IWXConfigAdapter configAdapter = WXSDKManager.getInstance().getWxConfigAdapter();
             boolean doCheck = true;