Merge pull request #2946 from YorkShen/release/20190925

Merge Release/20190925 into master
apache · Oct 8, 2019 · 9cb3909 · 9cb3909
2 parents 51c8d12 + ac0c6b1
commit 9cb3909
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/android/sdk/src/main/java/org/apache/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXBridgeManager.java
@@ -190,6 +190,7 @@ public class WXBridgeManager implements Callback, BactchExecutor {
   static volatile WXBridgeManager mBridgeManager;
   private static long LOW_MEM_VALUE = 120;
   public volatile static int reInitCount = 1;
+  private volatile static int sInitFrameWorkCount = 0;
   private static String crashUrl = null;
   private static long lastCrashTime = 0;
 
@@ -909,6 +910,8 @@ public int callReportCrashReloadPage(String instanceId, String crashFile) {
          commitJscCrashAlarmMonitor(IWXUserTrackAdapter.JS_BRIDGE, WXErrorCode.WX_ERR_RELOAD_PAGE, "reboot jsc Engine", instanceId, url,extInfo);
       }
 
+      WXLogUtils.e("reInitCount:"+reInitCount);
+
       if (reInitCount > CRASHREINIT) {
         WXExceptionUtils.commitCriticalExceptionRT("jsEngine", WXErrorCode.WX_ERR_RELOAD_PAGE_EXCEED_LIMIT,
             "callReportCrashReloadPage","reInitCount:"+reInitCount,extInfo);
@@ -2172,6 +2175,8 @@ private void initFramework(String framework) {
 
           execRegisterFailTask();
           WXEnvironment.JsFrameworkInit = true;
+          sInitFrameWorkCount++;
+          WXLogUtils.e("initFrameWorkCount :"+ sInitFrameWorkCount);
           registerDomModule();
           trackComponentAndModulesTime();
         } else {

diff --git a/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp b/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp
@@ -388,10 +388,9 @@ int CoreSideInPlatform::RefreshInstance(
              }}
         }
     };
-
-    auto final_json_str = final_json.dump().c_str();
-    auto utf16_key = weex::base::to_utf16(const_cast<char*>(final_json_str),
-                                          strlen(final_json_str));
+    std::string out = final_json.dump();
+    auto utf16_key = weex::base::to_utf16(const_cast<char*>(out.c_str()),
+                                          out.length());
     args->value.string = genWeexString(
         reinterpret_cast<const uint16_t*>(utf16_key.c_str()), utf16_key.size());
     msg.push_back(args);