Merge branch 'release-0.16' into android-feature-text-rtl Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4dfee864 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4dfee864 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4dfee864
Branch: refs/heads/master Commit: 4dfee8643bcc1839bb432f63d22e9d1293b0cd3a Parents: d6fee3a 3c3536a Author: moxun <furm...@foxmail.com> Authored: Tue Nov 14 14:21:48 2017 +0800 Committer: GitHub <nore...@github.com> Committed: Tue Nov 14 14:21:48 2017 +0800 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 4 +- .travis.yml | 4 - CONTRIBUTING.md | 22 +- .../java/com/alibaba/weex/IndexActivity.java | 12 - android/sdk/build.gradle | 1 + android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22620 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 342264 -> 335324 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes android/sdk/libs/armeabi/libweexjst.so | Bin 0 -> 22552 bytes .../java/com/taobao/weex/WXEnvironment.java | 1 + .../main/java/com/taobao/weex/WXSDKEngine.java | 13 + .../java/com/taobao/weex/WXSDKInstance.java | 53 +- .../java/com/taobao/weex/bridge/WXBridge.java | 6 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 1031 +++++++++--------- .../java/com/taobao/weex/common/Constants.java | 18 +- .../java/com/taobao/weex/common/IWXBridge.java | 2 +- .../com/taobao/weex/dom/DOMActionContext.java | 2 + .../taobao/weex/dom/DOMActionContextImpl.java | 17 +- .../java/com/taobao/weex/dom/WXDomHandler.java | 15 +- .../java/com/taobao/weex/dom/WXDomObject.java | 37 +- .../com/taobao/weex/dom/WXTextDomObject.java | 20 +- .../dom/action/AbstractAddElementAction.java | 4 +- .../taobao/weex/dom/action/AnimationAction.java | 43 +- .../weex/dom/action/MoveElementAction.java | 3 + .../weex/dom/action/UpdateStyleAction.java | 20 +- .../weex/dom/transition/WXTransition.java | 626 +++++++++++ .../weex/ui/animation/TransformParser.java | 296 +++++ .../weex/ui/animation/WXAnimationBean.java | 128 +-- .../ui/component/AbstractEditComponent.java | 8 + .../taobao/weex/ui/component/WXComponent.java | 85 +- .../weex/ui/component/WXComponentFactory.java | 2 - .../com/taobao/weex/ui/component/WXImage.java | 40 + .../taobao/weex/ui/component/WXScroller.java | 2 +- .../com/taobao/weex/ui/component/WXSlider.java | 2 +- .../weex/ui/component/WXSliderNeighbor.java | 2 +- .../taobao/weex/ui/component/WXVContainer.java | 49 +- .../ui/component/list/BasicListComponent.java | 122 ++- .../ui/component/list/StickyHeaderHelper.java | 43 +- .../taobao/weex/ui/component/list/WXCell.java | 71 +- .../list/template/WXRecyclerTemplateList.java | 4 +- .../taobao/weex/ui/module/WXTimerModule.java | 10 +- .../com/taobao/weex/ui/view/WXImageView.java | 87 ++ .../weex/ui/view/listview/WXRecyclerView.java | 24 +- .../com/taobao/weex/utils/BoxShadowUtil.java | 103 +- .../com/taobao/weex/utils/FunctionParser.java | 2 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 34 +- .../taobao/weex/utils/WXSoInstallMgrSdk.java | 25 +- .../java/com/taobao/weex/utils/WXViewUtils.java | 30 +- .../weex/dom/transition/WXTransitionTest.java | 96 ++ .../weex/ui/animation/TransformParserTest.java | 38 + .../com/taobao/weex/utils/WXLogUtilsTest.java | 16 +- .../java/com/taobao/weex/utils/WXUtilsTest.java | 3 +- .../taobao/weex/bridge/WXWebsocketBridge.java | 2 +- dangerfile.js | 47 +- doc/source/cn/guide/contributing.md | 27 +- doc/source/guide/contributing.md | 26 +- doc/source/references/platform-difference.md | 11 + doc/source/references/platfrom-difference.md | 11 - .../references/vue/difference-with-web.md | 2 +- doc/themes/weex/layout/_partial/article.ejs | 2 + doc/themes/weex/layout/index.ejs | 3 + doc/themes/weex/layout/layout.ejs | 2 - doc/themes/weex/source/css/common.scss | 4 +- doc/themes/weex/source/css/partial/header.scss | 2 +- doc/themes/weex/source/css/post.scss | 7 +- doc/themes/weex/source/css/variable.scss | 2 +- html5/render/browser/extend/api/storage.js | 123 ++- html5/render/browser/extend/api/stream.js | 9 +- html5/render/vue/README.md | 20 +- html5/render/vue/components/a.js | 3 - html5/render/vue/components/image.js | 42 +- html5/render/vue/components/slider/indicator.js | 4 +- html5/render/vue/env/weex.js | 34 +- html5/render/vue/index.js | 2 +- html5/render/vue/mixins/base.js | 81 +- html5/render/vue/mixins/style.js | 22 +- html5/render/vue/modules/dom.js | 6 +- html5/render/vue/utils/component.js | 11 +- html5/render/vue/utils/lazyload.js | 24 +- html5/runtime/api/WeexInstance.js | 126 +++ html5/runtime/api/component.js | 51 + html5/runtime/api/init.js | 107 +- html5/runtime/api/module.js | 56 + html5/runtime/vdom/Element.js | 2 +- html5/test/render/vue/components/image.js | 1 - html5/test/render/vue/components/switch.js | 9 +- html5/test/render/vue/components/text.js | 2 +- html5/test/render/vue/modules/dom.js | 1 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 12 + .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 13 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +- .../Sources/Component/WXCycleSliderComponent.m | 2 +- .../Sources/Component/WXScrollerComponent.m | 31 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 3 + .../Sources/Display/WXComponent+BoxShadow.m | 9 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 5 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 6 + .../WeexSDK/Sources/Monitor/WXExceptionUtils.h | 29 + .../WeexSDK/Sources/Monitor/WXExceptionUtils.m | 57 + ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + package.json | 2 +- packages/weex-vue-render/README.md | 20 +- packages/weex-vue-render/package.json | 2 +- pre-build/native-bundle-main.js | 16 +- test/screenshot/border-android.png | Bin 0 -> 164417 bytes test/screenshot/border-ios.png | Bin 128088 -> 129071 bytes 106 files changed, 3281 insertions(+), 1103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4dfee864/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/common/Constants.java index c32e943,dc67cd7..1e7dc03 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@@ -182,9 -184,9 +184,12 @@@ public class Constants String ARIA_LABEL = "ariaLabel"; String ARIA_HIDDEN = "ariaHidden"; + String DIRECTION = "direction"; + String RTL = "rtl"; - ++ + String STICKY_OFFSET = "stickyOffset"; + String HAS_FIXED_SIZE = "hasFixedSize"; + String KEEP_POSITION_LAYOUT_DELAY = "keepPositionLayoutDelay"; interface Recycler{ String LIST_DATA = "listData"; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4dfee864/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java ----------------------------------------------------------------------
