Skip to content

Commit c7b1e7d

Browse files
committed
Merge branch 'master' of github.com:youlookwhat/ByRecyclerView
2 parents 7de1003 + 406d987 commit c7b1e7d

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

ByRecyclerview/src/main/java/me/jingbin/library/ByRecyclerView.java

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ public void onClick(View v) {
202202
postDelayed(new Runnable() {
203203
@Override
204204
public void run() {
205-
mLoadMoreListener.onLoadMore();
205+
if (mLoadMoreListener != null) {
206+
mLoadMoreListener.onLoadMore();
207+
}
206208
}
207209
}, mLoadMoreDelayMillis);
208210
}
@@ -229,7 +231,9 @@ public void setRefreshing(boolean refreshing) {
229231
postDelayed(new Runnable() {
230232
@Override
231233
public void run() {
232-
mRefreshListener.onRefresh();
234+
if (mRefreshListener != null) {
235+
mRefreshListener.onRefresh();
236+
}
233237
}
234238
}, 300 + mRefreshDelayMillis);
235239
}
@@ -368,7 +372,9 @@ && isScrollLoad()
368372
postDelayed(new Runnable() {
369373
@Override
370374
public void run() {
371-
mLoadMoreListener.onLoadMore();
375+
if (mLoadMoreListener != null) {
376+
mLoadMoreListener.onLoadMore();
377+
}
372378
}
373379
}, mLoadMoreDelayMillis);
374380
}
@@ -455,7 +461,9 @@ && isOnTop()
455461
postDelayed(new Runnable() {
456462
@Override
457463
public void run() {
458-
mRefreshListener.onRefresh();
464+
if (mRefreshListener != null) {
465+
mRefreshListener.onRefresh();
466+
}
459467
}
460468
}, 300 + mRefreshDelayMillis);
461469
}
@@ -813,7 +821,9 @@ private void autoLoadMore(int position) {
813821
postDelayed(new Runnable() {
814822
@Override
815823
public void run() {
816-
mLoadMoreListener.onLoadMore();
824+
if (mLoadMoreListener != null) {
825+
mLoadMoreListener.onLoadMore();
826+
}
817827
}
818828
}, mLoadMoreDelayMillis);
819829
}
@@ -1423,6 +1433,12 @@ public void destroy() {
14231433
mRefreshEnabled = false;
14241434
mPreLoadNumber = 1;
14251435
mLoadMoreEnabledStatus = 0;
1436+
mRefreshListener = null;
1437+
mLoadMoreListener = null;
1438+
onItemClickListener = null;
1439+
onItemLongClickListener = null;
1440+
mOnItemChildClickListener = null;
1441+
mOnItemChildLongClickListener = null;
14261442
if (mHeaderViews != null) {
14271443
mHeaderViews.clear();
14281444
}

ByRecyclerview/src/main/java/me/jingbin/library/adapter/BaseByRecyclerViewAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public List<T> getData() {
7373
}
7474

7575
public T getItemData(int position) {
76-
if (mData != null && mData.size() > 0 && position < mData.size()) {
76+
if (mData != null && mData.size() > 0 && position >= 0 && position < mData.size()) {
7777
return mData.get(position);
7878
}
7979
return null;

0 commit comments

Comments
 (0)