Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-native-0.16-dev
# Conflicts: # ios/playground/WeexDemo.xcodeproj/project.pbxproj # ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/51009919 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/51009919 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/51009919 Branch: refs/heads/0.16-dev Commit: 51009919269b7fecbe0da5adc832efbdcc1f5603 Parents: 6225ed1 a54bcb9 Author: é½å±± <sunjjb...@163.com> Authored: Thu Jul 27 12:21:01 2017 +0800 Committer: é½å±± <sunjjb...@163.com> Committed: Thu Jul 27 12:21:01 2017 +0800 ---------------------------------------------------------------------- README.md | 51 +- WeexSDK.podspec | 2 +- .../weex/extend/component/WXParallax.java | 4 +- .../java/com/taobao/weex/WXSDKInstance.java | 6 +- .../taobao/weex/dom/WXRecyclerDomObject.java | 4 + .../ui/component/list/BasicListComponent.java | 96 +-- .../taobao/weex/ui/component/list/WXCell.java | 10 - .../weex/ui/component/list/WXListComponent.java | 9 +- build/config.js | 1 + build/karma.vue.conf.js | 7 + dangerfile.js | 8 +- examples/vue/components/input.vue | 17 + html5/render/vue/modules/websocket/websocket.js | 1 + html5/render/vue/utils/event.js | 6 +- html5/render/vue/utils/func.js | 136 +++- html5/render/vue/utils/index.js | 104 --- html5/render/vue/utils/perf.js | 3 +- html5/test/render/vue/core/node.js | 15 +- .../render/vue/data/dotvue/event-bubble-bar.vue | 19 +- .../render/vue/data/dotvue/event-bubble.vue | 15 +- html5/test/render/vue/modules/animation.js | 61 ++ html5/test/render/vue/modules/dom.js | 109 ++++ html5/test/render/vue/modules/globalEvent.js | 45 ++ html5/test/render/vue/modules/navigator.js | 44 ++ html5/test/render/vue/modules/websocket.js | 90 +-- html5/test/render/vue/modules/webview.js | 53 ++ html5/test/render/vue/utils/component.js | 50 +- html5/test/render/vue/utils/event.js | 78 +++ html5/test/render/vue/utils/func.js | 278 +++++++- html5/test/render/vue/utils/lazyload.js | 106 +++ html5/test/render/vue/utils/perf.js | 132 ++++ html5/test/render/vue/utils/style.js | 157 ++++- html5/test/render/vue/utils/type.js | 49 ++ html5/test/render/vue/validator/index.js | 31 +- ios/playground/Podfile | 2 +- .../WeexDemo.xcodeproj/project.pbxproj | 4 + ios/playground/WeexDemo/WXDemoViewController.m | 2 +- ios/sdk/WeexSDK-Dynamic/Info.plist | 24 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 638 ++++++++++++++++++- .../xcschemes/WeexSDK-Dynamic.xcscheme | 80 +++ .../WeexSDK/Sources/Bridge/WXBridgeContext.h | 2 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 46 +- ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 33 +- ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h | 2 + ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 11 +- .../Component/Recycler/WXRecyclerComponent.h | 3 +- .../Component/Recycler/WXRecyclerComponent.m | 5 +- .../Recycler/WXSectionDataController.h | 2 + .../Sources/Component/WXCanvasComponent.h | 2 +- .../WeexSDK/Sources/Component/WXEditComponent.m | 2 +- .../Sources/Component/WXFooterComponent.h | 2 +- .../Sources/Component/WXHeaderComponent.h | 3 +- .../Sources/Component/WXImageComponent.m | 1 + .../WeexSDK/Sources/Component/WXListComponent.m | 4 +- .../Sources/Component/WXScrollerComponent.m | 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 1 + .../Sources/Controller/WXRootViewController.m | 1 + .../Sources/Display/WXComponent+BoxShadow.h | 4 - ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 1 + ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 2 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 10 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 + .../Sources/Manager/WXComponentManager.h | 3 + .../Sources/Manager/WXComponentManager.m | 19 +- .../WeexSDK/Sources/Manager/WXServiceFactory.h | 2 +- .../WeexSDK/Sources/Manager/WXTracingManager.h | 126 ++++ .../WeexSDK/Sources/Manager/WXTracingManager.m | 384 +++++++++++ ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 5 +- .../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 + .../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 9 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 7 +- ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 4 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 4 +- .../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 + .../Sources/Protocol/WXValidateProtocol.h | 4 +- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 8 + .../View/WXComponent+PseudoClassManagement.h | 4 +- .../Sources/View/WXComponent+ViewManagement.m | 3 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + ios/sdk/buildScripts.sh | 2 + pre-build/native-bundle-main.js | 12 +- 84 files changed, 2873 insertions(+), 435 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51009919/ios/playground/WeexDemo.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --cc ios/playground/WeexDemo.xcodeproj/project.pbxproj index b9695e7,2edc462..7cfcbd8 --- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj +++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj @@@ -30,7 -30,7 +30,8 @@@ 846FC8DB1E1B853600949E7D /* WXATViewHierarchyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = DCABAFF21D029685001C8592 /* WXATViewHierarchyPlugin.m */; }; 84D7CAC71CE3266C00D48D46 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7475ACA01CD8444A0044E96C /* libsqlite3.0.tbd */; }; 8A0B5EFFF75BF82EA481983D /* libPods-WeexUITestDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E48C20F443AA337D1FE97622 /* libPods-WeexUITestDemo.a */; }; + C47B78D21F299E27001D3B0C /* WXExtendCallNativeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = C47B78D11F299E27001D3B0C /* WXExtendCallNativeTest.m */; }; + C43CDA031F1C6E01005A6B03 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = C43CDA021F1C6E01005A6B03 /* libz.tbd */; }; DC20B8E61ECADA2500845F39 /* WXConfigCenterDefaultImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC20B8E51ECADA2500845F39 /* WXConfigCenterDefaultImpl.m */; }; DC5B53691E8CED9400E02125 /* WXScannerHistoryVC.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5B53681E8CED9400E02125 /* WXScannerHistoryVC.m */; }; DC5E503E1D0D97130059F0EB /* weex.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5E503C1D0D97130059F0EB /* weex.png */; }; @@@ -90,8 -90,7 +91,9 @@@ 775BEE9A1C1E8ECC008D1629 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 84361D751CA10F8E00F43825 /* WeexUITestDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WeexUITestDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9420131417A731ED089B0814 /* Pods-WeexDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WeexDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo.release.xcconfig"; sourceTree = "<group>"; }; + C47B78D01F299E27001D3B0C /* WXExtendCallNativeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXExtendCallNativeTest.h; sourceTree = "<group>"; }; + C47B78D11F299E27001D3B0C /* WXExtendCallNativeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXExtendCallNativeTest.m; sourceTree = "<group>"; }; + C43CDA021F1C6E01005A6B03 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; DC20B8E41ECADA2500845F39 /* WXConfigCenterDefaultImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXConfigCenterDefaultImpl.h; sourceTree = "<group>"; }; DC20B8E51ECADA2500845F39 /* WXConfigCenterDefaultImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXConfigCenterDefaultImpl.m; sourceTree = "<group>"; }; DC5B53671E8CED9400E02125 /* WXScannerHistoryVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXScannerHistoryVC.h; path = Scanner/WXScannerHistoryVC.h; sourceTree = "<group>"; }; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51009919/ios/sdk/WeexSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51009919/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m ---------------------------------------------------------------------- diff --cc ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m index bdcb874,13d8578..342dfed --- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m @@@ -34,7 -34,7 +34,8 @@@ #import "JSValue+Weex.h" #import "WXJSExceptionProtocol.h" #import "WXSDKManager.h" +#import "WXExtendCallNativeManager.h" + #import "WXTracingManager.h" #import <dlfcn.h>