修复下拉刷新在数据很少的时候显示的问题

burgessjp · Nov 26, 2013 · 41e4ccc · 41e4ccc
1 parent 20666d1
commit 41e4ccc
Show file tree

Hide file tree

Showing 65 changed files with 78 additions and 106 deletions.
diff --git a/AndBase/bin/andbase.jar b/AndBase/bin/andbase.jar
diff --git a/AndBase/bin/classes/com/ab/view/pullview/AbListViewFooter.class b/AndBase/bin/classes/com/ab/view/pullview/AbListViewFooter.class
diff --git a/AndBase/bin/classes/com/ab/view/pullview/AbMultiColumnListView.class b/AndBase/bin/classes/com/ab/view/pullview/AbMultiColumnListView.class
diff --git a/AndBase/bin/classes/com/ab/view/pullview/AbPullGridView$1.class b/AndBase/bin/classes/com/ab/view/pullview/AbPullGridView$1.class
diff --git a/AndBase/bin/classes/com/ab/view/pullview/AbPullGridView.class b/AndBase/bin/classes/com/ab/view/pullview/AbPullGridView.class
diff --git a/AndBase/bin/classes/com/ab/view/pullview/AbPullListView$1.class b/AndBase/bin/classes/com/ab/view/pullview/AbPullListView$1.class
diff --git a/AndBase/bin/classes/com/ab/view/pullview/AbPullListView.class b/AndBase/bin/classes/com/ab/view/pullview/AbPullListView.class
diff --git a/AndBase/bin/jarlist.cache b/AndBase/bin/jarlist.cache
diff --git a/AndBase/src/com/ab/view/pullview/AbListViewFooter.java b/AndBase/src/com/ab/view/pullview/AbListViewFooter.java
@@ -89,21 +89,23 @@ public AbListViewFooter(Context context, AttributeSet attrs) {
 	 */
 	public void setState(int state) {
 
-		footerView.setVisibility(View.VISIBLE);
-
 		if (state == STATE_READY) {
+			footerView.setVisibility(View.VISIBLE);
 			footerTextView.setVisibility(View.VISIBLE);
 			footerProgressBar.setVisibility(View.GONE);
 			footerTextView.setText("载入更多");
 		} else if (state == STATE_LOADING) {
+			footerView.setVisibility(View.VISIBLE);
 			footerTextView.setVisibility(View.VISIBLE);
 			footerProgressBar.setVisibility(View.VISIBLE);
 			footerTextView.setText("正在加载...");
 		}else if(state == STATE_NO){
+			footerView.setVisibility(View.GONE);
 			footerTextView.setVisibility(View.VISIBLE);
 			footerProgressBar.setVisibility(View.GONE);
 			footerTextView.setText("已是全部");
 		}else if(state == STATE_EMPTY){
+			footerView.setVisibility(View.GONE);
 			footerTextView.setVisibility(View.GONE);
 			footerProgressBar.setVisibility(View.GONE);
 			footerTextView.setText("没有数据");

diff --git a/AndBase/src/com/ab/view/pullview/AbMultiColumnListView.java b/AndBase/src/com/ab/view/pullview/AbMultiColumnListView.java
@@ -94,7 +94,9 @@ public class AbMultiColumnListView extends AbMultiColumnBaseListView implements
 	/** The Constant OFFSET_RADIO. */
 	private final static float OFFSET_RADIO = 1.8f; // support iOS like pull
 													// feature.
-
+	/**上一次的数量*/
+	private int count = 0;
+
 	/**
 	 * Instantiates a new ab multi column list view.
 	 *
@@ -140,8 +142,6 @@ private void initWithContext(Context context) {
 
 		mFooterViewHeight= mFooterView.getFooterHeight();
 
-		mFooterView.hide();
-
 	}
 
 	/**
@@ -219,15 +219,16 @@ public void stopRefresh() {
 	/**
 	 * stop load more, reset footer view.
 	 *
-	 * @param more the more
 	 */
-	public void stopLoadMore(boolean more) {
+	public void stopLoadMore() {
+		mFooterView.hide();
 		if (mPullLoading == true) {
 			mPullLoading = false;
 			mFooterView.setState(AbListViewFooter.STATE_READY);
 		}
+		int countNew = mAdapter.getCount();
 		//判断有没有更多数据了
-		if(more){
+		if(countNew > count){
 			mFooterView.setState(AbListViewFooter.STATE_READY);
 		}else{
 			mFooterView.setState(AbListViewFooter.STATE_NO);
@@ -293,6 +294,7 @@ private void updateFooterHeight(float delta) {
 	 * Start load more.
 	 */
 	private void startLoadMore() {
+		mFooterView.show();
 		mPullLoading = true;
 		mFooterView.setState(AbListViewFooter.STATE_LOADING);
 		if (mListViewListener != null) {
@@ -323,8 +325,8 @@ public boolean onTouchEvent(MotionEvent ev) {
 			mLastY = ev.getRawY();
 			if (getFirstVisiblePosition() == 0 && (mHeaderView.getVisiableHeight() > 0 || deltaY > 0)) {
 				updateHeaderHeight(deltaY / OFFSET_RADIO);
-			} else if (getLastVisiblePosition() == mTotalItemCount - 1 && mFooterView.getVisiableHeight() < mFooterViewHeight) {
-				updateFooterHeight(-deltaY / OFFSET_RADIO);
+			} else if (getLastVisiblePosition() == mTotalItemCount - 1 && deltaY < 0) {
+				startLoadMore();
 			}
 			break;
 		case MotionEvent.ACTION_UP:
@@ -341,11 +343,6 @@ public boolean onTouchEvent(MotionEvent ev) {
 				}
 				//根据mPullRefreshing判断显示的header
 				resetHeaderHeight();
-			} else if (getLastVisiblePosition() == mTotalItemCount - 1) {
-				// invoke load more.
-				if (mEnablePullLoad &&  mFooterView.getVisiableHeight() > mFooterViewHeight-2) {
-					startLoadMore();
-				}
 			}
 			break;
 		default:

diff --git a/AndBase/src/com/ab/view/pullview/AbPullGridView.java b/AndBase/src/com/ab/view/pullview/AbPullGridView.java
@@ -93,6 +93,9 @@ public class AbPullGridView extends AbBaseGridView implements OnScrollListener,O
 	/** 外层是否可滚动. */
 	private boolean childScrollState = false;
 
+	/**上一次的数量*/
+	private int count = 0;
+
 	/**
 	 * Instantiates a new ab pull view.
 	 *
@@ -230,14 +233,16 @@ private void startLoadMore() {
 	 *
 	 * @param more the more
 	 */
-	public void stopLoadMore(boolean more) {
+	public void stopLoadMore() {
 		mFooterView.hide();
 		if (mPullLoading == true) {
 			mPullLoading = false;
 			mFooterView.setState(AbListViewFooter.STATE_READY);
 		}
 		//判断有没有更多数据了
-		if(more){
+		int countNew = mAdapter.getCount();
+
+		if(countNew > count){
 			mFooterView.setState(AbListViewFooter.STATE_READY);
 		}else{
 			mFooterView.setState(AbListViewFooter.STATE_NO);
@@ -313,7 +318,6 @@ public boolean onTouchEvent(MotionEvent ev) {
 				if (mEnablePullRefresh && (mHeaderView.getVisiableHeight() > 0 || deltaY > 0)) {
 					//下拉更新高度
 					updateHeaderHeight(deltaY / OFFSET_RADIO);
-
 				}
 				break;
 			case MotionEvent.ACTION_UP:
@@ -391,7 +395,10 @@ public void onScrollStateChanged(AbsListView view, int scrollState) {
 	    	if(view.getFirstVisiblePosition() == 0){
 	    		Log.i("TAG", "滚动到顶部");
 	    		childScrollState = false;
-
+	    		if (mEnablePullLoad && view.getLastVisiblePosition()==(view.getCount() - 1)) {
+	    			Log.i("TAG", "滚动到底部");
+	    			startLoadMore();
+				}
 	    	}else if (view.getLastVisiblePosition() == (view.getCount() - 1)) {
 	    		Log.i("TAG", "滚动到底部");
 	    		startLoadMore();

diff --git a/AndBase/src/com/ab/view/pullview/AbPullListView.java b/AndBase/src/com/ab/view/pullview/AbPullListView.java
@@ -98,6 +98,9 @@ public class AbPullListView extends ListView implements OnScrollListener {
 	/** 数据相关. */
 	private ListAdapter mAdapter = null;
 
+	/**上一次的数量*/
+	private int count = 0;
+
 	/**
 	 * Instantiates a new ab pull list view.
 	 *
@@ -146,6 +149,8 @@ private void initWithContext(Context context) {
 		//默认是打开刷新与更多
 		setPullRefreshEnable(true);
 		setPullLoadEnable(true);
+
+		mFooterView.hide();
 	}
 
 	/**
@@ -213,7 +218,7 @@ public void stopRefresh() {
 			resetHeaderHeight();
 		}
 
-		int count = mAdapter.getCount();
+		count = mAdapter.getCount();
 		//判断有没有数据
 		if(count>0){
 			mFooterView.setState(AbListViewFooter.STATE_READY);
@@ -225,15 +230,16 @@ public void stopRefresh() {
 	/**
 	 * stop load more, reset footer view.
 	 *
-	 * @param more the more
 	 */
-	public void stopLoadMore(boolean more) {
+	public void stopLoadMore() {
+		mFooterView.hide();
 		if (mPullLoading == true) {
 			mPullLoading = false;
 			mFooterView.setState(AbListViewFooter.STATE_READY);
 		}
+		int countNew = mAdapter.getCount();
 		//判断有没有更多数据了
-		if(more){
+		if(countNew > count){
 			mFooterView.setState(AbListViewFooter.STATE_READY);
 		}else{
 			mFooterView.setState(AbListViewFooter.STATE_NO);
@@ -279,27 +285,12 @@ private void resetHeaderHeight() {
 		invalidate();
 	}
 
-	/**
-	 * 更新 footer的显示.
-	 * @param delta 增加值
-	 */
-	private void updateFooterHeight(float delta) {
-		int newHeight = mFooterView.getVisiableHeight() + (int) delta;
-		if(newHeight > mFooterViewHeight){
-			newHeight = mFooterViewHeight;
-		}
-		mFooterView.setVisiableHeight(newHeight);
-		if (mEnablePullLoad && !mPullLoading) {
-			if (newHeight >= mFooterViewHeight) {
-				mFooterView.setState(AbListViewFooter.STATE_READY);
-			}
-		}
-	}
 
 	/**
 	 * Start load more.
 	 */
 	private void startLoadMore() {
+		mFooterView.show();
 		mPullLoading = true;
 		mFooterView.setState(AbListViewFooter.STATE_LOADING);
 		if (mListViewListener != null) {
@@ -327,8 +318,8 @@ public boolean onTouchEvent(MotionEvent ev) {
 			mLastY = ev.getRawY();
 			if (mEnablePullRefresh && getFirstVisiblePosition() == 0 && (mHeaderView.getVisiableHeight() > 0 || deltaY > 0)) {
 				updateHeaderHeight(deltaY / OFFSET_RADIO);
-			} else if (mEnablePullRefresh && getLastVisiblePosition() == mTotalItemCount - 1 && mFooterView.getVisiableHeight() < mFooterViewHeight) {
-				updateFooterHeight(-deltaY / OFFSET_RADIO);
+			} else if (mEnablePullLoad && getLastVisiblePosition() == mTotalItemCount - 1 && deltaY<0) {
+				startLoadMore();
 			}
 			break;
 		case MotionEvent.ACTION_UP:
@@ -348,11 +339,6 @@ public boolean onTouchEvent(MotionEvent ev) {
 					//弹回
 					resetHeaderHeight();
 				}
-			//在到底部就加载下一页
-			}else if (getLastVisiblePosition() == mTotalItemCount-1) {
-				if (mEnablePullLoad && mFooterView.getVisiableHeight() > mFooterViewHeight-2) {
-					startLoadMore();
-				}
 			}
 			break;
 		default:

diff --git a/AndBaseDemo/bin/AndBaseDemo.apk b/AndBaseDemo/bin/AndBaseDemo.apk
diff --git a/AndBaseDemo/bin/classes.dex b/AndBaseDemo/bin/classes.dex
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$1.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$1.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$2.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$2.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment1.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment2$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment2$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment2$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment2$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment2.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment2.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment3$5.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment3$5.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment3$6.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment3$6.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment4$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment4$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment4$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment4$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment5$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment5$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment5$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment5$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment5.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/Fragment5.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$5.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$5.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$6.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity$6.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/ListNestViewPagerActivity.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$1.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$1.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$2.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$2.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshGridActivity.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$1.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$1.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$2.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$2.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$3.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$3.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$4.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity$4.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshListActivity.class
diff --git a/...seDemo/bin/classes/com/andbase/demo/activity/PullToRefreshMultiColumnListActivity$2.class b/...seDemo/bin/classes/com/andbase/demo/activity/PullToRefreshMultiColumnListActivity$2.class
diff --git a/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshMultiColumnListActivity.class b/AndBaseDemo/bin/classes/com/andbase/demo/activity/PullToRefreshMultiColumnListActivity.class
diff --git a/AndBaseDemo/bin/dexedLibs/Baidu-Frontia-Android-2.0.0-03c55305a8065170de2e5a1500d90ea1.jar b/AndBaseDemo/bin/dexedLibs/Baidu-Frontia-Android-2.0.0-03c55305a8065170de2e5a1500d90ea1.jar
diff --git a/AndBaseDemo/bin/dexedLibs/andbase-f690361d8ac4e49e2403ab2c2e3ca259.jar b/AndBaseDemo/bin/dexedLibs/andbase-f690361d8ac4e49e2403ab2c2e3ca259.jar
diff --git a/AndBaseDemo/bin/dexedLibs/android-support-v4-a638c870a65fee675608c07cc6bff2a9.jar b/AndBaseDemo/bin/dexedLibs/android-support-v4-a638c870a65fee675608c07cc6bff2a9.jar
diff --git a/AndBaseDemo/bin/dexedLibs/annotations-c7c61ae6c93f586a10287c7e2e49eb93.jar b/AndBaseDemo/bin/dexedLibs/annotations-c7c61ae6c93f586a10287c7e2e49eb93.jar
diff --git a/AndBaseDemo/bin/dexedLibs/com.kfb.a-3d2474da15d43e0085afd71c22ce2f8a.jar b/AndBaseDemo/bin/dexedLibs/com.kfb.a-3d2474da15d43e0085afd71c22ce2f8a.jar
diff --git a/AndBaseDemo/bin/dexedLibs/com.kfb.c-d9416ef34a0730ea814cfc42048a3f07.jar b/AndBaseDemo/bin/dexedLibs/com.kfb.c-d9416ef34a0730ea814cfc42048a3f07.jar
diff --git a/AndBaseDemo/bin/dexedLibs/gson-2.0-f8aa7b997f5155aee03f3f0405643116.jar b/AndBaseDemo/bin/dexedLibs/gson-2.0-f8aa7b997f5155aee03f3f0405643116.jar
diff --git a/AndBaseDemo/bin/resources.ap_ b/AndBaseDemo/bin/resources.ap_
diff --git a/AndBaseDemo/src/com/andbase/demo/activity/Fragment1.java b/AndBaseDemo/src/com/andbase/demo/activity/Fragment1.java
@@ -37,6 +37,8 @@ public class Fragment1 extends Fragment {
 	private AbTaskQueue mAbTaskQueue = null;
 	private ArrayList<String> mPhotoList = new ArrayList<String>();
 	private ImageListAdapter myListViewAdapter = null;
+	private int total = 50;
+	private int pageSize = 5;
 
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) { 
@@ -104,11 +106,11 @@ public void get() {
 	   		    	newList = new ArrayList<Map<String, Object>>();
 	   		    	Map<String, Object> map = null;
 
-	   		    	for (int i = 0; i < 10; i++) {
+	   		    	for (int i = 0; i < pageSize; i++) {
 	   		    		map = new HashMap<String, Object>();
 	   					map.put("itemsIcon",mPhotoList.get(new Random().nextInt(mPhotoList.size())));
-		   		    	map.put("itemsTitle", "[Fragment1]"+i);
-		   		    	map.put("itemsText", "[Fragment1]..."+i);
+		   		    	map.put("itemsTitle", "[Fragment1]"+(i+1));
+		   		    	map.put("itemsText", "[Fragment1]..."+(i+1));
 		   		    	newList.add(map);
 	   				}
 	   		    } catch (Exception e) {
@@ -125,12 +127,8 @@ public void update() {
 					list.addAll(newList);
 					myListViewAdapter.notifyDataSetChanged();
 					newList.clear();
-					mAbPullListView.stopLoadMore(true);
-                }else{
-                	//没有新数据了
-                	mAbPullListView.stopLoadMore(false);
                 }
-
+				mAbPullListView.stopLoadMore();
 			}
 
 			@Override
@@ -141,12 +139,14 @@ public void get() {
 	   		    	newList = new ArrayList<Map<String, Object>>();
                     Map<String, Object> map = null;
 
-	   		    	for (int i = 0; i < 10; i++) {
+	   		    	for (int i = 0; i < pageSize; i++) {
 	   		    		map = new HashMap<String, Object>();
 	   					map.put("itemsIcon",mPhotoList.get(new Random().nextInt(mPhotoList.size())));
-		   		    	map.put("itemsTitle", "item上拉"+i);
-		   		    	map.put("itemsText", "item上拉..."+i);
-		   		    	newList.add(map);
+	   			    	map.put("itemsTitle", "item上拉"+((currentPage-1)*pageSize+(i+1)));
+		   		    	map.put("itemsText", "item上拉..."+((currentPage-1)*pageSize+(i+1)));
+		   		    	if((list.size()+newList.size()) < total){
+		   		    		newList.add(map);
+		   		    	}
 	   				}
 	   		    } catch (Exception e) {
 	   		    	currentPage--;

diff --git a/AndBaseDemo/src/com/andbase/demo/activity/Fragment2.java b/AndBaseDemo/src/com/andbase/demo/activity/Fragment2.java
@@ -125,12 +125,8 @@ public void update() {
 					list.addAll(newList);
 					myListViewAdapter.notifyDataSetChanged();
 					newList.clear();
-					mAbPullListView.stopLoadMore(true);
-                }else{
-                	//没有新数据了
-                	mAbPullListView.stopLoadMore(false);
                 }
-
+				mAbPullListView.stopLoadMore();
 			}
 
 			@Override

diff --git a/AndBaseDemo/src/com/andbase/demo/activity/Fragment3.java b/AndBaseDemo/src/com/andbase/demo/activity/Fragment3.java
@@ -184,11 +184,8 @@ public void update() {
 					list.addAll(newList);
 					myListViewAdapter.notifyDataSetChanged();
 					newList.clear();
-					mAbPullListView.stopLoadMore(true);
-                }else{
-                	//没有新数据了
-                	mAbPullListView.stopLoadMore(false);
                 }
+				mAbPullListView.stopLoadMore();
 
 			}
 

diff --git a/AndBaseDemo/src/com/andbase/demo/activity/Fragment4.java b/AndBaseDemo/src/com/andbase/demo/activity/Fragment4.java
@@ -125,12 +125,8 @@ public void update() {
 					list.addAll(newList);
 					myListViewAdapter.notifyDataSetChanged();
 					newList.clear();
-					mAbPullListView.stopLoadMore(true);
-                }else{
-                	//没有新数据了
-                	mAbPullListView.stopLoadMore(false);
                 }
-
+				mAbPullListView.stopLoadMore();
 			}
 
 			@Override

diff --git a/AndBaseDemo/src/com/andbase/demo/activity/Fragment5.java b/AndBaseDemo/src/com/andbase/demo/activity/Fragment5.java
@@ -125,11 +125,8 @@ public void update() {
 					list.addAll(newList);
 					myListViewAdapter.notifyDataSetChanged();
 					newList.clear();
-					mAbPullListView.stopLoadMore(true);
-                }else{
-                	//没有新数据了
-                	mAbPullListView.stopLoadMore(false);
                 }
+				mAbPullListView.stopLoadMore();
 
 			}
 

diff --git a/AndBaseDemo/src/com/andbase/demo/activity/ListNestViewPagerActivity.java b/AndBaseDemo/src/com/andbase/demo/activity/ListNestViewPagerActivity.java
@@ -133,12 +133,8 @@ public void update() {
 					list.addAll(newList);
 					myListViewAdapter.notifyDataSetChanged();
 					newList.clear();
-					mAbPullListView.stopLoadMore(true);
-                }else{
-                	//没有新数据了
-                	mAbPullListView.stopLoadMore(false);
                 }
-
+				mAbPullListView.stopLoadMore();
 			}
 
 			@Override