From d6f5361b391ea531e7c1f763384fbb21398a56bb Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 04:04:57 +0000
Subject: [PATCH] Merge branch 'master' into page
---
/dev/null | 8 ----
app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java | 14 +++---
app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java | 10 +++-
app/src/main/java/com/runt/open/mvvm/ui/main/home/MsgAdapter.java | 5 +-
app/src/main/java/com/runt/open/mvvm/data/Results.java | 7 ++-
app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageActivitys.java | 7 +++
app/src/main/java/com/runt/open/mvvm/ui/main/MainActivity.java | 4 +-
app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java | 16 ++++++++
app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageFragments.java | 16 ++++++++
9 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java b/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java
index 55e0fac..f295882 100644
--- a/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java
+++ b/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java
@@ -16,7 +16,9 @@
import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
import java.lang.reflect.ParameterizedType;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by Administrator on 2021/11/4 0004.
@@ -75,18 +77,20 @@
refresh.autoRefresh();
}
- protected Object[] requestParams(){return null;};
+ protected Map requestParams() {
+ return new HashMap();
+ }
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 0;
- mViewModel.requestData(mViewModel.request(page,requestParams()));
+ mViewModel.requestData(page,requestParams());
}
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
page++;
- mViewModel.requestData(mViewModel.request(page,requestParams()));
+ mViewModel.requestData(page,requestParams());
}
public A getAdapter() {
diff --git a/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java b/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java
index e58491b..5b20f7b 100644
--- a/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java
+++ b/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java
@@ -16,7 +16,9 @@
import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
import java.lang.reflect.ParameterizedType;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 分页fragment 封装
@@ -75,22 +77,20 @@
refresh.autoRefresh();
}
- /**
- * 参数
- * @return
- */
- protected Object[] requestParams(){return null;};
+ protected Map requestParams() {
+ return new HashMap();
+ }
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 0;
- mViewModel.requestData(mViewModel.request(page,requestParams()));
+ mViewModel.requestData(page,requestParams());
}
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
page++;
- mViewModel.requestData(mViewModel.request(page,requestParams()));
+ mViewModel.requestData(page,requestParams());
}
public A getAdapter() {
diff --git a/app/src/main/java/com/runt/open/mvvm/data/Results.java b/app/src/main/java/com/runt/open/mvvm/data/Results.java
index 0d17e8a..e5770af 100644
--- a/app/src/main/java/com/runt/open/mvvm/data/Results.java
+++ b/app/src/main/java/com/runt/open/mvvm/data/Results.java
@@ -1,7 +1,6 @@
package com.runt.open.mvvm.data;
import com.runt.open.mvvm.ui.login.UserBean;
-import com.runt.open.mvvm.ui.main.home.Message;
/**
* My father is Object, ites purpose of
@@ -14,5 +13,9 @@
public static class StringApiResult extends HttpApiResult<String> { }
- public class MessageResult extends PageResult<Message>{}
+ //资讯信息
+ public class Message {
+ public String id,title,content,cTime;
+ }
+
}
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageActivitys.java b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageActivitys.java
new file mode 100644
index 0000000..f295b7c
--- /dev/null
+++ b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageActivitys.java
@@ -0,0 +1,7 @@
+package com.runt.open.mvvm.ui.loadpage;
+
+/**
+ * @purpose Created by Runt (qingingrunt2010@qq.com) on 2022/8/9.
+ */
+public class PageActivitys {
+}
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageFragments.java b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageFragments.java
new file mode 100644
index 0000000..28da265
--- /dev/null
+++ b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageFragments.java
@@ -0,0 +1,16 @@
+package com.runt.open.mvvm.ui.loadpage;
+
+import com.runt.open.mvvm.base.fragments.LoadPageFragment;
+import com.runt.open.mvvm.data.Results;
+import com.runt.open.mvvm.databinding.RefreshRecyclerBinding;
+import com.runt.open.mvvm.ui.main.home.MsgAdapter;
+
+/**
+ * @purpose Created by Runt (qingingrunt2010@qq.com) on 2022/8/9.
+ */
+public class PageFragments {
+
+ public static class HomeFragment extends LoadPageFragment<RefreshRecyclerBinding, PageViewModels.HomeViewModel, MsgAdapter, Results.Message> {
+
+ }
+}
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java
new file mode 100644
index 0000000..2af3994
--- /dev/null
+++ b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java
@@ -0,0 +1,16 @@
+package com.runt.open.mvvm.ui.loadpage;
+
+import com.runt.open.mvvm.base.model.LoadPageViewModel;
+import com.runt.open.mvvm.ui.main.home.Message;
+
+/**
+ * @purpose Created by Runt (qingingrunt2010@qq.com) on 2022/8/9.
+ */
+public class PageViewModels {
+ public class HomeViewModel extends LoadPageViewModel<Message> {
+ @Override
+ protected String requestUrl() {
+ return "getMsgList";
+ }
+ }
+}
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/main/MainActivity.java b/app/src/main/java/com/runt/open/mvvm/ui/main/MainActivity.java
index b6c9ae6..3b08428 100644
--- a/app/src/main/java/com/runt/open/mvvm/ui/main/MainActivity.java
+++ b/app/src/main/java/com/runt/open/mvvm/ui/main/MainActivity.java
@@ -20,9 +20,9 @@
import com.runt.open.mvvm.databinding.ActivityMainBinding;
import com.runt.open.mvvm.listener.CustomClickListener;
import com.runt.open.mvvm.listener.ResPonse;
+import com.runt.open.mvvm.ui.loadpage.PageFragments;
import com.runt.open.mvvm.ui.login.RegisterLoginActivity;
import com.runt.open.mvvm.ui.login.UserBean;
-import com.runt.open.mvvm.ui.main.home.HomeFragment;
import com.runt.open.mvvm.ui.main.mine.MineFragment;
import com.runt.open.mvvm.ui.main.service.ServiceFragment;
@@ -30,7 +30,7 @@
public class MainActivity extends BaseActivity<ActivityMainBinding, MainViewModel> {
- private BaseFragment[] fragments = {new HomeFragment(),new ServiceFragment(),new MineFragment()} ;
+ private BaseFragment[] fragments = {new PageFragments.HomeFragment(),new ServiceFragment(),new MineFragment()} ;
ActivityResultLauncher<Intent> loginLaunch = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
if(result.getResultCode() == RESULT_CODE_SUCESS){
fragments[2].loadData();//登录后重新刷新
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/main/home/HomeFragment.java b/app/src/main/java/com/runt/open/mvvm/ui/main/home/HomeFragment.java
deleted file mode 100644
index 039353d..0000000
--- a/app/src/main/java/com/runt/open/mvvm/ui/main/home/HomeFragment.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.runt.open.mvvm.ui.main.home;
-
-import com.runt.open.mvvm.base.fragments.LoadPageFragment;
-import com.runt.open.mvvm.databinding.RefreshRecyclerBinding;
-
-public class HomeFragment extends LoadPageFragment<RefreshRecyclerBinding,HomeViewModel,MsgAdapter,Message> {
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/main/home/HomeViewModel.java b/app/src/main/java/com/runt/open/mvvm/ui/main/home/HomeViewModel.java
deleted file mode 100644
index f827a0c..0000000
--- a/app/src/main/java/com/runt/open/mvvm/ui/main/home/HomeViewModel.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.runt.open.mvvm.ui.main.home;
-
-import com.runt.open.mvvm.base.model.LoadPageViewModel;
-import com.runt.open.mvvm.data.HttpApiResult;
-import com.runt.open.mvvm.data.PageResult;
-
-import io.reactivex.Observable;
-
-public class HomeViewModel extends LoadPageViewModel<Message> {
-
- @Override
- public Observable<HttpApiResult<PageResult<Message>>> request(int page, Object... objects) {
- return commonApi.getMsgList(page,SIZE);
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/main/home/Message.java b/app/src/main/java/com/runt/open/mvvm/ui/main/home/Message.java
deleted file mode 100644
index c25dc5f..0000000
--- a/app/src/main/java/com/runt/open/mvvm/ui/main/home/Message.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.runt.open.mvvm.ui.main.home;
-
-/**
- * @purpose Created by Runt (qingingrunt2010@qq.com) on 2022/7/27.
- */
-public class Message {
- public String id,title,content,cTime;
-}
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/main/home/MsgAdapter.java b/app/src/main/java/com/runt/open/mvvm/ui/main/home/MsgAdapter.java
index f9ad43e..89a4e55 100644
--- a/app/src/main/java/com/runt/open/mvvm/ui/main/home/MsgAdapter.java
+++ b/app/src/main/java/com/runt/open/mvvm/ui/main/home/MsgAdapter.java
@@ -3,6 +3,7 @@
import android.view.View;
import com.runt.open.mvvm.base.adapter.BaseAdapter;
+import com.runt.open.mvvm.data.Results;
import com.runt.open.mvvm.databinding.ItemMsgBinding;
import com.runt.open.mvvm.listener.CustomClickListener;
import com.runt.open.mvvm.util.HandleDate;
@@ -13,10 +14,10 @@
* @purpose Created by Runt (qingingrunt2010@qq.com) on 2020-8-21.
*/
-public class MsgAdapter extends BaseAdapter<Message, ItemMsgBinding> {
+public class MsgAdapter extends BaseAdapter<Results.Message, ItemMsgBinding> {
@Override
- protected void onBindView(ItemMsgBinding binding, int position, Message message) {
+ protected void onBindView(ItemMsgBinding binding, int position, Results.Message message) {
binding.txtDetail.setText(message.content);
binding.txtTime.setText(HandleDate.getTimeStateNew(HandleDate.getDateTimeToLong(message.cTime)));
binding.txtTitle.setText(message.title);
--
Gitblit v1.9.1