Skip to content

Commit 8f58eb5

Browse files
author
1170762202@qq.com
committed
...
1 parent 038d5ed commit 8f58eb5

File tree

4 files changed

+12
-31
lines changed

4 files changed

+12
-31
lines changed

library-common/src/main/java/com/zlx/library_common/constrant/PageInfo.java renamed to library-common/src/main/java/com/zlx/library_common/constrant/PageImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Email: 1170762202@qq.com
66
* Description:
77
*/
8-
public class PageInfo {
8+
public class PageImpl {
99
public int page = 1;
1010

1111
public void nextPage() {

library-common/src/main/java/com/zlx/library_common/util/ApiUtil.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
import com.zlx.library_common.module.ArticleApi;
44
import com.zlx.library_common.module.LoginApi;
5-
import com.zlx.library_common.module.TreeApi;
65
import com.zlx.library_common.module.ProjectApi;
6+
import com.zlx.library_common.module.TreeApi;
77
import com.zlx.library_common.module.UserApi;
88
import com.zlx.module_network.api1.livedata.RetrofitCreateLiveDataHelper;
99
import com.zlx.module_network.constrant.U;
1010

1111
public class ApiUtil {
1212

13-
// public static ApiLiveDataService getApi() {
14-
// return RetrofitCreateLiveDataHelper.getInstance(U.BASE_URL).create();
15-
// }
16-
1713
public static ProjectApi getProjectApi() {
1814
return RetrofitCreateLiveDataHelper.getInstance().create(U.BASE_URL, ProjectApi.class);
1915
}

module-home/src/main/java/com/zlx/module_home/activity/SearchResultAc.java

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
11
package com.zlx.module_home.activity;
22

33
import android.app.Activity;
4-
import android.content.Context;
54
import android.content.Intent;
6-
import android.graphics.Matrix;
7-
import android.graphics.RectF;
8-
import android.os.Parcelable;
9-
import android.transition.Fade;
105
import android.view.View;
116
import android.widget.TextView;
127

138
import androidx.annotation.NonNull;
14-
import androidx.appcompat.widget.AppCompatEditText;
159
import androidx.core.app.ActivityCompat;
1610
import androidx.core.app.ActivityOptionsCompat;
17-
import androidx.core.app.SharedElementCallback;
1811
import androidx.recyclerview.widget.LinearLayoutManager;
1912
import androidx.recyclerview.widget.RecyclerView;
2013

21-
import com.chad.library.adapter.base.BaseQuickAdapter;
22-
import com.chad.library.adapter.base.listener.OnItemClickListener;
23-
import com.gyf.immersionbar.BarHide;
24-
import com.gyf.immersionbar.ImmersionBar;
2514
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
2615
import com.scwang.smart.refresh.layout.api.RefreshLayout;
2716
import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
2817
import com.zlx.library_common.adapters.RvAdapterArticleList;
29-
import com.zlx.library_common.constrant.PageInfo;
18+
import com.zlx.library_common.constrant.PageImpl;
3019
import com.zlx.library_common.res_data.ArticleBean;
3120
import com.zlx.library_common.res_data.ArticleListRes;
3221
import com.zlx.library_common.util.ApiUtil;
@@ -37,7 +26,6 @@
3726
import com.zlx.module_network.api1.livedata.BaseObserver;
3827
import com.zlx.module_network.api1.livedata.BaseObserverCallBack;
3928
import com.zlx.module_network.bean.ApiResponse;
40-
import com.zlx.module_network.util.LogUtil;
4129

4230
import java.util.List;
4331

@@ -62,7 +50,7 @@ public class SearchResultAc extends BaseAc implements OnRefreshLoadMoreListener
6250
private RvAdapterArticleList adapterArticleList;
6351

6452
private String searchContent;
65-
private PageInfo pageInfo;
53+
private PageImpl pageImpl = new PageImpl();
6654

6755
public static void start(Activity activity, String searchContent, ActivityOptionsCompat optionsCompat) {
6856
Intent intent = new Intent(activity, SearchResultAc.class);
@@ -79,7 +67,6 @@ protected int getLayoutId() {
7967
@Override
8068
public void initViews() {
8169
super.initViews();
82-
pageInfo = new PageInfo();
8370
searchContent = getIntent().getStringExtra("searchContent");
8471
etSearch.setText(searchContent);
8572
smartRefreshLayout.setOnRefreshLoadMoreListener(this);
@@ -117,11 +104,11 @@ public void onRetryBtnClick() {
117104

118105
private void search(boolean refresh) {
119106
if (refresh) {
120-
pageInfo.resetZero();
107+
pageImpl.resetZero();
121108
} else {
122-
pageInfo.nextZeroPage();
109+
pageImpl.nextZeroPage();
123110
}
124-
ApiUtil.getArticleApi().search(pageInfo.zeroPage, searchContent).observe(this,
111+
ApiUtil.getArticleApi().search(pageImpl.zeroPage, searchContent).observe(this,
125112
new BaseObserver<>(new BaseObserverCallBack<ApiResponse<ArticleListRes>>() {
126113
@Override
127114
public void onSuccess(ApiResponse<ArticleListRes> data) {

module-mine/src/main/java/com/zlx/module_mine/activity/MyShareAc.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@
1010
import com.scwang.smart.refresh.layout.api.RefreshLayout;
1111
import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
1212
import com.zlx.library_common.adapters.RvAdapterArticleList;
13-
import com.zlx.library_common.constrant.PageInfo;
13+
import com.zlx.library_common.constrant.PageImpl;
1414
import com.zlx.library_common.res_data.ArticleBean;
1515
import com.zlx.library_common.res_data.MyShareBean;
1616
import com.zlx.library_common.util.ApiUtil;
1717
import com.zlx.module_base.base_ac.BaseAc;
1818
import com.zlx.module_base.base_util.RouterUtil;
1919
import com.zlx.module_mine.R;
2020
import com.zlx.module_mine.R2;
21-
import com.zlx.module_mine.adapters.RvAdapterMyShare;
2221
import com.zlx.module_network.api1.livedata.BaseObserver;
2322
import com.zlx.module_network.api1.livedata.BaseObserverCallBack;
2423
import com.zlx.module_network.bean.ApiResponse;
2524

26-
import java.util.ArrayList;
2725
import java.util.List;
2826

2927
import butterknife.BindView;
@@ -44,7 +42,7 @@ public class MyShareAc extends BaseAc implements OnRefreshLoadMoreListener {
4442

4543
private RvAdapterArticleList adapterArticleList;
4644

47-
private PageInfo pageInfo = new PageInfo();
45+
private PageImpl pageImpl = new PageImpl();
4846

4947
public static void launch(Context context) {
5048
context.startActivity(new Intent(context, MyShareAc.class));
@@ -94,11 +92,11 @@ protected void onResume() {
9492

9593
private void listMyShare(boolean refresh) {
9694
if (refresh) {
97-
pageInfo.reset();
95+
pageImpl.reset();
9896
} else {
99-
pageInfo.nextPage();
97+
pageImpl.nextPage();
10098
}
101-
ApiUtil.getArticleApi().listMyShare(pageInfo.page).observe(this,
99+
ApiUtil.getArticleApi().listMyShare(pageImpl.page).observe(this,
102100
new BaseObserver<>(new BaseObserverCallBack<ApiResponse<MyShareBean>>() {
103101
@Override
104102
public void onSuccess(ApiResponse<MyShareBean> data) {

0 commit comments

Comments
 (0)