Skip to content

Commit dea618c

Browse files
author
wsc
committed
完成自主开发的DropboxHeader
1 parent eb2ca7b commit dea618c

38 files changed

Lines changed: 321 additions & 198 deletions

‎app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,7 @@ dependencies {
6060
compile 'in.srain.cube:ultra-ptr:1.0.11'
6161
compile 'com.github.cpoopc:scrollablelayoutlib:1.0.1'
6262
compile 'com.android.support.constraint:constraint-layout:1.0.2'
63+
// compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.2-alpha-1'
64+
// compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.2-alpha-1'
6365
testCompile 'junit:junit:4.12'
6466
}

‎app/src/main/java/com/scwang/refreshlayout/activity/practice/WebviewPracticeActivity.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,8 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
5555
}
5656
@Override
5757
public void onPageCommitVisible(WebView view, String url) {
58-
// refreshLayout.finishRefresh();
59-
view.loadUrl(String.format(Locale.CHINA, "javascript:document.body.style.paddingTop='%fpx'; void 0", DensityUtil.px2dp(webView.getPaddingTop())));
60-
}
61-
});
62-
63-
refreshLayout.setEnableLoadmore(true);
64-
toolbar.setOnLongClickListener(new View.OnLongClickListener() {
65-
@Override
66-
public boolean onLongClick(View v) {
6758
refreshLayout.finishRefresh();
68-
refreshLayout.finishLoadmore();
69-
return false;
59+
view.loadUrl(String.format(Locale.CHINA, "javascript:document.body.style.paddingTop='%fpx'; void 0", DensityUtil.px2dp(webView.getPaddingTop())));
7060
}
7161
});
7262

‎app/src/main/java/com/scwang/refreshlayout/activity/using/ListenerUsingActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public void onHeaderStartAnimator(RefreshHeader header, int headerHeight, int ex
8282
}
8383

8484
@Override
85-
public void onHeaderFinish(RefreshHeader header) {
86-
mHeaderFinish = String.format(Locale.CHINA, "%s",FORMAT.format(new Date()));
85+
public void onHeaderFinish(RefreshHeader header, boolean success) {
86+
mHeaderFinish = String.format(Locale.CHINA, "%s - " + success,FORMAT.format(new Date()));
8787
updateContent();
8888
}
8989

@@ -112,8 +112,8 @@ public void onFooterStartAnimator(RefreshFooter footer, int footerHeight, int ex
112112
}
113113

114114
@Override
115-
public void onFooterFinish(RefreshFooter footer) {
116-
mFooterFinish = String.format(Locale.CHINA, "%s",FORMAT.format(new Date()));
115+
public void onFooterFinish(RefreshFooter footer, boolean success) {
116+
mFooterFinish = String.format(Locale.CHINA, "%s - " + success,FORMAT.format(new Date()));
117117
updateContent();
118118
}
119119

‎app/src/main/java/com/scwang/refreshlayout/fragment/RefreshStylesFragment.java‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import android.widget.AdapterView;
1919

2020
import com.scwang.refreshlayout.R;
21+
import com.scwang.refreshlayout.activity.ExperimentActivity;
2122
import com.scwang.refreshlayout.activity.style.BezierStyleActivity;
2223
import com.scwang.refreshlayout.activity.style.CircleStyleActivity;
2324
import com.scwang.refreshlayout.activity.style.ClassicsStyleActivity;
@@ -37,7 +38,6 @@
3738
import com.scwang.smartrefresh.layout.api.RefreshHeader;
3839
import com.scwang.smartrefresh.layout.api.RefreshLayout;
3940
import com.scwang.smartrefresh.layout.header.ClassicsHeader;
40-
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
4141

4242
import java.lang.reflect.Constructor;
4343
import java.util.Arrays;
@@ -104,25 +104,10 @@ protected void onBindViewHolder(SmartViewHolder holder, Item model, int position
104104
});
105105
}
106106

107-
final RefreshLayout refreshLayout = (RefreshLayout) root.findViewById(R.id.smartLayout);
108-
refreshLayout.setOnRefreshLoadmoreListener(new OnRefreshLoadmoreListener() {
109-
@Override
110-
public void onLoadmore(RefreshLayout refreshlayout) {
111-
112-
}
113-
114-
@Override
115-
public void onRefresh(RefreshLayout refreshlayout) {
116-
117-
}
118-
});
119-
120107
root.findViewById(R.id.toolbar).setOnLongClickListener(new View.OnLongClickListener() {
121108
@Override
122109
public boolean onLongClick(View v) {
123-
refreshLayout.finishRefresh();
124-
refreshLayout.finishLoadmore();
125-
// startActivity(new Intent(getContext(), ExperimentActivity.class));
110+
startActivity(new Intent(getContext(), ExperimentActivity.class));
126111
return false;
127112
}
128113
});

‎app/src/main/res/layout/activity_practice_webview.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:layout_height="match_parent"
1414
app:srlPrimaryColor="@color/colorPrimary"
1515
app:srlAccentColor="@android:color/white"
16-
app:srlEnableLoadmore="true"
16+
app:srlEnableLoadmore="false"
1717
app:srlEnablePreviewInEditMode="true">
1818
<com.scwang.smartrefresh.header.PhoenixHeader
1919
android:id="@+id/header"

‎app/src/main/res/layout/activity_using_basic.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
android:layout_height="match_parent"
2323
android:background="@android:color/white"
2424
tools:listitem="@android:layout/simple_list_item_2"/>
25+
<com.scwang.smartrefresh.layout.footer.ClassicsFooter
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"/>
2528
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
2629

2730
</LinearLayout>

‎art/md_donationlist.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
|昵称|日期|方式|赞|推广|
66
|:---:|:---:|:---:|:---:|:---:|
7+
|[未留名]|2017-7-11|微信|👍| |
8+
|[未留名]|2017-7-11|微信|👍| |
79
|sugarya|2017-7-11|微信|👍|[sugarya](https://github.com/sugarya)|
810
|stormzhang|2017-7-11|微信|👍|[stormzhang](https://github.com/stormzhang)
911
|[未留名]|2017-7-10|微信| | |
1012

1113

12-
<!-- |[未留名]|2017-7-11|微信|👍| | -->
13-
<!-- |[未留名]|2017-7-11|微信|👍| | -->
14+
<!-- |[未留名]|2017-7-12|微信|👍| | -->

‎art/md_property.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
|srlEnablePreviewInEditMode|boolean|是否在编辑模式时显示预览效果（默认true）|
1919
|srlEnablePureScrollMode|boolean|是否开启纯滚动模式|
2020
|srlEnableNestedScrolling|boolean|是否开启嵌套滚动NestedScrolling|
21+
|srlEnableScrollContentWhenLoaded|boolean|是否在加载完成之后滚动内容显示新数据|
2122
|srlDisableContentWhenRefresh|boolean|是否在刷新的时候禁止内容的一切手势操作（默认false）|
2223
|srlDisableContentWhenLoading|boolean|是否在加载的时候禁止内容的一切手势操作（默认false）|
2324
|srlFixedHeaderViewId|id|指定固定的视图Id|
@@ -40,6 +41,9 @@
4041
|setEnableHeaderTranslationContent|boolean|拖动Header的时候是否同时拖动内容（默认true）|
4142
|setEnableFooterTranslationContent|boolean|拖动Footer的时候是否同时拖动内容（默认true）|
4243
|setEnableAutoLoadmore|boolean|是否监听列表滚动到底部时触发加载事件|
44+
|setEnablePureScrollMode|boolean|是否开启纯滚动模式|
45+
|setEnableNestedScrolling|boolean|是否开启嵌套滚动NestedScrolling|
46+
|setEnableScrollContentWhenLoaded|boolean|是否在加载完成之后滚动内容显示新数据|
4347
|setDisableContentWhenRefresh|boolean|是否在刷新的时候禁止内容的一切手势操作（默认false）|
4448
|setDisableContentWhenLoading|boolean|是否在加载的时候禁止内容的一切手势操作（默认false）|
4549
|setReboundInterpolator|Interpolator|设置回弹动画的插值器|
@@ -53,6 +57,8 @@
5357
|setRefreshScrollBoundary|boundary|设置滚动边界判断|
5458
|finishRefresh|(int delayed)|完成刷新，结束刷新动画|
5559
|finishLoadmore|(int delayed)|完成加载，结束加载动画|
60+
|finishRefresh|(boolean success)|完成刷新，并设置是否成功|
61+
|finishLoadmore|(boolean success)|完成加载，并设置是否成功|
5662
|getRefreshHeader|RefreshHeader|获取Header|
5763
|getRefreshFooter|RefreshFooter|获取Footer|
5864
|getState|RefreshState|获取当前状态|

‎art/md_update.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
>添加：srlFixedFooterViewId 属性，指定固定的视图Id
1616
>添加：srlEnablePureScrollMode 属性，是否开启纯滚动模式
1717
>添加：srlEnableNestedScrolling 属性，是否开启嵌套滚动NestedScrolling
18+
>添加：srlEnableScrollContentWhenLoaded 属性，是否在加载完成之后滚动内容显示新数据
1819
>添加：setRefreshScrollBoundary 方法，设置滚动边界判断
20+
>添加：finishRefresh(boolean success);方法，完成刷新,并设置是否成功
21+
>添加：finishLoadmore(boolean success);方法，完成加载,并设置是否成功
1922
>修复：DeliveryHeader,DropboxHeader 在API-17以下显示不全的问题
2023

‎refresh-header/src/main/java/com/scwang/smartrefresh/header/CircleHeader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
333333
}
334334

335335
@Override
336-
public int onFinish(RefreshLayout layout) {
336+
public int onFinish(RefreshLayout layout, boolean success) {
337337
mShowOuter = false;
338338
mShowBoll = false;
339339
ValueAnimator animator = ValueAnimator.ofFloat(0, 1);

0 commit comments

Comments
 (0)