Skip to content

Commit 09f1c0f

Browse files
committed
modified range notify, fixed swapCursor error
1 parent 162d60b commit 09f1c0f

8 files changed

Lines changed: 25 additions & 55 deletions

File tree

README-cn.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Gradle
3939
```
4040
dependencies {
4141
...
42-
compile 'cc.solart:turbo-recyclerview-helper:1.2.0'
42+
compile 'cc.solart:turbo-recyclerview-helper:1.2.1'
4343
}
4444
```
4545

@@ -161,6 +161,9 @@ public class SimpleAdapter extends BaseTurboAdapter<String, SimpleAdapter.Simple
161161
* 重构Adapter,新增BaseCursorAdapter
162162
* **1.2.0**
163163
* 新增decoration包,辅助构建布局间距
164+
* **1.2.1**
165+
* 更改addData为局部刷新的方式
166+
* 修复swapCursor错误
164167

165168

166169

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gradle
2424
```
2525
dependencies {
2626
...
27-
compile 'cc.solart:turbo-recyclerview-helper:1.2.0'
27+
compile 'cc.solart:turbo-recyclerview-helper:1.2.1'
2828
}
2929
```
3030

@@ -144,6 +144,9 @@ Changelog
144144
* Refactor Adapter, add BaseCursorAdapter
145145
* **1.2.0**
146146
* Add decoration pkg
147+
* **1.2.1**
148+
* Modify range notify
149+
* Fix swapCursor error
147150

148151
Thanks
149152
------

turbo-recyclerview-helper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
}
3636

3737

38-
version = "1.2.0"
38+
version = "1.2.1"
3939

4040
// 根节点添加
4141
def siteUrl = 'https://github.com/Solartisan/TurboRecyclerViewHelper' // project homepage

turbo-recyclerview-helper/src/main/java/cc/solart/turbo/AbsTurboAdapter.java

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
/**
3131
* A subclass of RecyclerView.Adapter responsible for providing views that add header/footer/empty view
32-
* <p/>
32+
*
3333
* author: imilk
3434
* https://github.com/Solartisan/TurboRecyclerViewHelper
3535
*/
@@ -81,8 +81,8 @@ public AbsTurboAdapter(Context context) {
8181
abstract public int getItemCount();
8282

8383
/**
84-
* Whether there is data exists
85-
* @return
84+
*
85+
* @return Whether there is data exists
8686
*/
8787
abstract protected boolean isEmpty();
8888

@@ -119,34 +119,17 @@ public final BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
119119

120120
}
121121

122-
/**
123-
* custom Loading Footer
124-
*
125-
* @param parent
126-
* @return
127-
*/
122+
128123
protected BaseViewHolder onCreateLoadingViewHolder(ViewGroup parent) {
129124
return null;
130125
}
131126

132-
/**
133-
* create def view holder
134-
*
135-
* @param parent
136-
* @param viewType
137-
* @return
138-
*/
139127
abstract protected BaseViewHolder onCreateDefViewHolder(ViewGroup parent, int viewType);
140128

141129
private BaseViewHolder createBaseViewHolder(ViewGroup parent, int layoutResId) {
142130
return new BaseViewHolder(inflateItemView(layoutResId, parent));
143131
}
144132

145-
/**
146-
* @param layoutResId
147-
* @param parent
148-
* @return
149-
*/
150133
protected View inflateItemView(int layoutResId, ViewGroup parent) {
151134
return mLayoutInflater.inflate(layoutResId, parent, false);
152135
}
@@ -226,7 +209,7 @@ public void removeFooterView(View footer) {
226209
}
227210

228211
/**
229-
* Sets the view to show if the adapter is empty
212+
* @param emptyView Sets the view to show if the adapter is empty
230213
*/
231214
public void setEmptyView(View emptyView) {
232215
mEmptyView = emptyView;

turbo-recyclerview-helper/src/main/java/cc/solart/turbo/BaseCursorAdapter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import android.content.Context;
1919
import android.database.Cursor;
20+
import android.util.Log;
2021
import android.widget.Filter;
2122
import android.widget.FilterQueryProvider;
2223
import android.widget.Filterable;
@@ -266,7 +267,8 @@ public Cursor swapCursor(Cursor newCursor) {
266267
mRowIDColumn = -1;
267268
mDataValid = false;
268269
// notify the observers about the lack of a data set
269-
notifyItemRangeRemoved(getHeaderViewCount(), oldCursor.getCount());
270+
notifyDataSetChanged();
271+
// notifyItemRangeRemoved(0, oldCursor.getCount() - 1);
270272
}
271273
return oldCursor;
272274
}

turbo-recyclerview-helper/src/main/java/cc/solart/turbo/BaseTurboAdapter.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ public void remove(int position) {
8181
}
8282

8383
/**
84-
* additional data;
8584
*
86-
* @param data
85+
* @param data additional data
8786
*/
8887
public void addData(List<T> data) {
8988
if (data != null) {
89+
int pos = getItemCount();
9090
this.mData.addAll(data);
91-
notifyDataSetChanged();
91+
notifyItemRangeInserted(pos, data.size() - 1);
9292
}
9393
}
9494

@@ -131,12 +131,6 @@ public long getItemId(int position) {
131131
return position;
132132
}
133133

134-
135-
/**
136-
* Whether there is data exists
137-
*
138-
* @return
139-
*/
140134
@Override
141135
protected boolean isEmpty() {
142136
return getHeaderViewCount() + getFooterViewCount() + getData().size() == 0;
@@ -193,7 +187,7 @@ protected final void bindHolder(BaseViewHolder holder, int position) {
193187
public void onLoadingMore() {
194188
if (!mLoading) {
195189
mLoading = true;
196-
notifyDataSetChanged();
190+
notifyItemChanged(getItemCount());
197191
}
198192
}
199193

turbo-recyclerview-helper/src/main/java/cc/solart/turbo/BaseViewHolder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ public BaseViewHolder(View view) {
3737
}
3838

3939
@SuppressWarnings("unchecked")
40-
public <T extends View> T findViewById(int viewId) {
40+
public <V extends View> V findViewById(int viewId) {
4141
View view = mViews.get(viewId);
4242
if (view == null) {
4343
view = itemView.findViewById(viewId);
4444
mViews.put(viewId, view);
4545
}
46-
return (T) view;
46+
return (V) view;
4747
}
48-
4948
}

turbo-recyclerview-helper/src/main/java/cc/solart/turbo/TurboRecyclerView.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* A subclass of RecyclerView responsible for providing views that refresh new data set.
40-
* <p/>
40+
*
4141
* author: imilk
4242
* https://github.com/Solartisan/TurboRecyclerViewHelper
4343
*/
@@ -117,9 +117,6 @@ public void removeOnLoadingMoreListener(OnLoadMoreListener listener) {
117117
mOnLoadMoreListeners.remove(listener);
118118
}
119119

120-
/**
121-
* @param enabled
122-
*/
123120
public void setLoadMoreEnabled(boolean enabled) {
124121
mLoadEnabled = enabled;
125122
}
@@ -408,12 +405,7 @@ private void dispatchOnLoadingMoreListeners() {
408405
}
409406
}
410407

411-
/**
412-
* Calculating the damping distance of any axis
413-
*
414-
* @param delta
415-
* @return
416-
*/
408+
//Calculating the damping distance of any axis
417409
private float dampAxis(int delta) {
418410
final float scrollEnd = delta * DRAG_RATE;
419411
float mCurrentDragPercent = scrollEnd / mTotalDragDistance;
@@ -441,12 +433,6 @@ private void animateOffsetToEnd(final String propertyName, final Interpolator in
441433
mResetAnimator.start();
442434
}
443435

444-
445-
/**
446-
* complete loading
447-
*
448-
* @param data
449-
*/
450436
public void loadMoreComplete(List<?> data) {
451437
if (mIsLoading) {
452438
mIsLoading = false;

0 commit comments

Comments
 (0)