You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2019/07/18 09:17:36 UTC
[incubator-weex] branch master updated: [Android] Update component
data report (#2728)
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new f15b5f6 [Android] Update component data report (#2728)
f15b5f6 is described below
commit f15b5f66c9e6f193f1e44150b9ca1898e4f4debf
Author: katherine95s <51...@users.noreply.github.com>
AuthorDate: Thu Jul 18 17:17:31 2019 +0800
[Android] Update component data report (#2728)
---
.../sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java | 4 ++--
weex_core/Source/android/jsengine/object/weex_global_object.cpp | 5 ++++-
weex_core/Source/js_runtime/weex/binding/weex_binding_utils.cpp | 4 ++++
3 files changed, 10 insertions(+), 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
index bcfa4a2..57bbd5c 100644
--- 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 abstract class WXComponent<T extends View> extends WXBasicComponent imple
}
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
index 436805c..4f3bbbd 100644
--- 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
index 5094637..6f6d714 100644
--- 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