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/07 03:51:11 UTC
incubator-weex git commit: * [android] fix loadmoreoffset value in
scroller
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev e4e6355ba -> 95c7470f2
* [android] fix loadmoreoffset value in scroller
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/95c7470f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/95c7470f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/95c7470f
Branch: refs/heads/0.11-dev
Commit: 95c7470f269ec82a4ae44d5a291672b565fcfa9b
Parents: e4e6355
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 11:35:30 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 11:35:30 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXScroller.java | 4 ++--
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/95c7470f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 73aefdf..1be3e3e 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -855,15 +855,15 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
protected void onLoadMore(WXScrollView scrollView, int x, int y) {
try {
String offset = getDomObject().getAttrs().getLoadMoreOffset();
-
if (TextUtils.isEmpty(offset)) {
return;
}
+ int offsetInt = (int)WXViewUtils.getRealPxByWidth(Float.parseFloat(offset), WXSDKInstance.getViewPortWidth());
int contentH = scrollView.getChildAt(0).getHeight();
int scrollerH = scrollView.getHeight();
int offScreenY = contentH - y - scrollerH;
- if (offScreenY < Integer.parseInt(offset)) {
+ if (offScreenY < offsetInt) {
if (WXEnvironment.isApkDebugable()) {
WXLogUtils.d("[WXScroller-onScroll] offScreenY :" + offScreenY);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/95c7470f/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 1f8732d..a8aadb4 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
@@ -594,7 +594,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
smooth = WXUtils.getBoolean(options.get(Constants.Name.ANIMATED), true);
if (offsetStr != null) {
try {
- offsetFloat = WXViewUtils.getRealPxByWidth(Float.parseFloat(offsetStr), getInstance().getViewPortWidth());
+ offsetFloat = WXViewUtils.getRealPxByWidth(Float.parseFloat(offsetStr), WXSDKInstance.getViewPortWidth());
}catch (Exception e ){
WXLogUtils.e("Float parseFloat error :"+e.getMessage());
}