You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/03/15 04:01:30 UTC
[2/7] incubator-weex git commit: *[android]WXValidateProcessor
modification, onModuleValidate add error msg.
*[android]WXValidateProcessor modification,onModuleValidate add error msg.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d00c55c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d00c55c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d00c55c2
Branch: refs/heads/0.11-dev
Commit: d00c55c274dda181fe0a69e6b7dd0cbd072ffc0a
Parents: d25c657
Author: \u7167\u70c8 <ju...@alibaba-inc.com>
Authored: Mon Mar 13 12:03:35 2017 +0800
Committer: \u7167\u70c8 <ju...@alibaba-inc.com>
Committed: Mon Mar 13 12:03:35 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/bridge/WXBridgeManager.java | 20 ++++++++++++--------
.../taobao/weex/bridge/WXValidateProcessor.java | 13 +++++++++++--
2 files changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d00c55c2/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 de296ff..8c6aa1c 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
@@ -409,14 +409,18 @@ public class WXBridgeManager implements Callback,BactchExecutor {
.getSDKInstance(instanceId);
if (wxsdkInstance.isNeedValidate()
&& WXSDKManager.getInstance().getValidateProcessor() != null) {
- boolean result = WXSDKManager.getInstance().getValidateProcessor()
- .onModuleValidate(wxsdkInstance, moduleStr, methodStr, args);
- if (result) {
- return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr,
- args);
- } else {
- return null;
- }
+ WXValidateProcessor.WXModuleValidateResult validateResult = WXSDKManager
+ .getInstance().getValidateProcessor()
+ .onModuleValidate(wxsdkInstance, moduleStr, methodStr, args);
+ if (validateResult == null) {
+ return null;
+ }
+ if (validateResult.isSuccess) {
+ return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr,
+ args);
+ } else {
+ return validateResult.validateInfo;
+ }
}
return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, args);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d00c55c2/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java
index 59b2908..f605f1a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java
@@ -205,6 +205,7 @@
package com.taobao.weex.bridge;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.taobao.weex.WXSDKInstance;
/**
@@ -212,8 +213,8 @@ import com.taobao.weex.WXSDKInstance;
*/
public interface WXValidateProcessor {
- boolean onModuleValidate(WXSDKInstance wxsdkInstance, String moduleStr,
- String methodStr, JSONArray params);
+ WXModuleValidateResult onModuleValidate(WXSDKInstance wxsdkInstance, String moduleStr,
+ String methodStr, JSONArray params);
WXComponentValidateResult onComponentValidate(WXSDKInstance wxsdkInstance,
String componentName);
@@ -227,4 +228,12 @@ public interface WXValidateProcessor {
public String replacedComponent;
}
+
+ class WXModuleValidateResult {
+
+ public boolean isSuccess;
+
+ public JSONObject validateInfo;
+
+ }
}