You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/06 02:54:28 UTC
[3/5] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/apache/incubator-weex into android-bugfix-NPE
Merge branch '0.11-dev' of https://github.com/apache/incubator-weex into android-bugfix-NPE
# Conflicts:
# android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cfb1b562
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cfb1b562
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cfb1b562
Branch: refs/heads/0.11-dev
Commit: cfb1b562a4260bc2a2ce83b33fbee025a8691d4b
Parents: 16633e3 59dee77
Author: zshshr <zh...@gmail.com>
Authored: Fri Mar 3 17:58:27 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Fri Mar 3 17:58:27 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/ImmutableDomObject.java | 14 +-
.../java/com/taobao/weex/dom/flex/CSSNode.java | 8 +-
.../taobao/weex/ui/component/WXComponent.java | 2 +
.../com/taobao/weex/ui/component/WXImage.java | 29 ++-
.../com/taobao/weex/ui/component/WXLoading.java | 7 +-
.../com/taobao/weex/ui/component/WXSlider.java | 20 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 ++
.../ui/component/list/BasicListComponent.java | 31 +--
.../com/taobao/weex/ui/view/WXImageView.java | 20 +-
.../weex/ui/view/border/BorderDrawable.java | 1 -
.../taobao/weex/ui/view/border/BorderEdge.java | 71 +++---
.../listview/adapter/ListBaseViewHolder.java | 37 +++-
.../ui/view/refresh/wrapper/BaseBounceView.java | 1 -
examples/module/websocket-demo.we | 222 ++++++++++---------
ios/playground/WeexDemo/WXDemoViewController.m | 4 -
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 12 +
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 8 +-
.../WeexSDK/Sources/Component/WXEditComponent.h | 2 +-
.../Sources/Component/WXScrollerComponent.m | 2 +-
.../Sources/Component/WXTextInputComponent.h | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 6 -
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 4 +
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 4 +-
.../Sources/Protocol/WXJSExceptionProtocol.h | 21 ++
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 53 ++---
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
test/pages/image-onload.we | 19 ++
test/scripts/components/image-onload.test.js | 39 ++++
31 files changed, 430 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfb1b562/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfb1b562/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
index c3f10ba,1809a78..3715929
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
@@@ -336,26 -330,22 +336,25 @@@ public abstract class BaseBounceView<T
public void setFooterView(WXComponent loading) {
setLoadmoreEnable(true);
if (swipeLayout != null) {
- ImmutableDomObject domObject;
- if (swipeLayout.getFooterView() != null && (domObject = loading.getDomObject()) != null) {
- swipeLayout.setLoadingHeight((int) domObject.getLayoutHeight());
-
- String colorStr = (String) loading.getDomObject().getStyles().get(Constants.Name.BACKGROUND_COLOR);
- String bgColor = WXUtils.getString(colorStr, null);
+ WXRefreshView refreshView = swipeLayout.getFooterView();
+ if (refreshView != null) {
+ ImmutableDomObject object = loading.getDomObject();
+ if (object != null) {
+ int loadingHeight = (int) loading.getDomObject().getLayoutHeight();
+ swipeLayout.setLoadingHeight(loadingHeight);
-
+ String colorStr = (String) loading.getDomObject().getStyles().get(Constants.Name.BACKGROUND_COLOR);
+ String bgColor = WXUtils.getString(colorStr, null);
- if (bgColor != null) {
- if (!TextUtils.isEmpty(bgColor)) {
- int colorInt = WXResourceUtils.getColor(bgColor);
- if (!(colorInt == Color.TRANSPARENT)) {
- swipeLayout.setLoadingBgColor(colorInt);
+ if (bgColor != null) {
+ if (!TextUtils.isEmpty(bgColor)) {
+ int colorInt = WXResourceUtils.getColor(bgColor);
+ if (!(colorInt == Color.TRANSPARENT)) {
+ swipeLayout.setLoadingBgColor(colorInt);
+ }
}
}
+ refreshView.setRefreshView(loading.getHostView());
}
- swipeLayout.getFooterView().setRefreshView(loading.getHostView());
}
}
}