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/04/20 11:41:40 UTC
[03/17] incubator-weex git commit: Merge branch '0.11-dev' into
android-feature-20170307-jsc
Merge branch '0.11-dev' into android-feature-20170307-jsc
# Conflicts:
# android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
# android/sdk/assets/main.js
# android/sdk/libs/armeabi/libweexv8.so
# android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
# package.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/52b58a93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52b58a93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52b58a93
Branch: refs/heads/0.12-dev
Commit: 52b58a9360b5c5b89d78ff287efec021bd1907d5
Parents: f9f218d dded7ab
Author: zshshr <zh...@gmail.com>
Authored: Wed Mar 22 11:56:09 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Mar 22 11:56:09 2017 +0800
----------------------------------------------------------------------
.travis.yml | 4 +-
CONTRIBUTING.md | 38 +-
Dangerfile | 55 ---
Dangerfile-ios | 4 +
.../java/com/alibaba/weex/WXPageActivity.java | 39 +-
.../extend/module/location/DefaultLocation.java | 110 +++---
android/sdk/build.gradle | 21 +-
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4336768 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 54 ++-
.../main/java/com/taobao/weex/WXSDKManager.java | 2 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 85 ++--
.../taobao/weex/bridge/WXValidateProcessor.java | 15 +-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../com/taobao/weex/common/WXImageStrategy.java | 2 +-
.../java/com/taobao/weex/common/WXThread.java | 9 +
.../java/com/taobao/weex/dom/WXDomModule.java | 2 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 6 +-
.../com/taobao/weex/dom/WXDomStatement.java | 4 +-
.../main/java/com/taobao/weex/dom/WXStyle.java | 65 ++--
.../com/taobao/weex/ui/WXRenderStatement.java | 12 +-
.../weex/ui/animation/WXAnimationModule.java | 16 +-
.../ui/component/AbstractEditComponent.java | 10 +-
.../taobao/weex/ui/component/WXBaseRefresh.java | 10 -
.../taobao/weex/ui/component/WXComponent.java | 67 ++--
.../com/taobao/weex/ui/component/WXEmbed.java | 4 +-
.../com/taobao/weex/ui/component/WXHeader.java | 5 +
.../com/taobao/weex/ui/component/WXImage.java | 61 ++-
.../taobao/weex/ui/component/WXIndicator.java | 2 +-
.../com/taobao/weex/ui/component/WXLoading.java | 5 +
.../com/taobao/weex/ui/component/WXRefresh.java | 5 +
.../taobao/weex/ui/component/WXScroller.java | 16 +-
.../weex/ui/component/WXSliderNeighbor.java | 7 +-
.../taobao/weex/ui/component/WXVContainer.java | 3 +-
.../ui/component/list/BasicListComponent.java | 54 +--
.../ui/component/list/ListComponentView.java | 1 +
.../ui/component/list/SimpleRecyclerView.java | 77 +---
.../ui/component/list/StickyHeaderHelper.java | 337 ++++++++++++++++
.../taobao/weex/ui/component/list/WXCell.java | 11 +
.../weex/ui/component/pesudo/PesudoStatus.java | 2 +-
.../com/taobao/weex/ui/module/WXMetaModule.java | 7 +-
.../weex/ui/view/border/BorderDrawable.java | 4 +-
.../taobao/weex/ui/view/gesture/WXGesture.java | 8 +-
.../adapter/WXRecyclerViewOnScrollListener.java | 28 +-
.../refresh/wrapper/BounceRecyclerView.java | 112 +-----
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 11 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 14 +-
.../test/java/com/taobao/weex/TestActivity.java | 6 +-
.../java/com/taobao/weex/dom/WXStyleTest.java | 23 +-
.../taobao/weex/ui/module/WXMetaModuleTest.java | 10 +-
.../taobao/weex/utils/FunctionParserTest.java | 11 +-
dangerfile.js | 117 ++++++
doc/_config.yml | 9 +-
doc/advanced/extend-to-android.md | 2 +-
doc/package.json | 2 +-
doc/source/cn/faq.md | 6 +-
doc/source/cn/guide/contributing.md | 106 +++++
doc/source/cn/guide/dev-with-weexpack.md | 11 -
doc/source/cn/guide/index.md | 123 ++----
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/intro/devtools.md | 99 -----
doc/source/cn/guide/intro/index.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 2 +-
doc/source/cn/guide/set-up-env.md | 128 ++++++
doc/source/cn/guide/tools/devtools.md | 111 ++++++
doc/source/cn/guide/tools/index.md | 11 +
doc/source/cn/guide/tools/weexpack.md | 388 +++++++++++++++++++
.../cn/references/advanced/extend-jsfm.md | 2 +-
.../cn/references/advanced/extend-to-android.md | 22 +-
.../cn/references/advanced/extend-to-html5.md | 2 +-
.../cn/references/advanced/extend-to-ios.md | 233 +++++------
doc/source/cn/references/advanced/index.md | 2 +-
.../advanced/integrate-devtool-to-android.md | 6 +-
.../advanced/integrate-devtool-to-ios.md | 8 +-
doc/source/cn/references/android-apis.md | 25 +-
doc/source/cn/references/common-style.md | 10 +-
doc/source/cn/references/components/a.md | 25 +-
doc/source/cn/references/components/cell.md | 7 +-
doc/source/cn/references/components/div.md | 12 +-
doc/source/cn/references/components/image.md | 18 +-
.../cn/references/components/indicator.md | 3 +-
doc/source/cn/references/components/input.md | 2 +-
doc/source/cn/references/components/list.md | 6 +-
doc/source/cn/references/components/loading.md | 2 +
doc/source/cn/references/components/refresh.md | 4 +-
doc/source/cn/references/components/scroller.md | 6 +-
doc/source/cn/references/components/slider.md | 2 +-
doc/source/cn/references/components/switch.md | 2 +-
doc/source/cn/references/components/text.md | 2 +-
doc/source/cn/references/components/textarea.md | 2 +-
doc/source/cn/references/components/video.md | 2 +-
doc/source/cn/references/components/web.md | 2 +-
doc/source/cn/references/gesture.md | 3 +-
doc/source/cn/references/ios-apis.md | 4 +-
doc/source/cn/references/js-service/index.md | 118 ++++++
.../cn/references/migration/difference.md | 2 +-
doc/source/cn/references/migration/index.md | 2 +-
.../references/migration/migration-from-weex.md | 2 +-
doc/source/cn/references/modules/animation.md | 4 +-
doc/source/cn/references/modules/clipboard.md | 2 +-
doc/source/cn/references/modules/dom.md | 8 +-
doc/source/cn/references/modules/globalevent.md | 2 +-
doc/source/cn/references/modules/index.md | 31 +-
doc/source/cn/references/modules/modal.md | 2 +-
doc/source/cn/references/modules/navigator.md | 2 +-
doc/source/cn/references/modules/storage.md | 4 +-
doc/source/cn/references/modules/stream.md | 2 +-
doc/source/cn/references/modules/websocket.md | 215 ++++++++++
doc/source/cn/references/modules/webview.md | 2 +-
doc/source/cn/references/path.md | 32 +-
.../cn/references/vue/difference-of-vuex.md | 2 +-
.../cn/references/vue/difference-with-web.md | 9 +-
doc/source/cn/references/vue/index.md | 2 +-
.../cn/v-0.10/advanced/extend-to-html5.md | 2 +-
.../cn/v-0.10/advanced/integrate-to-android.md | 4 +-
.../cn/v-0.10/references/modules/globalevent.md | 2 +-
.../cn/v-0.10/references/modules/storage.md | 2 +-
doc/source/cn/v-0.10/tools/devtools.md | 4 +-
doc/source/faq.md | 5 +-
doc/source/guide/contributing.md | 106 +++++
doc/source/guide/dev-with-weexpack.md | 12 -
doc/source/guide/index.md | 49 ++-
doc/source/guide/integrate-to-your-app.md | 274 ++++++++++++-
doc/source/guide/intro/devtools.md | 100 -----
doc/source/guide/intro/using-vue.md | 2 +-
doc/source/guide/set-up-env.md | 93 +++++
doc/source/guide/tools/devtools.md | 100 +++++
doc/source/guide/tools/index.md | 11 +
doc/source/guide/tools/weexpack.md | 300 ++++++++++++++
doc/source/references/advanced/extend-jsfm.md | 159 +++++++-
.../references/advanced/extend-to-android.md | 20 +-
.../references/advanced/extend-to-html5.md | 88 ++++-
.../advanced/integrate-devtool-to-android.md | 137 ++++++-
.../advanced/integrate-devtool-to-ios.md | 184 ++++++++-
doc/source/references/android-apis.md | 211 +++++++++-
doc/source/references/common-style.md | 16 +-
doc/source/references/components/a.md | 2 +-
doc/source/references/components/cell.md | 4 +-
doc/source/references/components/div.md | 6 +-
doc/source/references/components/image.md | 11 +-
doc/source/references/components/indicator.md | 6 +-
doc/source/references/components/input.md | 4 +-
doc/source/references/components/list.md | 4 +-
doc/source/references/components/refresh.md | 4 +-
doc/source/references/components/scroller.md | 10 +-
doc/source/references/components/slider.md | 12 +-
doc/source/references/components/switch.md | 4 +-
doc/source/references/components/text.md | 2 +-
doc/source/references/components/textarea.md | 4 +-
doc/source/references/components/video.md | 4 +-
doc/source/references/components/web.md | 6 +-
doc/source/references/gesture.md | 2 +-
doc/source/references/ios-apis.md | 70 +++-
doc/source/references/modules/animation.md | 2 +-
doc/source/references/modules/clipboard.md | 2 +-
doc/source/references/modules/dom.md | 8 +-
doc/source/references/modules/globalevent.md | 6 +-
doc/source/references/modules/index.md | 31 +-
doc/source/references/modules/modal.md | 2 +-
doc/source/references/modules/navigator.md | 2 +-
doc/source/references/modules/storage.md | 4 +-
doc/source/references/modules/stream.md | 2 +-
doc/source/references/modules/websocket.md | 214 ++++++++++
doc/source/references/modules/webview.md | 8 +-
doc/source/references/native-dom-api.md | 203 +++++++++-
doc/source/references/platfrom-difference.md | 11 +
doc/source/references/vue/difference-of-vuex.md | 85 +++-
.../references/vue/difference-with-web.md | 143 ++++++-
doc/source/references/weex-variable.md | 41 +-
doc/source/v-0.10/advanced/extend-to-html5.md | 2 +-
.../v-0.10/advanced/integrate-to-android.md | 6 +-
.../guide/how-to/preview-in-playground-app.md | 2 +-
.../v-0.10/references/modules/globalevent.md | 2 +-
doc/themes/weex/languages/cn.yml | 5 +-
doc/themes/weex/languages/en.yml | 45 ++-
.../weex/layout/_partial/after-footer.ejs | 2 +-
doc/themes/weex/layout/_partial/footer.ejs | 8 +-
doc/themes/weex/layout/_partial/header.ejs | 30 +-
doc/themes/weex/layout/_partial/search-form.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 15 +-
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/index.ejs | 29 +-
doc/themes/weex/source/css/index.scss | 4 +-
doc/themes/weex/source/css/media-queries.scss | 3 +
doc/themes/weex/source/css/partial/footer.scss | 1 +
doc/themes/weex/source/css/partial/header.scss | 32 +-
.../weex/source/css/partial/search-form.scss | 3 -
doc/themes/weex/source/css/partial/sidebar.scss | 1 +
doc/themes/weex/source/js/common.js | 77 +++-
doc/themes/weex/source/js/example.js | 2 +-
examples/module/websocket-demo.we | 2 +-
examples/vue/components/waterfall.vue | 17 +-
html5/shared/freeze.js | 45 ++-
html5/test/unit/shared/index.js | 2 +-
ios/playground/WeexDemo/Info.plist | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 2 +-
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 18 +-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 15 +-
.../Component/Recycler/WXMultiColumnLayout.m | 5 +-
.../Component/Recycler/WXRecyclerComponent.m | 98 ++++-
.../Recycler/WXRecyclerUpdateController.m | 14 +-
.../Component/WXComponent+GradientColor.m | 3 +
.../Sources/Component/WXImageComponent.m | 1 +
.../WeexSDK/Sources/Component/WXListComponent.m | 86 +++-
.../Sources/Component/WXLoadingComponent.m | 13 -
.../Sources/Component/WXRefreshComponent.m | 20 +-
.../Sources/Component/WXScrollerComponent.m | 28 +-
.../Sources/Component/WXSliderComponent.m | 3 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
.../Sources/Display/WXComponent+BoxShadow.h | 5 +-
.../Sources/Display/WXComponent+BoxShadow.m | 22 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 4 +
ios/sdk/WeexSDK/Sources/Layout/Layout.c | 3 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 16 +-
.../Sources/Manager/WXComponentManager.m | 3 +-
.../Sources/Manager/WXInvocationConfig.h | 1 -
.../Sources/Manager/WXInvocationConfig.m | 12 -
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 5 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 46 ++-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 5 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 239 +++++++-----
.../WXResourceRequestHandlerDefaultImpl.m | 7 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 42 +-
.../Sources/View/WXComponent+ViewManagement.m | 2 +
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
package.json | 18 +-
test/ci-funcs.sh | 6 +-
233 files changed, 5710 insertions(+), 1641 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b58a93/android/sdk/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b58a93/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index d501ffb,c70b405..8b0e3d7
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@@ -249,10 -249,8 +249,9 @@@ import com.taobao.weex.ui.component.Nes
import com.taobao.weex.ui.component.WXBasicComponentType;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXComponentFactory;
- import com.taobao.weex.ui.component.WXVContainer;
import com.taobao.weex.ui.view.WXScrollView;
import com.taobao.weex.ui.view.WXScrollView.WXScrollViewListener;
+import com.taobao.weex.utils.Trace;
import com.taobao.weex.utils.WXFileUtils;
import com.taobao.weex.utils.WXJsonUtils;
import com.taobao.weex.utils.WXLogUtils;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b58a93/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b58a93/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b58a93/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b58a93/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index 8907dab,77492b5..11a4d48
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@@ -208,9 -208,8 +208,10 @@@ import android.content.Context
import android.content.pm.ApplicationInfo;
import android.os.Build;
+import com.taobao.weex.IWXStatisticsListener;
+ import com.taobao.weappplus_sdk.BuildConfig;
import com.taobao.weex.WXEnvironment;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.common.WXPerformance;
@@@ -252,20 -251,13 +253,20 @@@ public class WXSoInstallMgrSdk
private final static String ARMEABI = "armeabi"; //default
private final static String X86 = "x86";
private final static String MIPS = "mips";
- private final static int ARMEABI_Size = 3649404;
- //private final static int ARMEABI_Size = 124236;
- private final static int X86_Size = 4451068;
++
+ private final static int ARMEABI_Size = 3583820;
+ private final static int X86_Size = 4340864;
static Context mContext = null;
+ private static IWXSoLoaderAdapter mSoLoader = null;
+ private static IWXStatisticsListener mStatisticsListener = null;
- public static void init(Context c) {
+ public static void init(Context c,
+ IWXSoLoaderAdapter loader,
+ IWXStatisticsListener listener) {
mContext = c;
+ mSoLoader = loader;
+ mStatisticsListener = listener;
}
public static boolean isX86(){