YorkShen closed pull request #1421: * [Android] Fix invalid column count of
list/vlist/waterfall/recycler
URL: https://github.com/apache/incubator-weex/pull/1421
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
index 51b97718aa..b57c8ddf3d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
@@ -237,6 +237,7 @@
WX_RENDER_ERR_CONTAINER_TYPE("-9611", "WX_RENDER_ERR_CONTAINER_TYPE",
ErrorType.JS_ERROR,ErrorGroup.JS),
WX_RENDER_ERR_TRANSITION("-9616", "WX_RENDER_ERR_TRANSITION",
ErrorType.JS_ERROR, ErrorGroup.JS),
WX_RENDER_ERR_INSTANCE_ID_NULL("-9618", "WX_RENDER_ERR_INSTANCE_ID_NULL",
ErrorType.NATIVE_ERROR, ErrorGroup.NATIVE),
+ WX_RENDER_ERR_LIST_INVALID_COLUMN_COUNT("-9619",
"WX_RENDER_ERR_LIST_INVALID_COLUMNJ_CONUNT", ErrorType.JS_ERROR, ErrorGroup.JS),
/**
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
index 26c0bc4b4a..fba7adc200 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
@@ -18,20 +18,15 @@
*/
package com.taobao.weex.ui.component.list;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-
import android.content.Context;
+import android.support.v4.util.ArrayMap;
import android.support.v7.widget.PagerSnapHelper;
import android.text.TextUtils;
+import com.alibaba.fastjson.JSON;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.annotation.Component;
import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.common.WXThread;
import com.taobao.weex.ui.ComponentCreator;
import com.taobao.weex.ui.action.BasicComponentData;
@@ -45,8 +40,13 @@
import com.taobao.weex.ui.view.listview.WXRecyclerView;
import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder;
import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView;
+import com.taobao.weex.utils.WXExceptionUtils;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
/**
* Unlike other components, there is immutable bi-directional association
between View and
@@ -162,6 +162,15 @@ public void run() {
private void updateRecyclerAttr() {
mColumnCount =
WXUtils.parseInt(getAttrs().get(Constants.Name.COLUMN_COUNT));
+ if (mColumnCount <= 0) {
+ WXExceptionUtils.commitCriticalExceptionRT(getInstanceId(),
+ WXErrorCode.WX_RENDER_ERR_LIST_INVALID_COLUMN_COUNT, "columnCount",
+ String.format(Locale.ENGLISH,
+ "You are trying to set the list/recycler/vlist/waterfall's
column to %d, which is illeal. The column count should be a positive integer",
+ mColumnCount),
+ new ArrayMap<String, String>());
+ mColumnCount = Constants.Value.COLUMN_COUNT_NORMAL;
+ }
mColumnGap = WXUtils.parseFloat(getAttrs().get(Constants.Name.COLUMN_GAP));
mColumnWidth =
WXUtils.parseFloat(getAttrs().get(Constants.Name.COLUMN_WIDTH));
mPaddingLeft =
WXUtils.parseFloat(getAttrs().get(Constants.Name.PADDING_LEFT));
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
index d6ed4157e2..a6530577e9 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
@@ -18,6 +18,8 @@
*/
package com.taobao.weex.ui.component.list.template;
+import static com.taobao.weex.common.Constants.Name.LOADMOREOFFSET;
+
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.Point;
@@ -37,18 +39,17 @@
import android.view.ViewTreeObserver;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
-
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
-import com.taobao.weex.WXSDKManager;
import com.taobao.weex.annotation.Component;
import com.taobao.weex.annotation.JSMethod;
import com.taobao.weex.bridge.JSCallback;
import com.taobao.weex.common.Constants;
import com.taobao.weex.common.ICheckBindingScroller;
import com.taobao.weex.common.OnWXScrollListener;
+import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.common.WXThread;
import com.taobao.weex.dom.CSSShorthand;
import com.taobao.weex.dom.WXAttr;
@@ -74,19 +75,18 @@
import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter;
import com.taobao.weex.ui.view.listview.adapter.WXRecyclerViewOnScrollListener;
import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView;
+import com.taobao.weex.utils.WXExceptionUtils;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import static com.taobao.weex.common.Constants.Name.LOADMOREOFFSET;
-
/**
* weex template list supported, high performance recycler-list
* https://github.com/Hanks10100/weex-native-directive
@@ -929,6 +929,15 @@ public void setOffsetAccuracy(int accuracy) {
private void updateRecyclerAttr(){
mLayoutType = getAttrs().getLayoutType();
mColumnCount = getAttrs().getColumnCount();
+ if (mColumnCount <= 0) {
+ WXExceptionUtils.commitCriticalExceptionRT(getInstanceId(),
+ WXErrorCode.WX_RENDER_ERR_LIST_INVALID_COLUMN_COUNT,
"columnCount",
+ String.format(Locale.ENGLISH,
+ "You are trying to set the list/recycler/vlist/waterfall's
column to %d, which is illeal. The column count should be a positive integer",
+ mColumnCount),
+ new ArrayMap<String, String>());
+ mColumnCount = Constants.Value.COLUMN_COUNT_NORMAL;
+ }
mColumnGap = getAttrs().getColumnGap();
mColumnWidth = getAttrs().getColumnWidth();
mPaddingLeft = getPadding().get(CSSShorthand.EDGE.LEFT);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
