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

Author: luiing

README.md

@@ -1,7 +1,23 @@
 # StackViewLayout
-**An swip StackViewLayout,support left and right.**
+**A swipe ViewGroup that supports left and right slide.**
 
-**层叠随手势滑动，带轮播自定义ViewGroup**
+**层叠View支持手势左右滑动，自动轮播，过渡动画**
+
+1.onMeasure通过StackAdapter适配器取到itemView加入到StackLayaout容器
+  
+  onMeasure() through stackAdapter add view to StackLayout
+
+2.onLayout取到childView按照层叠布局
+
+  onLayout() get child view layout stack ui
+
+3.onInterceptTouchEvent处理手势支持子View及Velocity
+
+  onInterceptTouchEvent() support child view gesture
+
+4.onTouchEvent处理手势，释放后播放动画平滑过渡
+
+  onTouchEvent() swipe animation,when release recover animation
 
 ### Captures
 
@@ -13,19 +29,19 @@
 <li>注释：此图解释参数意义，展示效果不太精确，图片真实宽度为**上层橙色**
 
 ### Use
-    implementation 'com.uis:stacklayout:0.3.1'
+    implementation 'com.uis:stacklayout:0.3.4'
 
 *Name*| *Descript*|*Value*
   -----|--------|---
-stackSpace|间距|默认值：10dp
-stackEdge|边界距离|默认值：10dp
-stackZoomX|x方向缩放| 0<x<=1,1表示等间距，默认值：1
-stackPadX|x方向偏移|表示偏移间距,默认值：0
+stackSpace|间距(space)|默认值(default)：10dp
+stackEdge|边界距离(edge)|默认值(default)：10dp
+stackZoomX|x方向缩放(x zoom)| 0<x<=1,1表示等间距，默认值(default)：1
+stackPadX|x方向偏移(x padding)|表示偏移间距,默认值：0
 stackPadX|PadX*(Size-1) < Space|PadX优先级高于ZoomX
-stackZoomY|y方向缩放| 0<y<=1,1表示和顶层等高度，默认值：0.9
-stackLooper|自动轮播|false/true
-stackSize|层叠数量|3
-stackEdgeModel|层叠位置|left/right
+stackZoomY|y方向缩放(y zoom)| 0<y<=1,1表示和顶层等高度，默认值：0.9
+stackLooper|自动轮播(looper)|false/true
+stackSize|层叠数量(stack size)|3
+stackEdgeModel|层叠位置(stack model)|left/right
 
 ```
     <?xml version="1.0" encoding="utf-8"?>
@@ -86,15 +102,18 @@ stackEdgeModel|层叠位置|left/right
 ### Version
 *Version*| *Descript*|*Fixed*
 ----|----|----
-0.0.1|自动轮播，滑动从顶部移除，整体上浮|初始版本
-0.0.2|滑动从顶层加入，整体下沉|fixed 内部view点击事件
-0.1.0|zoomX,zoomY呈等比数列|更改属性
-0.1.1|只有一条数据时|fixed
-0.1.2|增加动画、轮播时间设置，获取当前选中位置|新增方法
-0.2.0|只有一个元素，不支持轮播和滑动|新增功能
-0.2.1|减少child层级,见child.measure()|新增功能
-0.3.0|增加联动效果（缩放+平移）|新增功能
-0.3.1|联动动画平滑过度|fixed
+0.0.1|自动轮播，滑动从顶部移除，整体上浮|support auto looper and animation
+0.0.2|滑动从顶层加入，整体下沉|fixed child view clicked event
+0.1.0|zoomX,zoomY呈等比数列|modify attribute
+0.1.1|只有一条数据时|fixed adapter itemSize=1
+0.1.2|增加动画、轮播时间设置，获取当前选中位置|add animation,looper time
+0.2.0|只有一个元素，不支持轮播和滑动|only one child,can't swipe
+0.2.1|减少child层级,见child.measure()|child.measure() opt
+0.3.0|增加联动效果（缩放+平移）|support whole animation
+0.3.1|联动动画平滑过度|fixed animation smooth
+0.3.2|联动动画去抖动及adapter数据更新会多出层|opt animation shake
+0.3.3|adapter数据更新ui展示错误|opt adapter changed display
+0.3.4|滑动促发item点击事件|fixed item clicked event
 
 ### License
 

demo/build.gradle

@@ -29,6 +29,7 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation "androidx.viewpager:viewpager:${androidx}"
-    implementation 'com.facebook.fresco:fresco:1.11.0'
+    implementation 'com.facebook.fresco:fresco:2.0.0'
+    implementation 'com.huxq17.xrefreshview:xrefreshview:3.6.9'
     implementation project(':stacklayout')
 }

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

@@ -1,44 +1,26 @@
 package com.uis.stackview.demo.activity;
 
-import android.content.Intent;
 import android.graphics.Color;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Toast;
 
+import com.andview.refreshview.XRefreshView;
+import com.andview.refreshview.utils.LogUtils;
 import com.facebook.common.logging.FLog;
-import com.facebook.common.logging.LoggingDelegate;
 import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.drawee.interfaces.DraweeController;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
-import com.google.gson.Gson;
-import com.uis.stackview.StackLayout;
 import com.uis.stackview.demo.R;
 import com.uis.stackview.demo.entity.ItemEntity;
 import java.util.List;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.WindowManager;
 import androidx.viewpager.widget.ViewPager;
 
-/**
- * Created by xmuSistone on 2017/5/12.
- */
-public class MainActivity extends AppCompatActivity implements View.OnClickListener{
-
-    private RecyclerView recyclerView;
-    private StackLayout stackViewLayout;
-    List<ItemEntity> dataList;
+public class MainActivity extends AppCompatActivity{
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,101 +36,45 @@ protected void onCreate(Bundle savedInstanceState) {
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
             }
         }
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         if(Build.VERSION.SDK_INT >= 19){
             ViewGroup.LayoutParams params = findViewById(R.id.view).getLayoutParams();
             params.height = getResources().getDimensionPixelSize(R.dimen.status_height);
         }
         FLog.setMinimumLoggingLevel(FLog.VERBOSE);
+        LogUtils.enableLog(false);
         if(!Fresco.hasBeenInitialized()) {
             ImagePipelineConfig config = ImagePipelineConfig.newBuilder(getApplicationContext())
                     .setDiskCacheEnabled(true)
                     .setDownsampleEnabled(true)
                     .build();
             Fresco.initialize(getApplicationContext(), config);
         }
-        recyclerView = findViewById(R.id.recyclerView);
-        stackViewLayout = findViewById(R.id.stacklayout);
-        findViewById(R.id.bt_web).setOnClickListener(this);
-        findViewById(R.id.bt_app).setOnClickListener(this);
-
-        dataList = StackAdapter.initDataList(this);
-        ViewPager viewPager = findViewById(R.id.viewPager);
-        ViewPagerAdapter adapter = new ViewPagerAdapter(dataList);
-        viewPager.setAdapter(adapter);
-        viewPager.setCurrentItem(adapter.getRealSize());
-
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.setAdapter(new StackAdapter());
-        //stackViewLayout.setStackLooper(true);
-        //stackViewLayout.setPosition(10);
-        stackViewLayout.setAdapter(new StackLayout.StackAdapter() {
-            @Override
-            public View onCreateView(ViewGroup parent) {
-                return LayoutInflater.from(parent.getContext()).inflate(R.layout.item_fresco_layout,null);
-            }
-
-            @Override
-            public void onBindView(View view, int position) {
-                SimpleDraweeView dv = view.findViewById(R.id.imageView);
-                DraweeController controller = Fresco.newDraweeControllerBuilder()
-                        .setUri(Uri.parse(dataList.get(position).getMapImageUrl()))
-                        .setTapToRetryEnabled(true)
-                        .setOldController(dv.getController())
-                        .build();
-                dv.setController(controller);
-            }
 
-            @Override
-            public int getItemCount() {
-                return 5;//dataList.size();
-            }
-
-            @Override
-            public void onItemDisplay(int position) {
-                Log.e("xx","display = " + position);
-            }
+        final List<ItemEntity> dataList = StackAdapter.initDataList(this);
+        final StackAdapter stackAdapter = new StackAdapter();
+        final RecyclerView recyclerView = findViewById(R.id.recyclerView);
+        final XRefreshView freshView = findViewById(R.id.refreshView);
 
+        freshView.setAutoLoadMore(false);
+        freshView.setSilenceLoadMore(false);
+        freshView.setXRefreshViewListener(new XRefreshView.SimpleXRefreshListener(){
             @Override
-            public void onItemClicked(int position) {
-                Log.e("xx","clicked = " + position);
-                //stackViewLayout.setStackLooper(false);
-                //stackViewLayout.setPosition(position+3);
+            public void onRefresh(boolean isPullDown) {
+                freshView.stopRefresh();
+                stackAdapter.dataList = dataList.subList(0,6);
+                stackAdapter.notifyDataSetChanged();
             }
         });
-    }
 
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()){
-            case R.id.bt_app:
-                updateApp();
-                break;
-            case R.id.bt_web:
-                updateWeb();
-                break;
-                default:
-        }
-    }
 
-    void updateWeb(){//"http://app.qq.com/#id=detail&appid=1104844480");//
-        Uri uri = Uri.parse(String.format("http://a.app.qq.com/o/simple.jsp?pkgname=%s","cn.com.bailian.bailianmobile"));
-        Intent it = new Intent(Intent.ACTION_VIEW, uri);
-        startActivity(it);
-    }
+        ViewPager viewPager = findViewById(R.id.viewPager);
+        ViewPagerAdapter adapter = new ViewPagerAdapter(dataList);
+        viewPager.setAdapter(adapter);
+        viewPager.setCurrentItem(adapter.getRealSize());
 
-    void updateApp(){
-        try {
-            Uri uri = Uri.parse(String.format("market://details?id=%s", "cn.com.bailian.bailianmobile"));
-            Intent it = new Intent(Intent.ACTION_VIEW, uri);
-            it.setPackage("com.tencent.android.qqdownloader");//com.tencent.android.qqdownloader com.huawei.appmarket
-            it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(it);
-        }catch (Exception ex){
-            ex.printStackTrace();
-            Toast.makeText(this,"应用宝未安装",Toast.LENGTH_SHORT).show();
-        }
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        recyclerView.setAdapter(stackAdapter);
     }
 }

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

@@ -5,26 +5,22 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.Toast;
-
 import com.bumptech.glide.Glide;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.uis.stackview.demo.R;
 import com.uis.stackview.demo.entity.ItemEntity;
 import com.uis.stackview.StackLayout;
-
 import org.json.JSONArray;
 import org.json.JSONObject;
-
 import java.io.InputStream;
 import java.util.ArrayList;
-
+import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class StackAdapter extends RecyclerView.Adapter<StackAdapter.StackVH> {
 
-    ArrayList<ItemEntity> dataList;
+    List<ItemEntity> dataList;
 
     @NonNull
     @Override
@@ -47,7 +43,7 @@ public int getItemViewType(int position) {
 
     @Override
     public int getItemCount() {
-        return 100;
+        return 10;
     }
 
     public static ArrayList<ItemEntity> initDataList(Context context) {
@@ -83,40 +79,48 @@ public static class ViewHolder {
 
     static class StackVH extends RecyclerView.ViewHolder{
         StackLayout stackLayout;
-        public StackVH(boolean left,ViewGroup parent) {
-            super(LayoutInflater.from(parent.getContext()).inflate(
-                    left ? R.layout.stack_left : R.layout.stack_right,parent,false));
-            stackLayout = itemView.findViewById(R.id.stacklayout);
-        }
+        List<ItemEntity> stackData = new ArrayList<>();
+        StackLayout.StackAdapter adapter = new StackLayout.StackAdapter() {
 
-        public void binderVH(final ArrayList<ItemEntity> dataList){
-            stackLayout.setAdapter(new StackLayout.StackAdapter() {
+            @Override
+            public View onCreateView(ViewGroup parent) {
+                return LayoutInflater.from(parent.getContext()).inflate(R.layout.item_layout,parent,false);
+            }
 
-                @Override
-                public View onCreateView(ViewGroup parent) {
-                    return LayoutInflater.from(parent.getContext()).inflate(R.layout.item_layout,parent,false);
+            @Override
+            public void onBindView(View view, int position) {
+                ImageView imageView = view.findViewById(R.id.imageView);
+                try{
+                    Glide.with(view.getContext()).load(stackData.get(position).getMapImageUrl()).into(imageView);
+                }catch (Exception ex){
+                    ex.printStackTrace();
                 }
+            }
 
-                @Override
-                public void onBindView(View view, int position) {
-                    ImageView imageView = view.findViewById(R.id.imageView);
-                    try{
-                        Glide.with(view.getContext()).load(dataList.get(position).getMapImageUrl()).into(imageView);
-                    }catch (Exception ex){
-                        ex.printStackTrace();
-                    }
-                }
+            @Override
+            public int getItemCount() {
+                return stackData.size();
+            }
 
-                @Override
-                public int getItemCount() {
-                    return dataList.size();
-                }
+            @Override
+            public void onItemDisplay(int position) {
 
-                @Override
-                public void onItemDisplay(int position) {
+            }
+        };
 
-                }
-            });
+        public StackVH(boolean left,ViewGroup parent) {
+            super(LayoutInflater.from(parent.getContext()).inflate(
+                    left ? R.layout.stack_left : R.layout.stack_right,parent,false));
+            stackLayout = itemView.findViewById(R.id.stacklayout);
+        }
+
+        public void binderVH(final List<ItemEntity> dataList){
+            stackData = dataList;
+            if(stackLayout.getAdapter() == null) {
+                stackLayout.setAdapter(adapter);
+            }else{
+                stackLayout.notifyDataChanged();
+            }
         }
     }
 }

demo/src/main/java/com/uis/stackview/demo/entity/ItemEntity.java

@@ -2,10 +2,6 @@
 
 import org.json.JSONObject;
 
-/**
- * Created by xmuSistone on 2017/5/12.
- */
-
 public class ItemEntity {
 
     private String country;