diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java index 130552520..22fb5f122 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java @@ -66,10 +66,9 @@ public void onLoadMoreRequested() { @Override public void run() { if (mCurrentCounter >= TOTAL_COUNTER) { - mQuickAdapter.notifyDataChangedAfterLoadMore(false); - - + View view = getLayoutInflater().inflate(R.layout.not_loading, (ViewGroup) mRecyclerView.getParent(), false); + mQuickAdapter.addFooterView(view); } else { new Handler().postDelayed(new Runnable() { @Override diff --git a/app/src/main/res/layout/not_loading.xml b/app/src/main/res/layout/not_loading.xml new file mode 100755 index 000000000..6c88e9560 --- /dev/null +++ b/app/src/main/res/layout/not_loading.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java index 2f7f86416..b8045dd7b 100755 --- a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java +++ b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java @@ -237,7 +237,10 @@ public void add(int position, T item) { */ public void setNewData(List data) { this.mData = data; - if (mRequestLoadMoreListener != null) mNextLoadEnable = true; + if (mRequestLoadMoreListener != null) { + mNextLoadEnable = true; + mFooterView = null; + } notifyDataSetChanged(); } diff --git a/library/src/main/res/layout/def_loading.xml b/library/src/main/res/layout/def_loading.xml index f52832fda..660b047fb 100755 --- a/library/src/main/res/layout/def_loading.xml +++ b/library/src/main/res/layout/def_loading.xml @@ -19,6 +19,6 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_4" android:textColor="@android:color/black" - android:text="正在加载中..." + android:text="@string/loading" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/library/src/main/res/values-en/strings.xml b/library/src/main/res/values-en/strings.xml new file mode 100644 index 000000000..09547e7aa --- /dev/null +++ b/library/src/main/res/values-en/strings.xml @@ -0,0 +1,4 @@ + + Library + Loading... + diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index 6d5185635..79345ebea 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ Library + 正在加载中...