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/02 07:14:31 UTC
[1/2] incubator-weex git commit: * [android] scale load more offset
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 6bbe707d3 -> de8c25d9a
* [android] scale load more offset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1193f3b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1193f3b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1193f3b0
Branch: refs/heads/0.11-dev
Commit: 1193f3b065b7631535b003340947c70bf74ea384
Parents: fa1c8b0
Author: sospartan <so...@gmail.com>
Authored: Wed Mar 1 14:53:17 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Wed Mar 1 14:59:59 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1193f3b0/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index eb7fd78..118a30d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1128,8 +1128,9 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (TextUtils.isEmpty(offset)) {
offset = "0";
}
+ float offsetParsed = WXViewUtils.getRealPxByWidth(Integer.parseInt(offset),WXSDKInstance.getViewPortWidth());
- if (offScreenY < Integer.parseInt(offset)) {
+ if (offScreenY < offsetParsed) {
String loadMoreRetry = getDomObject().getAttrs().getLoadMoreRetry();
if (loadMoreRetry == null) {
loadMoreRetry = mLoadMoreRetry;
[2/2] incubator-weex git commit: Merge branch
'0.11-dev-bugfix-scale-list-loadmoreoffset2' of
github.com:sospartan/incubator-weex into 0.11-dev This closes #8
Posted by so...@apache.org.
Merge branch '0.11-dev-bugfix-scale-list-loadmoreoffset2' of github.com:sospartan/incubator-weex into 0.11-dev
This closes #8
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/de8c25d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/de8c25d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/de8c25d9
Branch: refs/heads/0.11-dev
Commit: de8c25d9afa134013f29587d0643dcbf0c796e69
Parents: 6bbe707 1193f3b
Author: sospartan <so...@gmail.com>
Authored: Thu Mar 2 15:13:56 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Thu Mar 2 15:13:56 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------