Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-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/2398a750 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2398a750 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2398a750 Branch: refs/heads/0.16-dev Commit: 2398a7502952288379c18ffec450d52ebfe1f285 Parents: 7be6c54 e52d273 Author: acton393 <[email protected]> Authored: Mon Sep 18 22:37:55 2017 +0800 Committer: acton393 <[email protected]> Committed: Mon Sep 18 22:37:55 2017 +0800 ---------------------------------------------------------------------- android/build.gradle | 13 +- android/gradle.properties | 5 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/jacoco.gradle | 43 ++++++ .../alibaba/weex/benchmark/BenchmarkTest.java | 29 ++-- .../playground/app/src/main/AndroidManifest.xml | 8 + .../alibaba/weex/util/CoverageDataDumper.java | 36 +++++ .../alibaba/weex/util/JacocoCodeCoverage.java | 93 ++++++++++++ android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754016 bytes .../java/com/taobao/weex/WXEnvironment.java | 16 ++ .../java/com/taobao/weex/WXSDKInstance.java | 110 ++++++++------ .../weex/appfram/pickers/DatePickerImpl.java | 3 +- .../appfram/websocket/WebSocketCloseCodes.java | 2 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 48 +++++- .../java/com/taobao/weex/bridge/WXParams.java | 9 ++ .../java/com/taobao/weex/common/Constants.java | 2 + .../java/com/taobao/weex/common/WXConfig.java | 1 + .../com/taobao/weex/dom/ImmutableDomObject.java | 21 ++- .../main/java/com/taobao/weex/dom/WXStyle.java | 17 --- .../com/taobao/weex/dom/action/Actions.java | 4 +- .../weex/dom/action/ReloadPageAction.java | 6 +- .../taobao/weex/ui/component/WXComponent.java | 143 +++++++++++++----- .../com/taobao/weex/ui/component/WXDiv.java | 74 +++++++++- .../com/taobao/weex/ui/component/WXSlider.java | 4 +- .../com/taobao/weex/ui/component/WXText.java | 65 +++++---- .../taobao/weex/ui/component/WXVContainer.java | 44 ++++-- .../taobao/weex/ui/component/list/WXCell.java | 63 +++++++- .../weex/ui/component/list/WXListComponent.java | 90 ++++++------ .../com/taobao/weex/ui/flat/FlatComponent.java | 33 +++++ .../com/taobao/weex/ui/flat/FlatGUIContext.java | 146 +++++++++++++++++++ .../taobao/weex/ui/flat/WidgetContainer.java | 93 ++++++++++++ .../weex/ui/flat/widget/AndroidViewWidget.java | 76 ++++++++++ .../taobao/weex/ui/flat/widget/BaseWidget.java | 130 +++++++++++++++++ .../taobao/weex/ui/flat/widget/TextWidget.java | 49 +++++++ .../com/taobao/weex/ui/flat/widget/Widget.java | 51 +++++++ .../taobao/weex/ui/flat/widget/WidgetGroup.java | 54 +++++++ .../taobao/weex/ui/module/WXTimerModule.java | 9 +- .../com/taobao/weex/ui/view/WXFrameLayout.java | 53 ++++++- .../weex/ui/view/border/BorderCorner.java | 37 +++-- .../taobao/weex/ui/view/border/BorderUtil.java | 26 ---- .../weex/ui/view/border/BottomLeftCorner.java | 7 +- .../weex/ui/view/border/BottomRightCorner.java | 7 +- .../weex/ui/view/border/TopLeftCorner.java | 7 +- .../weex/ui/view/border/TopRightCorner.java | 7 +- .../com/taobao/weex/utils/FunctionParser.java | 6 - .../java/com/taobao/weex/utils/OsVersion.java | 2 +- .../main/java/com/taobao/weex/utils/Trace.java | 4 +- .../java/com/taobao/weex/utils/WXViewUtils.java | 31 ++++ .../com/taobao/weex/ui/component/WXDivTest.java | 12 +- .../taobao/weex/ui/component/WXTextTest.java | 18 +-- .../weex/ui/module/WXTimerModuleTest.java | 45 +++++- dangerfile.js | 4 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 +- .../Component/Recycler/WXMultiColumnLayout.m | 32 ++-- .../Sources/Component/WXComponent_internal.h | 3 +- .../WeexSDK/Sources/Component/WXEditComponent.m | 4 +- .../Sources/Component/WXImageComponent.m | 34 ++++- .../WeexSDK/Sources/Component/WXTextComponent.m | 6 +- .../WeexSDK/Sources/Events/WXComponent+Events.m | 35 +++-- .../Sources/Manager/WXComponentManager.m | 1 + .../WeexSDK/Sources/Manager/WXTracingManager.h | 5 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 11 ++ ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 37 ++++- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 + .../WeexSDK/Sources/Module/WXModalUIModule.m | 4 +- .../WeexSDK/Sources/Module/WXPrerenderManager.m | 50 +++++-- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h | 1 + ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 1 + .../Sources/Protocol/WXAppMonitorProtocol.h | 1 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 24 ++- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 4 + scripts/build_from_source.sh | 2 +- test/pages/components/textarea-placeholder.vue | 62 ++++++++ test/pages/include/navbar.vue | 121 +++++++++++++++ test/pages/include/navpage.vue | 62 ++++++++ test/pages/modules/modal-event.vue | 2 +- test/pages/modules/navigator-event.vue | 101 +++++++++++++ test/pages/modules/picker-event.vue | 6 +- test/pages/modules/viewport-basic.vue | 62 ++++++++ test/pages/modules/vue_timer.vue | 14 +- test/pages/modules/we_timer.we | 14 +- test/run.sh | 25 +++- test/screenshot/border-android.png | Bin 158634 -> 162929 bytes test/screenshot/border-ios.png | Bin 126185 -> 128088 bytes test/screenshot/compositing-ios.png | Bin 228306 -> 229534 bytes test/screenshot/image-resize-android.png | Bin 214440 -> 218804 bytes test/screenshot/image-resize-ios.png | Bin 138033 -> 138103 bytes .../components/textarea-placeholder.test.js | 69 +++++++++ test/scripts/modules/navigator-event.test.js | 51 +++++++ test/scripts/modules/picker-event.test.js | 4 +- test/scripts/modules/viewport-basic.test.js | 45 ++++++ test/scripts/util.js | 37 +++++ 94 files changed, 2381 insertions(+), 415 deletions(-) ----------------------------------------------------------------------
