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:29 UTC

[1/7] incubator-weex git commit: Merge pull request #1 from apache/0.11-dev

Repository: incubator-weex
Updated Branches:
  refs/heads/0.11-dev 5523afc48 -> 2e769fa8b


Merge pull request #1 from apache/0.11-dev

0.11 dev

Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d25c6576
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d25c6576
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d25c6576

Branch: refs/heads/0.11-dev
Commit: d25c657667996cf44bb6d9a15fce24cfe10b711e
Parents: fa1c8b0 5484be3
Author: \u7167\u70c8 <16...@users.noreply.github.com>
Authored: Mon Mar 13 11:36:55 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Mar 13 11:36:55 2017 +0800

----------------------------------------------------------------------
 Dangerfile                                      |  34 +-
 Dangerfile-ios                                  |   4 +
 android/sdk/assets/main.js                      |  14 +-
 android/sdk/build.gradle                        |  21 +-
 android/sdk/libs/armeabi/libweexv8.so           | Bin 3583820 -> 3583820 bytes
 android/sdk/libs/x86/libweexv8.so               | Bin 4340864 -> 4340864 bytes
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   9 +-
 .../java/com/taobao/weex/WXSDKInstance.java     |  19 +-
 .../main/java/com/taobao/weex/WXSDKManager.java |  11 +
 .../com/taobao/weex/bridge/WXBridgeManager.java |  72 ++-
 .../taobao/weex/bridge/WXValidateProcessor.java | 230 ++++++++
 .../java/com/taobao/weex/common/Constants.java  |  14 +-
 .../java/com/taobao/weex/common/WXThread.java   |   9 +
 .../com/taobao/weex/dom/ImmutableDomObject.java |  18 +-
 .../main/java/com/taobao/weex/dom/WXAttr.java   |  96 ++-
 .../java/com/taobao/weex/dom/WXDomHandler.java  |   2 +-
 .../java/com/taobao/weex/dom/WXDomModule.java   |  18 +-
 .../java/com/taobao/weex/dom/WXDomObject.java   |  21 +
 .../taobao/weex/dom/WXRecyclerDomObject.java    | 317 ++++++++++
 .../main/java/com/taobao/weex/dom/WXStyle.java  |  40 +-
 .../java/com/taobao/weex/dom/flex/CSSNode.java  |   8 +-
 .../com/taobao/weex/ui/WXRenderStatement.java   |  14 +-
 .../weex/ui/animation/WXAnimationModule.java    |  16 +-
 .../ui/component/AbstractEditComponent.java     |  18 +-
 .../taobao/weex/ui/component/WXBaseRefresh.java |  10 -
 .../weex/ui/component/WXBasicComponentType.java |   2 +
 .../taobao/weex/ui/component/WXComponent.java   |  29 +-
 .../com/taobao/weex/ui/component/WXEmbed.java   |   3 +
 .../com/taobao/weex/ui/component/WXHeader.java  |   4 +-
 .../com/taobao/weex/ui/component/WXImage.java   |  29 +-
 .../com/taobao/weex/ui/component/WXLoading.java |   7 +-
 .../taobao/weex/ui/component/WXScroller.java    |  20 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |  20 +-
 .../taobao/weex/ui/component/WXVContainer.java  |  14 +
 .../ui/component/helper/WXStickyHelper.java     |  11 +-
 .../ui/component/list/BasicListComponent.java   | 100 ++--
 .../ui/component/list/ListComponentView.java    |   4 +-
 .../ui/component/list/SimpleListComponent.java  |   6 +-
 .../ui/component/list/SimpleRecyclerView.java   |   5 +
 .../weex/ui/component/list/WXListComponent.java |  91 ++-
 .../com/taobao/weex/ui/module/WXMetaModule.java |   4 +-
 .../com/taobao/weex/ui/view/WXImageView.java    |  20 +-
 .../com/taobao/weex/ui/view/WXScrollView.java   |   4 +-
 .../weex/ui/view/border/BorderDrawable.java     |   1 -
 .../taobao/weex/ui/view/border/BorderEdge.java  |  71 ++-
 .../listview/ExtendedLinearLayoutManager.java   |  25 +
 .../weex/ui/view/listview/WXRecyclerView.java   |  43 +-
 .../listview/adapter/ListBaseViewHolder.java    |  42 +-
 .../adapter/RecyclerViewBaseAdapter.java        |  21 +-
 .../adapter/WXRecyclerViewOnScrollListener.java |  99 ++--
 .../ui/view/refresh/wrapper/BaseBounceView.java |  74 +--
 .../refresh/wrapper/BounceRecyclerView.java     |  32 +-
 .../refresh/wrapper/BounceScrollerView.java     |   1 +
 .../taobao/weex/utils/WXSoInstallMgrSdk.java    |   9 +-
 .../java/com/taobao/weex/utils/WXViewUtils.java |  14 +-
 .../test/java/com/taobao/weex/TestActivity.java |   6 +-
 examples/module/websocket-demo.we               | 222 +++----
 examples/vue/components/waterfall.vue           | 459 +++++++++++++++
 examples/vue/index.vue                          |   1 +
 ios/playground/Podfile                          |   2 +-
 ios/playground/WeexDemo/DemoDefine.h            |   2 +-
 ios/playground/WeexDemo/Info.plist              |   2 +-
 ios/playground/WeexDemo/UIView+UIThreadCheck.m  |   2 +-
 ios/playground/WeexDemo/WXDemoViewController.m  |   9 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |  91 ++-
 ios/sdk/WeexSDK/Resources/main.js               |  14 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m |   2 +
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |  26 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m |  15 +
 .../Component/Recycler/WXMultiColumnLayout.h    |  42 ++
 .../Component/Recycler/WXMultiColumnLayout.m    | 388 ++++++++++++
 .../Component/Recycler/WXRecyclerComponent.h    |  12 +
 .../Component/Recycler/WXRecyclerComponent.m    | 584 +++++++++++++++++++
 .../Recycler/WXRecyclerDataController.h         |  34 ++
 .../Recycler/WXRecyclerDataController.m         | 114 ++++
 .../Recycler/WXRecyclerUpdateController.h       |  32 +
 .../Recycler/WXRecyclerUpdateController.m       | 247 ++++++++
 .../Recycler/WXSectionDataController.h          |  33 ++
 .../Recycler/WXSectionDataController.m          |  81 +++
 .../WeexSDK/Sources/Component/WXCellComponent.h |  22 +-
 .../WeexSDK/Sources/Component/WXCellComponent.m |  27 +-
 .../Component/WXComponent+GradientColor.h       |  15 +-
 .../Component/WXComponent+GradientColor.m       |  15 +-
 .../WeexSDK/Sources/Component/WXEditComponent.h |   2 +-
 .../WeexSDK/Sources/Component/WXEditComponent.m |  19 +
 .../Sources/Component/WXFooterComponent.h       |  13 +
 .../Sources/Component/WXFooterComponent.m       |  13 +
 .../Sources/Component/WXHeaderComponent.h       |  28 +
 .../Sources/Component/WXHeaderComponent.m       |  76 +++
 .../Sources/Component/WXImageComponent.m        |   1 +
 .../WeexSDK/Sources/Component/WXListComponent.h |  12 -
 .../WeexSDK/Sources/Component/WXListComponent.m | 318 ++++++----
 .../Sources/Component/WXLoadingComponent.m      |  13 -
 .../Sources/Component/WXRefreshComponent.m      |  14 +-
 .../Sources/Component/WXScrollerComponent.m     |  17 +-
 .../Sources/Component/WXSliderComponent.m       |  12 +-
 .../Component/WXSliderNeighborComponent.m       |   3 +-
 .../Sources/Component/WXTextAreaComponent.m     |  49 ++
 .../Sources/Component/WXTextInputComponent.h    |   2 +-
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m |  18 +-
 .../WeexSDK/Sources/Component/WXWebComponent.m  |   2 +-
 .../Sources/Display/WXComponent+BoxShadow.h     |   5 +-
 .../Sources/Display/WXComponent+BoxShadow.m     |  22 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m    |   2 +
 .../WeexSDK/Sources/Events/WXComponent+Events.m |   4 +
 ios/sdk/WeexSDK/Sources/Layout/Layout.c         |   3 +
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |  10 +-
 .../Sources/Manager/WXComponentManager.m        |  14 +-
 ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m |   5 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |   4 +-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h   |  11 +-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |   9 +-
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  18 +-
 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m   |   4 +-
 .../WeexSDK/Sources/Module/WXStorageModule.m    |   2 +-
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 236 +++++---
 .../WeexSDK/Sources/Module/WXWebSocketModule.m  |   4 +-
 .../WXResourceRequestHandlerDefaultImpl.m       |   7 +-
 .../Sources/Protocol/WXJSExceptionProtocol.h    |  21 +
 .../Sources/Protocol/WXValidateProtocol.h       |  39 ++
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.h     |   4 +-
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m     |  83 ++-
 ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h    |  38 ++
 ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m    | 186 ++++++
 ios/sdk/WeexSDK/Sources/Utility/WXLength.h      |  13 +-
 ios/sdk/WeexSDK/Sources/Utility/WXLength.m      |  45 +-
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m     |   3 +-
 .../Sources/View/WXComponent+ViewManagement.m   |   6 +-
 ios/sdk/WeexSDK/Sources/WeexSDK.h               |   1 +
 ios/sdk/WeexSDKTests/WXStorageTests.m           |   9 -
 package.json                                    |   4 +-
 test/README.md                                  |   3 +-
 test/ci-funcs.sh                                |   4 +-
 test/pages/components/scroller-fixed.we         |  62 ++
 test/pages/image-onload.we                      |  19 +
 test/scripts/components/image-onload.test.js    |  39 ++
 test/scripts/components/scroller-fixed.test.js  |  39 ++
 137 files changed, 5050 insertions(+), 859 deletions(-)
----------------------------------------------------------------------



[4/7] incubator-weex git commit: *[android] validate module add log.

Posted by zs...@apache.org.
*[android] validate module add log.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d54728f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d54728f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d54728f5

Branch: refs/heads/0.11-dev
Commit: d54728f570855b2b7d7673ef434cf717fa5ad25a
Parents: 48359a5
Author: \u7167\u70c8 <ju...@alibaba-inc.com>
Authored: Tue Mar 14 11:38:11 2017 +0800
Committer: \u7167\u70c8 <ju...@alibaba-inc.com>
Committed: Tue Mar 14 11:38:11 2017 +0800

----------------------------------------------------------------------
 .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d54728f5/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 8c6aa1c..99b0d51 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
@@ -419,7 +419,9 @@ public class WXBridgeManager implements Callback,BactchExecutor {
               return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr,
                       args);
           } else {
-              return validateResult.validateInfo;
+              JSONObject validateInfo = validateResult.validateInfo;
+              WXLogUtils.e("[WXBridgeManager] module validate fail. >>> " + validateInfo.toJSONString());
+              return validateInfo;
           }
       }
       return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, args);


[2/7] incubator-weex git commit: *[android]WXValidateProcessor modification, onModuleValidate add error msg.

Posted by zs...@apache.org.
*[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;
+
+    }
 }


[6/7] incubator-weex git commit: Merge branch '0.11-dev' of https://github.com/168668660/incubator-weex into 0.11-dev

Posted by zs...@apache.org.
Merge branch '0.11-dev' of https://github.com/168668660/incubator-weex into 0.11-dev

* '0.11-dev' of https://github.com/168668660/incubator-weex:
  *[android] validate module add log.
  *[android]WXValidateProcessor modification,onComponentValidate add error log.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/937d8bea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/937d8bea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/937d8bea

Branch: refs/heads/0.11-dev
Commit: 937d8beae047cec02ac3b83531836033bf934423
Parents: 2d3c75e d54728f
Author: \u516e\u74dc <xi...@alibaba-inc.com>
Authored: Tue Mar 14 12:10:01 2017 +0800
Committer: \u516e\u74dc <xi...@alibaba-inc.com>
Committed: Tue Mar 14 12:10:01 2017 +0800

----------------------------------------------------------------------
 .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java    | 4 +++-
 .../main/java/com/taobao/weex/bridge/WXValidateProcessor.java    | 2 ++
 android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java   | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[3/7] incubator-weex git commit: *[android]WXValidateProcessor modification, onComponentValidate add error log.

Posted by zs...@apache.org.
*[android]WXValidateProcessor modification,onComponentValidate add error log.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/48359a56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/48359a56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/48359a56

Branch: refs/heads/0.11-dev
Commit: 48359a563d916737c39d07c76532522d5b07dd0a
Parents: d00c55c
Author: \u7167\u70c8 <ju...@alibaba-inc.com>
Authored: Mon Mar 13 17:09:20 2017 +0800
Committer: \u7167\u70c8 <ju...@alibaba-inc.com>
Committed: Mon Mar 13 17:09:20 2017 +0800

----------------------------------------------------------------------
 .../main/java/com/taobao/weex/bridge/WXValidateProcessor.java    | 2 ++
 android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java   | 4 ++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/48359a56/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 f605f1a..0e4f396 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
@@ -227,6 +227,8 @@ public interface WXValidateProcessor {
 
         public String replacedComponent;
 
+        public JSONObject validateInfo;
+
     }
 
     class WXModuleValidateResult {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/48359a56/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index d622aac..798687b 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -829,6 +829,10 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
             type = TextUtils.isEmpty(result.replacedComponent) ? WXBasicComponentType.DIV
                     : result.replacedComponent;
             json.put(TYPE, type);
+            if(WXEnvironment.isApkDebugable()&&result.validateInfo!=null){
+              String tag = "[WXDomObject]onComponentValidate failure. >>> "+result.validateInfo.toJSONString();
+              WXLogUtils.e(tag);
+            }
           }
         }
       }


[5/7] incubator-weex git commit: + [ios] add debug support for validation

Posted by zs...@apache.org.
+ [ios] add debug support for validation


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2d3c75eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2d3c75eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2d3c75eb

Branch: refs/heads/0.11-dev
Commit: 2d3c75eb685192f8ebb22a2063e65a01698976e2
Parents: d00c55c
Author: \u516e\u74dc <xi...@alibaba-inc.com>
Authored: Tue Mar 14 12:09:55 2017 +0800
Committer: \u516e\u74dc <xi...@alibaba-inc.com>
Committed: Tue Mar 14 12:09:55 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m      | 15 +++++++++++----
 ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2d3c75eb/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m b/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m
index 4e0d6ae..ccb0bc4 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m
@@ -36,11 +36,18 @@
     if (self.instance.needValidate) {
         id<WXValidateProtocol> validateHandler = [WXHandlerFactory handlerForProtocol:@protocol(WXValidateProtocol)];
         if (validateHandler) {
-            BOOL result =  [validateHandler validateWithWXSDKInstance:self.instance module:self.moduleName method:self.methodName args:self.arguments];
-            if (!result) {
-                NSString *errorMessage = [NSString stringWithFormat:@"Invalid module\uff1a%@ method: %@ , please check the authority", self.moduleName,self.methodName];
+            WXModuleValidateResult* result =  [validateHandler validateWithWXSDKInstance:self.instance module:self.moduleName method:self.methodName args:self.arguments];
+            if (result && !result.isSuccess) {
+                NSString *errorMessage = [result.error.userInfo  objectForKey:@"errorMsg"];
+                WXLogError(@"%@", errorMessage);
                 WX_MONITOR_FAIL(WXMTJSBridge, WX_ERR_INVOKE_NATIVE, errorMessage);
-                return nil;
+                if ([result.error respondsToSelector:@selector(userInfo)]) {
+                    NSInvocation *invocation = [self invocationWithTarget:result.error selector:@selector(userInfo)];
+                    [invocation invoke];
+                    return invocation;
+                }else{
+                    return nil;
+                }
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2d3c75eb/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
index 850c7e5..f08c985 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -327,6 +327,7 @@ static css_node_t * rootNodeGetChild(void *context, int i)
             WXComponentValidateResult* validateResult =  [validateHandler validateWithWXSDKInstance:self.weexInstance component:type];
             if (validateResult && !validateResult.isSuccess) {
                 type = validateResult.replacedComponent? validateResult.replacedComponent : @"div";
+                WXLogError(@"%@",[validateResult.error.userInfo objectForKey:@"errorMsg"]);
             }
         }
     }


[7/7] incubator-weex git commit: Merge branch '0.11-dev' of https://github.com/168668660/incubator-weex into 0.11-dev

Posted by zs...@apache.org.
Merge branch '0.11-dev' of https://github.com/168668660/incubator-weex into 0.11-dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2e769fa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2e769fa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2e769fa8

Branch: refs/heads/0.11-dev
Commit: 2e769fa8b017f6a5e2da76eaaec0e207d18d2901
Parents: 5523afc 937d8be
Author: zshshr <zh...@gmail.com>
Authored: Wed Mar 15 12:00:56 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Mar 15 12:00:56 2017 +0800

----------------------------------------------------------------------
 .../com/taobao/weex/bridge/WXBridgeManager.java | 22 +++++++++++++-------
 .../taobao/weex/bridge/WXValidateProcessor.java | 15 +++++++++++--
 .../java/com/taobao/weex/dom/WXDomObject.java   |  4 ++++
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 15 +++++++++----
 .../Sources/Manager/WXComponentManager.m        |  1 +
 5 files changed, 43 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2e769fa8/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------