[Android] Update component data report (#2728)

apache · Jul 18, 2019 · f15b5f6 · f15b5f6
1 parent 70741c7
commit f15b5f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1698,13 +1698,13 @@ public void setBackgroundImage(@NonNull String bgImage) {
   }
   private boolean shouldCancelHardwareAccelerate() {
     IWXConfigAdapter adapter = WXSDKManager.getInstance().getWxConfigAdapter();
-    boolean cancel_hardware_accelerate = false;
+    boolean cancel_hardware_accelerate = true;
     if (adapter != null) {
       try {
         cancel_hardware_accelerate = Boolean.parseBoolean(adapter
                 .getConfig("android_weex_test_gpu",
                         "cancel_hardware_accelerate",
-                        "false"));
+                        "true"));
       }catch (Exception e){
         WXLogUtils.e(WXLogUtils.getStackTrace(e));
       }

diff --git a/weex_core/Source/android/jsengine/object/weex_global_object.cpp b/weex_core/Source/android/jsengine/object/weex_global_object.cpp
@@ -889,7 +889,10 @@ JSFUNCTION functionUpdateComponentData(ExecState *state) {
     auto page_id = getCharOrJSONStringFromState(state, 0);
     auto cid = getCharOrJSONStringFromState(state, 1);
     auto json_data = getCharOrJSONStringFromState(state, 2);
-
+    if (json_data == nullptr){
+        globalObject->js_bridge()->core_side()->ReportException(page_id.get(), "UpdateComponentData", "parse json failed");
+        return JSValue::encode(jsUndefined());
+    }
     globalObject->js_bridge()->core_side()->UpdateComponentData(page_id.get(), cid.get(), json_data.get());
     return JSValue::encode(jsUndefined());
 }
diff --git a/weex_core/Source/js_runtime/weex/binding/weex_binding_utils.cpp b/weex_core/Source/js_runtime/weex/binding/weex_binding_utils.cpp
@@ -183,6 +183,10 @@ namespace weex {
             WeexConversionUtils::GetStringFromArgsDefaultUndefined(vars, 1, cid);
             bool succeed = WeexConversionUtils::GetCharOrJsonFromArgs(vars, 2, json_data);
             const char *json_data_char = succeed ? json_data.c_str() : nullptr;
+            if(json_data_char == nullptr){
+                nativeObject->js_bridge()->core_side()->ReportException(page_id.c_str(),"updateComponentData","parse json failed");
+                return unicorn::RuntimeValues::MakeUndefined();
+            }
 
             LOG_WEEX_BINDING("WeexGlobalBinding method :__updateComponentData page:%s, cid:%s,json_data:%s",
                              page_id.c_str(), cid.c_str(), json_data_char