diff --git a/app/src/module_community/java/com/nnbc123/app/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/nnbc123/app/community/square/SquareDynamicFragment.java index 69bcee484..6147e35e2 100644 --- a/app/src/module_community/java/com/nnbc123/app/community/square/SquareDynamicFragment.java +++ b/app/src/module_community/java/com/nnbc123/app/community/square/SquareDynamicFragment.java @@ -32,6 +32,9 @@ import com.nnbc123.core.user.event.LoadLoginUserInfoEvent; import com.nnbc123.core.utils.net.DontWarnObserver; import com.nnbc123.library.utils.SizeUtils; import com.nnbc123.xchat_android_constants.XChatConstants; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; import com.trello.rxlifecycle3.android.FragmentEvent; import org.greenrobot.eventbus.EventBus; @@ -58,7 +61,7 @@ public class SquareDynamicFragment extends BaseFragment { @BindView(R.id.recycler_view) RecyclerView recyclerView; @BindView(R.id.refresh_layout) - SwipeRefreshLayout refreshLayout; + SmartRefreshLayout refreshLayout; private String nextDynamicId; @@ -137,9 +140,8 @@ public class SquareDynamicFragment extends BaseFragment { }); refreshLayout = mView.findViewById(R.id.refresh_layout); - refreshLayout.setOnRefreshListener(() -> { - loadData(true); - }); + refreshLayout.setEnableLoadmore(false); + refreshLayout.setOnRefreshListener(refreshlayout -> loadData(true)); loadData(true); } @@ -174,7 +176,7 @@ public class SquareDynamicFragment extends BaseFragment { @Override public void accept(WorldDynamicListResult result, String error) { super.accept(result, error); - refreshLayout.setRefreshing(false); + refreshLayout.finishRefresh(); if (error != null) { if (!isRefresh) adapter.loadMoreFail(); return; diff --git a/app/src/module_community/res/layout/fragment_square_dynamic.xml b/app/src/module_community/res/layout/fragment_square_dynamic.xml index a6f01afee..3c7ec3c24 100644 --- a/app/src/module_community/res/layout/fragment_square_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_square_dynamic.xml @@ -1,12 +1,16 @@ - + + + android:clipToPadding="false" /> - \ No newline at end of file + \ No newline at end of file