Merge branch 'master' of https://github.com/luiing/StackViewLayout

Author: luiing

README.md

@@ -13,7 +13,7 @@
 <li>注释：此图解释参数意义，展示效果不太精确，图片真实宽度为**上层橙色**
 
 ### Use
-    implementation 'com.uis:stacklayout:0.3.0'
+    implementation 'com.uis:stacklayout:0.3.1'
 
 *Name*| *Descript*|*Value*
   -----|--------|---
@@ -94,6 +94,7 @@ stackEdgeModel|层叠位置|left/right
 0.2.0|只有一个元素，不支持轮播和滑动|新增功能
 0.2.1|减少child层级,见child.measure()|新增功能
 0.3.0|增加联动效果（缩放+平移）|新增功能
+0.3.1|联动动画平滑过度|fixed
 
 ### License
 

build.gradle

@@ -4,8 +4,8 @@ buildscript {
 
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        google()
         jcenter()
-	    google()
     }
 
     dependencies {
@@ -18,8 +18,8 @@ buildscript {
 allprojects {
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        google()
         jcenter()
-	    google()
     }
 }
 

demo/src/main/java/com/uis/stackview/demo/activity/MainActivity.java

@@ -83,7 +83,7 @@ protected void onCreate(Bundle savedInstanceState) {
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setAdapter(new StackAdapter());
         //stackViewLayout.setStackLooper(true);
-        stackViewLayout.setPosition(10);
+        //stackViewLayout.setPosition(10);
         stackViewLayout.setAdapter(new StackLayout.StackAdapter() {
             @Override
             public View onCreateView(ViewGroup parent) {
@@ -103,7 +103,7 @@ public void onBindView(View view, int position) {
 
             @Override
             public int getItemCount() {
-                return dataList.size();
+                return 5;//dataList.size();
             }
 
             @Override
@@ -114,8 +114,8 @@ public void onItemDisplay(int position) {
             @Override
             public void onItemClicked(int position) {
                 Log.e("xx","clicked = " + position);
-                stackViewLayout.setStackLooper(false);
-                stackViewLayout.setPosition(position+3);
+                //stackViewLayout.setStackLooper(false);
+                //stackViewLayout.setPosition(position+3);
             }
         });
     }

demo/src/main/res/layout/activity_main.xml

@@ -11,7 +11,7 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="100dp"
         android:clipChildren="true"
         android:clipToPadding="false"
         android:paddingRight="80dp"

stacklayout/src/main/java/com/uis/stackview/StackHelper.java

@@ -127,14 +127,13 @@ void layoutChild(){
                     }
                     view.setPivotX(pivot);
                     view.setPivotY(everyHeight/2f);
-                    if(mAnimator.isRunning() && i > 0){
-
-                    }else{
-                        view.layout(left, top, right, bottom);
-                        view.setScaleY((float) Math.pow(layout.stackZoomY,stackSize-1-i));
+                    if(!mAnimator.isRunning() ||  0 == i){
+                        float scale = (float) Math.pow(layout.stackZoomY,stackSize-1-i);
+                        view.setScaleY(scale);
                         view.setTranslationX(0);
+                        view.layout(left, top, right, bottom);
                     }
-                }else if(!isTopRemove){//顶层加入
+                }else if(!isTopRemove && !mAnimator.isRunning()){//顶层加入
                     if (layout.stackEdgeModel == MODEL_LEFT) {
                         left = layout.getWidth() - layout.stackEdge;
                         right = everyWidth + left;
@@ -191,6 +190,8 @@ private View getStackView(){
             item = weakViews.removeLast();
             view = item.get();
             if(view != null){
+                view.setTranslationX(0);
+                view.setScaleY(1f);
                 break;
             }
         }
@@ -205,8 +206,6 @@ private View getStackView(){
     private void removeStackView(View view){
         if(view != null && layout != null) {
             layout.removeView(view);
-            view.setTranslationX(0);
-            view.setScaleY(1f);
             weakViews.add(new WeakReference<>(view));
         }
     }
@@ -227,7 +226,7 @@ boolean canScroll(float downX, float downY, float x, float y){
                 // 垂直滑动
             }
         }
-        return enableScroll;
+        return enableScroll && !mAnimator.isRunning();
     }
 
     void fingerTouchDown(){
@@ -261,19 +260,23 @@ void executeScroll(int dx) {
     }
 
     void scaleTransChild(int dx){
-        int first = layout.getChildCount()>layout.stackSize ? 1 : 0;
-        int size = layout.getChildCount()-1;
-        int stackSize = layout.stackSize;
-        for(int i = first; i<size; i++){
+        int cnt = layout.getChildCount();
+        int stackSize = layout.getRealStackSize();
+        int size = Math.min(cnt,stackSize)-(cnt==stackSize ? 1:0);
+        int first = cnt > stackSize ? 1 : 0;
+        int index = 0;
+        for (int i = first; i < size; i++) {
             View v = layout.getChildAt(i);
             int sign = MODEL_LEFT == layout.stackEdgeModel ? 1 : -1;
-            float rate = 1f*dx/layout.getWidth();
-            int tx = originX.get(i-first+1)-originX.get(i-first);
-            v.setTranslationX(v.getTranslationX() + rate*tx);
-
-            double scaley = Math.pow(layout.stackZoomY,stackSize-2-i);
-            double scale = Math.pow(layout.stackZoomY,stackSize-1-i);
-            v.setScaleY(v.getScaleY()+(float)(sign*rate*(scaley-scale)));
+            float rate = 1f * dx / layout.getWidth();
+            int indexX = index;
+            int tx =  originX.get( indexX+1) - originX.get(indexX);
+            v.setTranslationX(v.getTranslationX() + rate * tx);
+            int indexY = size - index;
+            double scaley = Math.pow(layout.stackZoomY, indexY - 1);
+            double scale = Math.pow(layout.stackZoomY, indexY);
+            v.setScaleY(v.getScaleY() + (float) (sign * rate * (scaley - scale)));
+            index++;
         }
     }
 
@@ -340,8 +343,8 @@ private void addBottomView(){
         int index = (stackSize - 1 + displayPosition) % cnt;
         View view = getStackView();
         layout.getAdapter().onBindView(view, index);
-        needRelayout = true;
         layout.addView(view, 0);
+        needRelayout = true;
         layout.getAdapter().onItemDisplay(displayPosition);
     }
 
@@ -354,8 +357,8 @@ private View addTopView(){
         }
         View view = getStackView();
         layout.getAdapter().onBindView(view, position);
-        needRelayout = true;
         layout.addView(view);
+        needRelayout = true;
         return view;
     }
 
@@ -366,7 +369,6 @@ private void removeBottomView(){
         if(displayPosition < 0){
             displayPosition += cnt;
         }
-        //needRelayout = true;
         View view = layout.getChildAt(0);
         removeStackView(view);
         layout.getAdapter().onItemDisplay(displayPosition);
@@ -381,9 +383,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
         scaleTransChild((int)(mAnimator.getTranslationX()-lastValue));
         if (fraction >= 1.0f) {
             mAnimator.endAnimator(this);
-            needRelayout = true;
             layout.requestLayout();
-
+            needRelayout = true;
         } else if(fraction > 0.2 && mAnimator.needAddBottomView()){
             addBottomView();
         }
@@ -437,13 +438,15 @@ void setTranslationX(float value){
         }
 
         void startAnimator(boolean needRemoveTop,boolean needAddBottom,float transX, ValueAnimator.AnimatorUpdateListener listener){
-            int mills = needAddBottom ? duration : (int)(1.2*duration*Math.abs(transX)/mWidth);
-            needAddBottomView = needAddBottom;
-            needRemoveTopView = needRemoveTop;
-            animator = ValueAnimator.ofFloat(0f, transX).setDuration(mills);
-            animator.setInterpolator(needAddBottom ? interpolatorAuto : interpolator);
-            animator.addUpdateListener(listener);
-            animator.start();
+            if(animator == null) {
+                int mills = needAddBottom ? duration : (int) (1.2 * duration * Math.abs(transX) / mWidth);
+                needAddBottomView = needAddBottom;
+                needRemoveTopView = needRemoveTop;
+                animator = ValueAnimator.ofFloat(0f, transX).setDuration(mills);
+                animator.setInterpolator(needAddBottom ? interpolatorAuto : interpolator);
+                animator.addUpdateListener(listener);
+                animator.start();
+            }
         }
 
         void cancelAnimator(){