diff --git a/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelper.java b/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelper.java index 774f1863..6873b62c 100644 --- a/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelper.java +++ b/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelper.java @@ -25,7 +25,6 @@ package com.alibaba.android.vlayout.layout; import android.graphics.Rect; -import android.support.v7.widget.OrientationHelper; import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; @@ -34,7 +33,6 @@ import com.alibaba.android.vlayout.LayoutManagerHelper; import com.alibaba.android.vlayout.OrientationHelperEx; -import com.alibaba.android.vlayout.Range; import com.alibaba.android.vlayout.VirtualLayoutManager; import com.alibaba.android.vlayout.VirtualLayoutManager.LayoutStateWrapper; @@ -346,7 +344,7 @@ private int handleOne(LayoutStateWrapper layoutState, LayoutChunkResult result, View view = mContentViews[0]; final ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams( - view.getLayoutParams()); + (ViewGroup.MarginLayoutParams) view.getLayoutParams()); if (!Float.isNaN(mAspectRatio)) { if (layoutInVertical) { @@ -394,10 +392,10 @@ private int handleTwo(LayoutStateWrapper layoutState, LayoutChunkResult result, final View child1 = mContentViews[0]; final ViewGroup.MarginLayoutParams lp1 = new ViewGroup.MarginLayoutParams( - child1.getLayoutParams()); + (ViewGroup.MarginLayoutParams)child1.getLayoutParams()); final View child2 = mContentViews[1]; final ViewGroup.MarginLayoutParams lp2 = new ViewGroup.MarginLayoutParams( - child2.getLayoutParams()); + (ViewGroup.MarginLayoutParams)child2.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1); @@ -506,14 +504,14 @@ private int handleThree(LayoutStateWrapper layoutState, LayoutChunkResult result final View child1 = mContentViews[0]; final ViewGroup.MarginLayoutParams lp1 = new ViewGroup.MarginLayoutParams( - child1.getLayoutParams()); + (ViewGroup.MarginLayoutParams)child1.getLayoutParams()); final View child2 = helper.getReverseLayout() ? mContentViews[2] : mContentViews[1]; final View child3 = helper.getReverseLayout() ? mContentViews[1] : mContentViews[2]; final ViewGroup.MarginLayoutParams lp2 = new ViewGroup.MarginLayoutParams( - child2.getLayoutParams()); + (ViewGroup.MarginLayoutParams)child2.getLayoutParams()); final ViewGroup.MarginLayoutParams lp3 = new ViewGroup.MarginLayoutParams( - child3.getLayoutParams()); + (ViewGroup.MarginLayoutParams)child3.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1); @@ -614,16 +612,16 @@ private int handleFour(LayoutStateWrapper layoutState, LayoutChunkResult result, final View child1 = mContentViews[0]; final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams( - child1.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child1.getLayoutParams()); final View child2 = helper.getReverseLayout() ? mContentViews[3] : mContentViews[1]; final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams( - child2.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child2.getLayoutParams()); final View child3 = mContentViews[2]; final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams( - child3.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child3.getLayoutParams()); final View child4 = helper.getReverseLayout() ? mContentViews[1] : mContentViews[3]; final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams( - child4.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child4.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1); @@ -738,19 +736,19 @@ private int handleFive(LayoutStateWrapper layoutState, LayoutChunkResult result, final View child1 = mContentViews[0]; final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams( - child1.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child1.getLayoutParams()); final View child2 = helper.getReverseLayout() ? mContentViews[4] : mContentViews[1]; final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams( - child2.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child2.getLayoutParams()); final View child3 = helper.getReverseLayout() ? mContentViews[3] : mContentViews[2]; final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams( - child3.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child3.getLayoutParams()); final View child4 = helper.getReverseLayout() ? mContentViews[2] : mContentViews[3]; final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams( - child4.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child4.getLayoutParams()); final View child5 = helper.getReverseLayout() ? mContentViews[1] : mContentViews[4]; final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams( - child5.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child5.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1); diff --git a/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelperEx.java b/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelperEx.java index 5a96cf19..07526ced 100644 --- a/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelperEx.java +++ b/vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelperEx.java @@ -25,7 +25,6 @@ package com.alibaba.android.vlayout.layout; import android.graphics.Rect; -import android.support.v7.widget.OrientationHelper; import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; @@ -230,19 +229,19 @@ private int handleFive(LayoutStateWrapper layoutState, LayoutChunkResult result, final View child1 = mChildrenViews[0]; final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams( - child1.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child1.getLayoutParams()); final View child2 = helper.getReverseLayout() ? mChildrenViews[4] : mChildrenViews[1]; final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams( - child2.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child2.getLayoutParams()); final View child3 = helper.getReverseLayout() ? mChildrenViews[3] : mChildrenViews[2]; final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams( - child3.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child3.getLayoutParams()); final View child4 = helper.getReverseLayout() ? mChildrenViews[2] : mChildrenViews[3]; final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams( - child4.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child4.getLayoutParams()); final View child5 = helper.getReverseLayout() ? mChildrenViews[1] : mChildrenViews[4]; final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams( - child5.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child5.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1); @@ -363,22 +362,22 @@ private int handSix(LayoutStateWrapper layoutState, LayoutChunkResult result, La final View child1 = mChildrenViews[0]; final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams( - child1.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child1.getLayoutParams()); final View child2 = helper.getReverseLayout() ? mChildrenViews[5] : mChildrenViews[1]; final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams( - child2.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child2.getLayoutParams()); final View child3 = helper.getReverseLayout() ? mChildrenViews[4] : mChildrenViews[2]; final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams( - child3.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child3.getLayoutParams()); final View child4 = helper.getReverseLayout() ? mChildrenViews[3] : mChildrenViews[3]; final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams( - child4.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child4.getLayoutParams()); final View child5 = helper.getReverseLayout() ? mChildrenViews[2] : mChildrenViews[4]; final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams( - child5.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child5.getLayoutParams()); final View child6 = helper.getReverseLayout() ? mChildrenViews[1] : mChildrenViews[5]; final VirtualLayoutManager.LayoutParams lp6 = new VirtualLayoutManager.LayoutParams( - child6.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child6.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1); @@ -524,25 +523,25 @@ private int handSeven(LayoutStateWrapper layoutState, LayoutChunkResult result, final View child1 = mChildrenViews[0]; final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams( - child1.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child1.getLayoutParams()); final View child2 = helper.getReverseLayout() ? mChildrenViews[6] : mChildrenViews[1]; final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams( - child2.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child2.getLayoutParams()); final View child3 = helper.getReverseLayout() ? mChildrenViews[5] : mChildrenViews[2]; final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams( - child3.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child3.getLayoutParams()); final View child4 = helper.getReverseLayout() ? mChildrenViews[4] : mChildrenViews[3]; final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams( - child4.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child4.getLayoutParams()); final View child5 = helper.getReverseLayout() ? mChildrenViews[3] : mChildrenViews[4]; final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams( - child5.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child5.getLayoutParams()); final View child6 = helper.getReverseLayout() ? mChildrenViews[2] : mChildrenViews[5]; final VirtualLayoutManager.LayoutParams lp6 = new VirtualLayoutManager.LayoutParams( - child6.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child6.getLayoutParams()); final View child7 = helper.getReverseLayout() ? mChildrenViews[1] : mChildrenViews[6]; final VirtualLayoutManager.LayoutParams lp7 = new VirtualLayoutManager.LayoutParams( - child7.getLayoutParams()); + (VirtualLayoutManager.LayoutParams)child7.getLayoutParams()); final float weight1 = getViewMainWeight(lp1, 0); final float weight2 = getViewMainWeight(lp1, 1);