* [android] fix waterfall crash

apache · Jul 21, 2017 · 4ba3101 · 4ba3101
1 parent c0f99ea
commit 4ba3101
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
@@ -91,10 +91,14 @@ public void preCalculateCellWidth(){
             } else if (Constants.Value.AUTO != mColumnWidth && Constants.Value.AUTO == mColumnCount) {
                 mColumnCount = Math.round((mAvailableWidth + mColumnGap) / (mColumnWidth + mColumnGap)-0.5f);
                 mColumnCount = mColumnCount > 0 ? mColumnCount :1;
+                if (mColumnCount <= 0)
+                    mColumnCount = Constants.Value.COLUMN_COUNT_NORMAL;
                 mColumnWidth =((mAvailableWidth + mColumnGap) / mColumnCount) - mColumnGap;
             } else if(Constants.Value.AUTO != mColumnWidth && Constants.Value.AUTO != mColumnCount){
                 int columnCount = Math.round((mAvailableWidth + mColumnGap) / (mColumnWidth + mColumnGap)-0.5f);
                 mColumnCount = columnCount > mColumnCount ? mColumnCount :columnCount;
+                if (mColumnCount <= 0)
+                    mColumnCount = Constants.Value.COLUMN_COUNT_NORMAL;
                 mColumnWidth= ((mAvailableWidth + mColumnGap) / mColumnCount) - mColumnGap;
             }
             mIsPreCalculateCellWidth = true;

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
@@ -90,6 +90,14 @@ public void addChild(WXComponent child, int index) {
       return;
     }
     setRefreshOrLoading(child);
+
+    // Synchronize DomObject's attr to Component and Native View
+    if(mDomObject.getColumnWidth() != mColumnWidth ||
+            mDomObject.getColumnCount() != mColumnCount ||
+            mDomObject.getColumnGap() != mColumnGap) {
+      updateRecyclerAttr();
+      getHostView().getInnerView().initView(getContext(), mLayoutType,mColumnCount,mColumnGap,getOrientation());
+    }
   }