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

Author: luiing

README.md

@@ -9,7 +9,7 @@
 ![效果图](/pic/demo20.gif)
 
 ### Use
-    implementation 'com.uis:stacklayout:0.1.2'
+    implementation 'com.uis:stacklayout:0.2.0'
 
 *Name*| *Descript*|*Value*
   -----|--------|---
@@ -81,8 +81,7 @@ stackEdgeModel|层叠位置|left/right
                 stackViewLayout.setPosition(position+3);
             }
         });
-        stackViewLayout.setPosition(10);
-        //装载异步数据需要调用 stackViewLayout.notifyDataChanged();
+        stackViewLayout.setPosition(10);//指定位置
 ```
 
 ### Version
@@ -93,6 +92,7 @@ stackEdgeModel|层叠位置|left/right
 0.1.0|zoomX,zoomY呈等比数列|更改属性
 0.1.1|只有一条数据时|fixed
 0.1.2|增加动画、轮播时间设置，获取当前选中位置|新增方法
+0.2.0|只有一个元素，不支持轮播和滑动|新增功能
 
 ### Thanks
 

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

@@ -61,13 +61,21 @@ void bindLayout(StackLayout layout) {
         setAutoPlay(this.layout.stackLooper);
     }
 
+    int getItemCount(){
+        int cnt = 0;
+        if(layout != null && layout.getAdapter() != null){
+            cnt = layout.getAdapter().getItemCount();
+        }
+        return cnt;
+    }
+
     void unbindLayout() {
         setAutoPlay(false);
     }
 
     void measureChild(int width,int height){
         //log("measue...");
-        if(layout != null && layout.getAdapter() != null && layout.getAdapter().getItemCount() > 0 ){
+        if(getItemCount() > 0 ){
             int size = layout.getRealStackSize();
             if(originX.isEmpty()) {
                 float stackSpaces = 0;
@@ -305,7 +313,7 @@ void setAutoPlay(boolean looper){
             if(executor == null || executor.isShutdown()){
                 executor = new ScheduledThreadPoolExecutor(2);
             }
-            if(executor.getQueue().size() <= 0) {
+            if(executor.getQueue().size() <= 0 && getItemCount() > 1) {
                 executor.scheduleWithFixedDelay(new AutoRunnable(this), 2000, mDelay, TimeUnit.MILLISECONDS);
             }
         }else {
@@ -317,7 +325,7 @@ void setAutoPlay(boolean looper){
 
     /** 加入底层 */
     private void addBottomView(){
-        int cnt = layout.getAdapter().getItemCount();
+        int cnt = getItemCount();
         int stackSize = layout.getRealStackSize();
         displayPosition += 1;
         displayPosition %= cnt;
@@ -331,7 +339,7 @@ private void addBottomView(){
 
     /** 加入顶层 */
     private View addTopView(){
-        int cnt = layout.getAdapter().getItemCount();
+        int cnt = getItemCount();
         int position = displayPosition - 1;
         if(position < 0){
             position += cnt;
@@ -345,7 +353,7 @@ private View addTopView(){
 
     /** 移除底层 */
     private void removeBottomView(){
-        int cnt = layout.getAdapter().getItemCount();
+        int cnt = getItemCount();
         displayPosition -= 1;
         if(displayPosition < 0){
             displayPosition += cnt;
@@ -447,7 +455,7 @@ static class AutoRunnable implements Runnable{
 
         @Override
         public void run() {
-            if(helper.layout != null && helper.layout.getAdapter() != null && helper.layout.getChildCount() > 0){
+            if(helper.getItemCount() > 1 && helper.layout.getChildCount() > 0){
                 final StackLayout stack = helper.layout;
                 int[] points = new int[2];
                 stack.getLocationInWindow(points);

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

@@ -123,6 +123,7 @@ public void setStackLooper(boolean looper){
     public void setAdapter(StackAdapter adapter) {
         this.adapter = adapter;
         removeAllViewsInLayout();
+        notifyDataChanged();
     }
 
     public StackAdapter getAdapter(){
@@ -188,20 +189,24 @@ public boolean onTouchEvent(MotionEvent event) {
                 stackHelper.fingerTouchDown();
                 break;
             case MotionEvent.ACTION_MOVE:
-                if(stackHelper.canScroll(downX,downY,event.getX(),event.getY())) {
-                    int currentX = (int) event.getX();
-                    int dx = (int) (currentX - lastX);
-                    stackHelper.executeScroll(dx);
-                    lastX = currentX;
+                if(adapter != null && adapter.getItemCount() > 1) {
+                    if (stackHelper.canScroll(downX, downY, event.getX(), event.getY())) {
+                        int currentX = (int) event.getX();
+                        int dx = (int) (currentX - lastX);
+                        stackHelper.executeScroll(dx);
+                        lastX = currentX;
+                    }
                 }
                 break;
             case MotionEvent.ACTION_UP:
                 handleItemClicked();
             case MotionEvent.ACTION_CANCEL:
-                mVelocity.computeCurrentVelocity(1000, mMaximumVelocity);
-                int velocity = (int) mVelocity.getXVelocity();
-                stackHelper.releaseScroll(velocity);
-                recycleVelocityTracker();
+                if(adapter != null && adapter.getItemCount() > 1) {
+                    mVelocity.computeCurrentVelocity(1000, mMaximumVelocity);
+                    int velocity = (int) mVelocity.getXVelocity();
+                    stackHelper.releaseScroll(velocity);
+                    recycleVelocityTracker();
+                }
                 default:
         }
         return  true;