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 06:29:28 UTC
[1/4] incubator-weex git commit: * [android] add so checkSoIsValid
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 2895fe0ff -> 1da458e38
* [android] add so checkSoIsValid
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0255c35e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0255c35e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0255c35e
Branch: refs/heads/0.11-dev
Commit: 0255c35e9602a40dab2b0b783eeffe0bd5721fde
Parents: 95c7470
Author: zshshr <zh...@gmail.com>
Authored: Tue Mar 7 14:11:25 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Mar 7 14:11:25 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0255c35e/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index b64dd35..650c036 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -250,8 +250,8 @@ 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 = 3542844;
- 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;
@@ -284,6 +284,7 @@ public class WXSoInstallMgrSdk {
}
boolean InitSuc = false;
+ if (checkSoIsValid(libName, ARMEABI_Size) ||checkSoIsValid(libName, X86_Size)) {
/**
* Load library with {@link System#loadLibrary(String)}
@@ -331,6 +332,7 @@ public class WXSoInstallMgrSdk {
InitSuc = false;
e.printStackTrace();
}
+ }
return InitSuc;
}
[4/4] incubator-weex git commit: Merge branch
'0.11-dev-fix-list-scroller-loadmore-reset' of
github.com:sospartan/incubator-weex into 0.11-dev This closes #51
Posted by so...@apache.org.
Merge branch '0.11-dev-fix-list-scroller-loadmore-reset' of github.com:sospartan/incubator-weex into 0.11-dev
This closes #51
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1da458e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1da458e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1da458e3
Branch: refs/heads/0.11-dev
Commit: 1da458e38ce2fbf8ea95de4e6dc7e658f59d51f2
Parents: acaf30d a4fce67
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 14:29:07 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 14:29:07 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXScroller.java | 12 ++++--------
.../weex/ui/component/list/BasicListComponent.java | 12 ++++--------
2 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-weex git commit: Merge branch
'0.11-dev-checkSoIsValid' of http://github.com/zshshr/incubator-weex into
0.11-dev This closes #52
Posted by so...@apache.org.
Merge branch '0.11-dev-checkSoIsValid' of http://github.com/zshshr/incubator-weex into 0.11-dev
This closes #52
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/acaf30d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/acaf30d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/acaf30d9
Branch: refs/heads/0.11-dev
Commit: acaf30d91954a3bc956ad080ffe4e8a6869b487f
Parents: 2895fe0 0255c35
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 14:28:21 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 14:28:21 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-weex git commit: * [android] deprecate loadmoreretry
attribute
Posted by so...@apache.org.
* [android] deprecate loadmoreretry attribute
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a4fce670
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a4fce670
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a4fce670
Branch: refs/heads/0.11-dev
Commit: a4fce670a83f445fae0106ee05252255b834bad5
Parents: 95c7470
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 14:19:59 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 14:19:59 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXScroller.java | 12 ++++--------
.../weex/ui/component/list/BasicListComponent.java | 12 ++++--------
2 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a4fce670/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 1be3e3e..6a88831 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
@@ -260,7 +260,7 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
protected int mOrientation = Constants.Orientation.VERTICAL;
private List<WXComponent> mRefreshs=new ArrayList<>();
private int mChildrenLayoutOffset = 0;//Use for offset children layout
- private String mLoadMoreRetry = "";
+ private boolean mForceLoadmoreNextTime = false;
private int mOffsetAccuracy = 10;
private Point mLastReport = new Point(-1, -1);
@@ -867,14 +867,10 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
if (WXEnvironment.isApkDebugable()) {
WXLogUtils.d("[WXScroller-onScroll] offScreenY :" + offScreenY);
}
- String loadMoreRetry = getDomObject().getAttrs().getLoadMoreRetry();
- if (loadMoreRetry == null) {
- loadMoreRetry = mLoadMoreRetry;
- }
- if (mContentHeight != contentH || !mLoadMoreRetry.equals(loadMoreRetry)) {
+ if (mContentHeight != contentH || mForceLoadmoreNextTime) {
fireEvent(Constants.Event.LOADMORE);
mContentHeight = contentH;
- mLoadMoreRetry = loadMoreRetry;
+ mForceLoadmoreNextTime = false;
}
}
} catch (Exception e) {
@@ -885,6 +881,6 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
@JSMethod
public void resetLoadmore() {
- mLoadMoreRetry = "";
+ mForceLoadmoreNextTime = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a4fce670/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 a8aadb4..fbbb5b7 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
@@ -271,7 +271,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
public static final String LOADMOREOFFSET = "loadmoreoffset";
private String TAG = "BasicListComponent";
private int mListCellCount = 0;
- private String mLoadMoreRetry = "";
+ private boolean mForceLoadmoreNextTime = false;
private ArrayList<ListBaseViewHolder> recycleViewList = new ArrayList<>();
private static final Pattern transformPattern = Pattern.compile("([a-z]+)\\(([0-9\\.]+),?([0-9\\.]+)?\\)");
@@ -1152,16 +1152,12 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
float offsetParsed = WXViewUtils.getRealPxByWidth(Integer.parseInt(offset),WXSDKInstance.getViewPortWidth());
if (offScreenY < offsetParsed) {
- String loadMoreRetry = getDomObject().getAttrs().getLoadMoreRetry();
- if (loadMoreRetry == null) {
- loadMoreRetry = mLoadMoreRetry;
- }
if (mListCellCount != mChildren.size()
- || mLoadMoreRetry == null || !mLoadMoreRetry.equals(loadMoreRetry)) {
+ || mForceLoadmoreNextTime) {
fireEvent(Constants.Event.LOADMORE);
mListCellCount = mChildren.size();
- mLoadMoreRetry = loadMoreRetry;
+ mForceLoadmoreNextTime = false;
}
}
} catch (Exception e) {
@@ -1226,7 +1222,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
@JSMethod
public void resetLoadmore() {
- mLoadMoreRetry = "";
+ mForceLoadmoreNextTime = true;
mListCellCount = 0;
}