You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:53 UTC
[42/50] [abbrv] incubator-weex git commit: Merge branch
'v0.10.0-stable' into dev-release095
Merge branch 'v0.10.0-stable' into dev-release095
# Conflicts:
# README.md
# android/commons/src/main/java/com/alibaba/weex/commons/AbstractWeexActivity.java
# android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXSQLiteOpenHelper.java
# android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
# examples/vanilla/index.js
# ios/sdk/WeexSDK/Sources/Component/WXImageComponent.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/4d9dcc1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4d9dcc1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4d9dcc1d
Branch: refs/heads/master
Commit: 4d9dcc1de20c56aed14467efc33328e56b083924
Parents: 966c17d 235b87f
Author: sospartan <so...@gmail.com>
Authored: Wed Jan 11 16:54:26 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Wed Jan 11 16:54:26 2017 +0800
----------------------------------------------------------------------
.gitignore | 1 +
android/commons/build.gradle | 4 +-
.../weex/commons/AbstractWeexActivity.java | 2 +
.../adapter/DefaultWebSocketAdapter.java | 326 +
.../adapter/DefaultWebSocketAdapterFactory.java | 219 +
android/playground/app/build.gradle | 16 +-
.../app/src/androidTest/AndroidManifest.xml | 212 +
.../benchmark/BenchmarkActivityTestRule.java | 239 +
.../alibaba/weex/benchmark/BenchmarkTest.java | 419 +
.../com/alibaba/weex/benchmark/BoxPlot.java | 270 +
.../java/com/alibaba/weex/benchmark/Repeat.java | 219 +
.../com/alibaba/weex/benchmark/RepeatRule.java | 242 +
.../weex/benchmark/WeexNativeCompareTest.java | 336 +
.../playground/app/src/main/AndroidManifest.xml | 41 +-
.../app/src/main/assets/hello_weex.js | 28 +
.../com/alibaba/weex/BenchmarkActivity.java | 413 +
.../java/com/alibaba/weex/IndexActivity.java | 77 +-
.../java/com/alibaba/weex/WXApplication.java | 62 +-
.../java/com/alibaba/weex/WXDebugActivity.java | 91 +
.../java/com/alibaba/weex/WXPageActivity.java | 215 +-
.../extend/component/WXComponentSyncTest.java | 29 +
.../weex/extend/module/GeolocationModule.java | 8 +-
.../alibaba/weex/extend/module/MyModule.java | 4 +-
.../weex/extend/module/RenderModule.java | 4 +-
.../weex/extend/module/SyncTestModule.java | 53 +
.../weex/extend/module/WXEventModule.java | 16 +-
.../zxing/client/android/CaptureActivity.java | 70 +-
.../src/main/res/layout/activity_dynamic.xml | 27 +
.../app/src/main/res/layout/activity_index.xml | 1 +
.../app/src/main/res/layout/content_dynamic.xml | 24 +
.../app/src/main/res/layout/hello_weex.xml | 223 +
.../app/src/main/res/values-zh-rCN/strings.xml | 2 +-
.../app/src/main/res/values/strings.xml | 10 +-
android/sdk/assets/main.js | 19932 ++++++++++++++++-
android/sdk/build.gradle | 7 +-
android/sdk/gradle.properties | 6 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
android/sdk/libs/armeabi/libweexv8.so | Bin 3579724 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4328576 -> 4340864 bytes
android/sdk/src/main/AndroidManifest.xml | 2 +-
.../taobao/weex/IWXActivityStateListener.java | 2 +
.../main/java/com/taobao/weex/InitConfig.java | 26 +
.../java/com/taobao/weex/RenderContainer.java | 253 +
.../java/com/taobao/weex/WXEnvironment.java | 14 +-
.../com/taobao/weex/WXGlobalEventModule.java | 6 +-
.../com/taobao/weex/WXGlobalEventReceiver.java | 12 +-
.../main/java/com/taobao/weex/WXSDKEngine.java | 64 +-
.../java/com/taobao/weex/WXSDKInstance.java | 623 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 48 +-
.../taobao/weex/adapter/DrawableStrategy.java | 213 +
.../taobao/weex/adapter/IDrawableLoader.java | 219 +
.../com/taobao/weex/annotation/Component.java | 219 +
.../appfram/clipboard/WXClipboardModule.java | 16 +-
.../appfram/navigator/WXNavigatorModule.java | 182 +-
.../appfram/storage/WXSQLiteOpenHelper.java | 1 -
.../weex/appfram/storage/WXStorageModule.java | 17 +-
.../appfram/websocket/IWebSocketAdapter.java | 234 +
.../websocket/IWebSocketAdapterFactory.java | 213 +
.../appfram/websocket/WebSocketCloseCodes.java | 237 +
.../weex/appfram/websocket/WebSocketModule.java | 341 +
.../taobao/weex/bridge/BaseMethodInvoker.java | 224 -
.../java/com/taobao/weex/bridge/Invoker.java | 4 +-
.../taobao/weex/bridge/JSCallbackCreator.java | 213 -
.../taobao/weex/bridge/JavascriptInvokable.java | 214 +
.../com/taobao/weex/bridge/MethodInvoker.java | 18 +-
.../com/taobao/weex/bridge/ModuleFactory.java | 5 +-
.../taobao/weex/bridge/NativeInvokeHelper.java | 276 +
.../java/com/taobao/weex/bridge/WXBridge.java | 51 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 245 +-
.../java/com/taobao/weex/bridge/WXJSObject.java | 48 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 227 +-
.../java/com/taobao/weex/bridge/WXParams.java | 19 +
.../taobao/weex/bridge/WXServiceManager.java | 236 +
.../java/com/taobao/weex/common/Component.java | 219 -
.../java/com/taobao/weex/common/Constants.java | 26 +
.../java/com/taobao/weex/common/IWXBridge.java | 6 +
.../com/taobao/weex/common/IWXDebugProxy.java | 4 +-
.../taobao/weex/common/TypeModuleFactory.java | 32 +-
.../com/taobao/weex/common/WXCompatModule.java | 270 +
.../java/com/taobao/weex/common/WXConfig.java | 1 +
.../com/taobao/weex/common/WXInstanceWrap.java | 4 +-
.../java/com/taobao/weex/common/WXModule.java | 379 +-
.../com/taobao/weex/common/WXModuleAnno.java | 5 +-
.../taobao/weex/dom/BasicEditTextDomObject.java | 6 +-
.../java/com/taobao/weex/dom/DomContext.java | 216 +
.../com/taobao/weex/dom/ImmutableDomObject.java | 228 +
.../main/java/com/taobao/weex/dom/WXAttr.java | 114 +-
.../com/taobao/weex/dom/WXCustomStyleSpan.java | 2 +-
.../java/com/taobao/weex/dom/WXDomHandler.java | 15 +-
.../java/com/taobao/weex/dom/WXDomManager.java | 9 +-
.../java/com/taobao/weex/dom/WXDomModule.java | 82 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 415 +-
.../com/taobao/weex/dom/WXDomStatement.java | 546 +-
.../main/java/com/taobao/weex/dom/WXStyle.java | 211 +-
.../com/taobao/weex/dom/WXSwitchDomObject.java | 64 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 104 +-
.../com/taobao/weex/http/WXStreamModule.java | 21 +-
.../com/taobao/weex/ui/IFComponentHolder.java | 6 +-
.../taobao/weex/ui/SimpleComponentHolder.java | 7 +-
.../com/taobao/weex/ui/WXRenderManager.java | 10 +-
.../com/taobao/weex/ui/WXRenderStatement.java | 76 +-
.../weex/ui/animation/WXAnimationBean.java | 60 +-
.../weex/ui/animation/WXAnimationModule.java | 33 +-
.../ui/component/AbstractEditComponent.java | 46 +-
.../taobao/weex/ui/component/Scrollable.java | 3 -
.../java/com/taobao/weex/ui/component/WXA.java | 15 +-
.../taobao/weex/ui/component/WXBaseRefresh.java | 12 +-
.../taobao/weex/ui/component/WXComponent.java | 635 +-
.../com/taobao/weex/ui/component/WXDiv.java | 5 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 24 +-
.../com/taobao/weex/ui/component/WXHeader.java | 2 +-
.../com/taobao/weex/ui/component/WXImage.java | 302 +-
.../taobao/weex/ui/component/WXIndicator.java | 12 +-
.../com/taobao/weex/ui/component/WXInput.java | 2 +-
.../com/taobao/weex/ui/component/WXLoading.java | 22 +-
.../weex/ui/component/WXLoadingIndicator.java | 2 +-
.../com/taobao/weex/ui/component/WXRefresh.java | 27 +-
.../taobao/weex/ui/component/WXScroller.java | 66 +-
.../com/taobao/weex/ui/component/WXSlider.java | 136 +-
.../weex/ui/component/WXSliderNeighbor.java | 180 +-
.../com/taobao/weex/ui/component/WXSwitch.java | 22 +-
.../com/taobao/weex/ui/component/WXText.java | 10 +-
.../taobao/weex/ui/component/WXVContainer.java | 184 +-
.../com/taobao/weex/ui/component/WXVideo.java | 2 +-
.../com/taobao/weex/ui/component/WXWeb.java | 23 +-
.../ui/component/list/BasicListComponent.java | 1104 +
.../component/list/HorizontalListComponent.java | 2 +-
.../ui/component/list/ListComponentView.java | 223 +
.../ui/component/list/SimpleListComponent.java | 231 +
.../ui/component/list/SimpleRecyclerView.java | 329 +
.../taobao/weex/ui/component/list/WXCell.java | 6 +-
.../weex/ui/component/list/WXListComponent.java | 952 +-
.../component/pesudo/OnActivePseudoListner.java | 212 +
.../weex/ui/component/pesudo/PesudoStatus.java | 317 +
.../pesudo/TouchActivePseudoListener.java | 234 +
.../com/taobao/weex/ui/module/WXMetaModule.java | 246 +
.../taobao/weex/ui/module/WXModalUIModule.java | 95 +-
.../taobao/weex/ui/module/WXTimerModule.java | 10 +-
.../taobao/weex/ui/module/WXWebViewModule.java | 8 +-
.../com/taobao/weex/ui/view/IRenderStatus.java | 214 +
.../weex/ui/view/WXCirclePageAdapter.java | 4 +
.../taobao/weex/ui/view/WXCircleViewPager.java | 25 +
.../com/taobao/weex/ui/view/WXFrameLayout.java | 8 +
.../weex/ui/view/WXHorizontalScrollView.java | 12 +
.../com/taobao/weex/ui/view/WXImageView.java | 170 +-
.../com/taobao/weex/ui/view/WXScrollView.java | 12 +
.../com/taobao/weex/ui/view/WXSwitchView.java | 3 +
.../com/taobao/weex/ui/view/WXTextView.java | 18 +-
.../weex/ui/view/border/BorderDrawable.java | 338 +-
.../taobao/weex/ui/view/border/BorderUtil.java | 293 +
.../taobao/weex/ui/view/gesture/WXGesture.java | 219 +-
.../weex/ui/view/gesture/WXGestureType.java | 5 +-
.../weex/ui/view/listview/WXRecyclerView.java | 34 +-
.../refresh/circlebar/CircleProgressBar.java | 1 -
.../ui/view/refresh/core/WXRefreshView.java | 6 +
.../ui/view/refresh/core/WXSwipeLayout.java | 41 +-
.../ui/view/refresh/wrapper/BaseBounceView.java | 22 +
.../refresh/wrapper/BounceRecyclerView.java | 28 +-
.../java/com/taobao/weex/utils/ATagUtil.java | 224 +
.../com/taobao/weex/utils/FunctionParser.java | 15 +
.../com/taobao/weex/utils/ImageDrawable.java | 326 +
.../java/com/taobao/weex/utils/ImgURIUtil.java | 228 +
.../java/com/taobao/weex/utils/WXDomUtils.java | 268 +
.../java/com/taobao/weex/utils/WXFileUtils.java | 40 +-
.../java/com/taobao/weex/utils/WXJsonUtils.java | 15 +-
.../taobao/weex/utils/WXReflectionUtils.java | 38 -
.../com/taobao/weex/utils/WXResourceUtils.java | 111 +
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 7 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 168 +-
.../java/com/taobao/weex/WXSDKEngineTest.java | 2 +
.../java/com/taobao/weex/WXSDKInstanceTest.java | 65 +-
.../clipboard/WXClipboardModuleTest.java | 261 +
.../navigator/WXNavigatorModuleTest.java | 26 +-
.../com/taobao/weex/bridge/WXBridgeTest.java | 263 +
.../com/taobao/weex/bridge/WXHashMapTest.java | 2 +-
.../taobao/weex/bridge/WXModuleManagerTest.java | 2 -
.../java/com/taobao/weex/common/TestModule.java | 5 +-
.../java/com/taobao/weex/dom/TestDomObject.java | 27 +-
.../java/com/taobao/weex/dom/WXAttrTest.java | 38 +-
.../com/taobao/weex/dom/WXDomModuleTest.java | 3 +-
.../com/taobao/weex/dom/WXDomStatementTest.java | 17 +-
.../java/com/taobao/weex/dom/WXStyleTest.java | 80 +
.../taobao/weex/dom/WXTextDomObjectTest.java | 276 +
.../taobao/weex/http/WXStreamModuleTest.java | 4 +
.../ui/animation/WXAnimationModuleTest.java | 6 -
.../taobao/weex/ui/component/ComponentTest.java | 23 +-
.../weex/ui/component/WXComponentTest.java | 65 +-
.../com/taobao/weex/ui/component/WXDivTest.java | 11 +-
.../taobao/weex/ui/component/WXEmbedTest.java | 259 +
.../taobao/weex/ui/component/WXImageTest.java | 30 +-
.../taobao/weex/ui/component/WXLoadingTest.java | 259 +
.../taobao/weex/ui/component/WXRefreshTest.java | 261 +
.../weex/ui/component/WXScrollerTest.java | 3 +-
.../weex/ui/component/WXSliderNeighborTest.java | 288 +
.../taobao/weex/ui/component/WXSliderTest.java | 27 +-
.../taobao/weex/ui/component/WXSwitchTest.java | 261 +
.../taobao/weex/ui/component/WXTextTest.java | 24 +-
.../com/taobao/weex/ui/component/WXWebTest.java | 336 +
.../ui/component/list/WXListComponentTest.java | 21 +-
.../taobao/weex/ui/module/WXMetaModuleTest.java | 263 +
.../weex/ui/module/WXModalUIModuleTest.java | 2 +-
.../weex/ui/view/border/BorderDrawableTest.java | 38 +-
.../weex/ui/view/gesture/WXGestureTest.java | 268 +
.../taobao/weex/utils/FunctionParserTest.java | 225 +
.../com/taobao/weex/utils/WXLogUtilsTest.java | 284 +
.../taobao/weex/utils/WXResourceUtilsTest.java | 18 +-
.../java/com/taobao/weex/utils/WXUtilsTest.java | 17 +
android/sdk/unittest.sh | 4 +
.../taobao/weex/bridge/WXWebsocketBridge.java | 15 +
build/webpack.macacatest.config.js | 57 +
circle.yml | 19 +-
doc/advanced/integrate-to-android.md | 12 +-
examples/component/slider/index.we | 7 +
.../Sources/Component/WXImageComponent.m | 2 +-
package.json | 6 +
test/README.md | 28 +
test/benchmark.html | 42 -
test/circleci-android/Constants.java | 16 -
test/event-bubble.we | 45 -
test/index-item.we | 26 -
test/index.we | 53 -
test/input-test.we | 27 -
test/pages/components/input.we | 0
test/pages/index.we | 27 +
test/run.sh | 28 +
test/scripts/index.test.js | 57 +
test/scripts/test.js | 1 +
test/scripts/weex-node-map.js | 17 +
test/scripts/weex.js | 129 +
test/scroller-demo.we | 168 -
test/serve.sh | 4 +
test/sticky-demo.we | 81 -
test/stream.json | 3 -
test/stream.we | 140 -
test/test.we | 85 -
test/text-word-wrap.we | 13 -
test/ui-list-item.we | 28 -
test/update-cli.sh | 5 +
test/web-demo.we | 30 -
test/web-inner.html | 42 -
240 files changed, 40522 insertions(+), 5092 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d9dcc1d/android/commons/src/main/java/com/alibaba/weex/commons/AbstractWeexActivity.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d9dcc1d/doc/advanced/integrate-to-android.md
----------------------------------------------------------------------