Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

滑动冲突 #126

Open
wants to merge 124 commits into
base: dev
Choose a base branch
from
Open
Changes from 6 commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
cde543b
optimize
Jun 7, 2016
26172b8
optimize
Jun 8, 2016
04d1174
optimize
Jun 8, 2016
92fc4b5
optimize
Jun 8, 2016
4be2a27
去掉XRefreshViewFooter中onStateReady中的show(true)
Jun 8, 2016
c6e7a31
解决xrefreshview加padding布局有瑕疵的问题
huxq17 Jun 9, 2016
6d8ff2a
Merge branch 'master' of github.com:huxq17/XRefreshView
huxq17 Jun 9, 2016
bbbfada
optimize
huxq17 Jun 9, 2016
8440d9e
解决在XRefreshView的布局中设置padding时布局显示不正确的问题
Jun 13, 2016
1afea6f
添加QQ群
Jun 15, 2016
66aa215
Update README.md
huxq17 Jun 15, 2016
05ee094
更换效果图的地址
Jun 17, 2016
5d8d73d
解决issue #25
Jun 20, 2016
c1afb03
增加在禁用上拉加载时,可选禁止界面被上拉的功能
Jun 24, 2016
22214da
修改demo中展示的效果
Jun 24, 2016
ad30177
去除多余的log
Jul 8, 2016
8ab31ac
开启demo中gridview的上拉加载更多功能
Jul 8, 2016
c6a402b
解决在viewpager中从第二个页面开始,footerview的progressbar布局位置不正确的问题
Jul 8, 2016
767c9c8
update
Jul 8, 2016
b4dd609
添加Recyclerview非自动加载更多时,松开加载更多的功能
Jul 11, 2016
7b7c2d2
optimize
Jul 12, 2016
da3299a
optimize
Jul 13, 2016
a79c83f
optimize
Jul 14, 2016
0fb20f0
优化
Jul 14, 2016
9e9f36a
添加防拉钩的Recyclerview松开加载更多的功能,并解决了若干bug
Jul 15, 2016
a2a557c
版本升级到3.2.0
Jul 15, 2016
8ef942c
update
huxq17 Jul 15, 2016
05c65fb
update readme.md
huxq17 Jul 15, 2016
2d40a3a
update readme.md
huxq17 Jul 15, 2016
93023f6
merge
huxq17 Jul 26, 2016
dc4b986
optimize
huxq17 Jul 26, 2016
3b41106
优化一些操作和修改若干bug,版本升级到3.3.0
huxq17 Jul 27, 2016
5cff7a3
提交下拉刷新数据加载失败的处理
huxq17 Aug 3, 2016
794fc88
更新demo
huxq17 Aug 3, 2016
0413742
完善自定义view的上拉下拉判断条件的设定
huxq17 Aug 3, 2016
ddae9bf
optimize
huxq17 Aug 4, 2016
4cfe104
添加下拉刷新,数据接受失败的ui处理
huxq17 Aug 8, 2016
0d47d28
添加下拉刷新,数据接受失败的ui处理
huxq17 Aug 8, 2016
ab63d92
解决下拉刷新,在刷新状态下把headerview完全隐藏掉,在刷新结束以后下拉和上拉都不可用的问题
huxq17 Aug 8, 2016
4d0ee7f
optimize
huxq17 Aug 12, 2016
a0fd1d0
optimize
huxq17 Aug 15, 2016
5d846ef
优化headerview从普通状态到准备状态的ui效果
huxq17 Aug 15, 2016
4f570db
支持任何时候设置自定义headerview和footerview
huxq17 Aug 15, 2016
74cfa5a
解决调用startRefresh方法不起作用的问题
huxq17 Aug 16, 2016
84027aa
解决不设置footerview会报空的问题
huxq17 Aug 16, 2016
bf2cea3
添加空布局
huxq17 Aug 16, 2016
68be80e
正在开发空布局的功能
huxq17 Aug 17, 2016
4c71056
完善emptyview
huxq17 Aug 18, 2016
3e4481d
解决调用startRefresh方法后,刷新时headerview有时会不显示的问题
huxq17 Aug 18, 2016
4e1b0bc
release 3.5.0 version
huxq17 Aug 19, 2016
6c5bcfa
format
huxq17 Aug 19, 2016
51af21b
优化demo
huxq17 Aug 23, 2016
0980c75
optimize
huxq17 Aug 23, 2016
d061cff
optimize
huxq17 Aug 23, 2016
72aa7d7
optimize
huxq17 Aug 23, 2016
5bca799
optimize
huxq17 Aug 24, 2016
3d6ec6f
optimize
huxq17 Aug 26, 2016
1841d16
添加笑脸刷新
huxq17 Aug 29, 2016
badbf07
调整readme样式
huxq17 Aug 29, 2016
bc786c8
修改错误拼写
huxq17 Aug 29, 2016
d74be64
optimize
huxq17 Sep 5, 2016
7ab8cec
fix issues #36
huxq17 Sep 6, 2016
5d94115
Update README.md
huxq17 Sep 6, 2016
b175e8b
update README.md
huxq17 Sep 6, 2016
7bc5c0b
optimize
huxq17 Sep 8, 2016
6c72062
添加xscrollview的滑动监听
huxq17 Sep 28, 2016
565a788
Update README.md
huxq17 Oct 14, 2016
9f0f7a1
Update README.md
huxq17 Nov 21, 2016
dbecb85
Update README.md
huxq17 Nov 23, 2016
7e5c725
升级到3.5.6,支持AbsListView加载更多数据完成之后露出新加载的数据。
huxq17 Dec 14, 2016
8655f01
Merge branch 'master' of github.com:huxq17/XRefreshView
huxq17 Dec 14, 2016
b343715
修改依赖
huxq17 Dec 14, 2016
744ac35
优化demo
huxq17 Dec 14, 2016
33b2248
Update GridViewActivity.java
huxq17 Dec 14, 2016
7cd1dbd
优化上拉加载完成以后回弹的效果
huxq17 Dec 15, 2016
9172458
resolve conflict
huxq17 Dec 15, 2016
071b66d
Update README.md
huxq17 Dec 29, 2016
3b47f82
解决AbsListview数据不满一屏的时候,会重复加载更多的问题。
huxq17 Jan 4, 2017
fa24287
Merge branch 'master' of github.com:huxq17/XRefreshView
huxq17 Jan 4, 2017
41b3917
fix bug #49
huxq17 Jan 6, 2017
46163dd
升级到3.5.8
huxq17 Jan 6, 2017
19fa544
Update README.md
huxq17 Jan 11, 2017
278c416
解决Recyclerview使用StaggeredGridLayoutManager时,添加的headerview不能使用全部宽度的问题(…
huxq17 Jan 13, 2017
763d970
t push origin masterMerge branch 'master' of github.com:huxq17/XRefre…
huxq17 Jan 13, 2017
d2e61af
fix issue #58
huxq17 Feb 16, 2017
f15442a
update readme.md
huxq17 Feb 16, 2017
fd04458
添加onRefresh(boolean isPullDown)回调
huxq17 Feb 17, 2017
2a2498a
详见更新日志
huxq17 Mar 27, 2017
faa4e1a
Update README.md
huxq17 Mar 27, 2017
e8b521d
详见更新日志2017-3-28
huxq17 Mar 28, 2017
88a04b8
详见更新日志2017-3-28
huxq17 Mar 28, 2017
f6513a8
解决冲突
huxq17 Mar 28, 2017
a2facb7
Update README.md
huxq17 Mar 29, 2017
d1d4767
Update README.md
huxq17 Mar 29, 2017
f2180f4
见更新日志2017-4-14
huxq17 Apr 14, 2017
500262e
见更新日志2017-4-14
huxq17 Apr 14, 2017
3698f64
Merge branch 'master' of github.com:huxq17/XRefreshView
huxq17 Apr 14, 2017
00634ed
Update README.md
huxq17 Apr 14, 2017
7c5d863
Update README.md
huxq17 Apr 14, 2017
d817396
Update README.md
huxq17 Apr 14, 2017
fb47765
详见更新日志2017-4-25
huxq17 Apr 25, 2017
231f7c2
update readme
huxq17 Apr 25, 2017
46f9fec
解决xrefreshview不满屏的时候footerview正常状态下出现在屏幕上的问题
huxq17 May 3, 2017
9c42335
fix issue #78
huxq17 May 4, 2017
3b2d529
optimize
huxq17 May 16, 2017
12dae50
添加酒杯刷新
Sep 27, 2017
428ca15
fix bug #118
Sep 27, 2017
131e5de
添加京东快递图片
Sep 27, 2017
aa23b59
添加京东刷新
Sep 28, 2017
aeda0ac
京东刷新
Sep 28, 2017
6be5962
添加淘宝demo页面
Sep 28, 2017
d5bff0d
更新md
Sep 28, 2017
cf50272
吃豆豆
Sep 28, 2017
833d0c9
Update README.md
huxq17 Jun 25, 2018
ba32db3
Update README.md
huxq17 Jun 25, 2018
b8d02eb
添加新方式
Oct 2, 2018
cb6723a
Update README.md
huxq17 Oct 29, 2018
8396e0f
Author: fanyafeng
fanyafeng Jun 13, 2020
eeb3742
Author: fanyafeng
fanyafeng Jun 13, 2020
ce43532
Merge branch 'fanyafeng'
fanyafeng Jun 13, 2020
979cc06
Author: fanyafeng
fanyafeng Jun 13, 2020
2a37a6e
Author: fanyafeng
fanyafeng Jun 13, 2020
ac1d6aa
Author: fanyafeng
fanyafeng Jun 13, 2020
c5caf3b
Author: fanyafeng
fanyafeng Jun 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile project(':library')
// compile 'com.huxq17.xrefreshview:xrefreshview:2.1.9'
// compile 'com.huxq17.xrefreshview:xrefreshview:3.0.0'
//依赖下面的库
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:support-v4:23.0.1'
Original file line number Diff line number Diff line change
@@ -48,7 +48,15 @@ protected void onCreate(Bundle savedInstanceState) {
// xRefreshView.setAutoLoadMore(true);
xRefreshView.setPinnedTime(1000);
xRefreshView.setMoveForHorizontal(true);

//当需要使用数据不满一屏时不显示点击加载更多的效果时,解注释下面的三行代码
//并注释掉第四行代码
// CustomerFooter customerFooter = new CustomerFooter(this);
// customerFooter.setRecyclerView(recyclerView);
// adapter.setCustomLoadMoreView(customerFooter);
adapter.setCustomLoadMoreView(new XRefreshViewFooter(this));

// adapter.setCustomLoadMoreView(new XRefreshViewFooter(this));
// xRefreshView.setPullLoadEnable(false);
//设置静默加载时提前加载的item个数
// xRefreshView.setPreLoadCount(2);
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.andview.example.ui.raindrop;

import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
@@ -10,10 +11,8 @@

import com.andview.refreshview.XRefreshView.XRefreshViewListener;
import com.andview.refreshview.callback.IFooterCallBack;
import com.andview.refreshview.utils.Utils;

/**
* 非Recyclerview用这个footerview
*/
public class CustomerFooter extends LinearLayout implements IFooterCallBack {
private Context mContext;

@@ -33,8 +32,18 @@ public CustomerFooter(Context context, AttributeSet attrs) {
initView(context);
}

private RecyclerView recyclerView;

public void setRecyclerView(RecyclerView recyclerView) {
this.recyclerView = recyclerView;
}

@Override
public void callWhenNotAutoLoadMore(final XRefreshViewListener listener) {
if (recyclerView != null) {
//当数据不满一屏时不显示点击加载更多
show(Utils.isRecyclerViewFullscreen(recyclerView));
}
mClickView.setText(com.andview.refreshview.R.string.xrefreshview_footer_hint_click);
mClickView.setOnClickListener(new OnClickListener() {

2 changes: 1 addition & 1 deletion library/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=3.0.0
VERSION_NAME=3.0.3
GROUP=com.huxq17.xrefreshview
POM_NAME=Android universal pull to refresh library
POM_ARTIFACT_ID=xrefreshview
2 changes: 1 addition & 1 deletion library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.andview.refreshview">

<application android:allowBackup="true" android:label="@string/app_name">
<application android:label="@string/app_name">

</application>

Original file line number Diff line number Diff line change
@@ -324,22 +324,8 @@ public void stopLoading(boolean hideFooter) {
final BaseRecyclerAdapter adapter = (BaseRecyclerAdapter) recyclerView.getAdapter();
if (adapter == null) return;
adapter.removeFooterView();
addingFooter = true;
recyclerView.postDelayed(new Runnable() {
@Override
public void run() {
int index = recyclerView.indexOfChild(adapter.getCustomLoadMoreView());
//只有在footerview已经从Recyclerview中移除了以后才执行重新加入footerview的操作,不然Recyclerview的item布局会错乱
if (index == -1) {
addingFooter = false;
if (isFooterEnable()) {
adapter.addFooterView();
}
} else {
recyclerView.post(this);
}
}
}, 0);
addFooterView(false);
addFooterView(true);
}
}
}
@@ -487,9 +473,24 @@ private void addFooterView(boolean add) {
}
final RecyclerView recyclerView = (RecyclerView) child;
if (recyclerView.getAdapter() != null && mFooterCallBack != null) {
BaseRecyclerAdapter adapter = (BaseRecyclerAdapter) recyclerView.getAdapter();
final BaseRecyclerAdapter adapter = (BaseRecyclerAdapter) recyclerView.getAdapter();
if (add) {
adapter.addFooterView();
addingFooter = true;
recyclerView.post(new Runnable() {
@Override
public void run() {
//只有在footerview已经从Recyclerview中移除了以后才执行重新加入footerview的操作,不然Recyclerview的item布局会错乱
int index = recyclerView.indexOfChild(adapter.getCustomLoadMoreView());
if (index == -1) {
addingFooter = false;
if (isFooterEnable()) {
adapter.addFooterView();
}
} else {
recyclerView.post(this);
}
}
});
} else {
adapter.removeFooterView();
}
Original file line number Diff line number Diff line change
@@ -84,16 +84,14 @@ public void onStateComplete() {

@Override
public void show(final boolean show) {
post(new Runnable() {
@Override
public void run() {
showing = show;
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mContentView
.getLayoutParams();
lp.height = show ? LayoutParams.WRAP_CONTENT : 0;
mContentView.setLayoutParams(lp);
}
});
if(show==showing){
return;
}
showing = show;
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mContentView
.getLayoutParams();
lp.height = show ? LayoutParams.WRAP_CONTENT : 0;
mContentView.setLayoutParams(lp);
// setVisibility(show?VISIBLE:GONE);

}
Original file line number Diff line number Diff line change
@@ -146,7 +146,7 @@ public View setHeaderView(@LayoutRes int id, RecyclerView recyclerView) {
throw new RuntimeException(context.getResources().getResourceName(id) + " is a illegal layoutid , please check your layout id first !");
}
FrameLayout headerview = new FrameLayout(recyclerView.getContext());
customHeaderView = LayoutInflater.from(context).inflate(id, headerview);
customHeaderView = LayoutInflater.from(context).inflate(id, headerview,false);
notifyDataSetChanged();
return customHeaderView;
}