From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
index f1b3245..eda28d5 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
@@ -3,6 +3,7 @@
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
+import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -15,6 +16,7 @@
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.adapter.RechargeAdapter;
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeListQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
@@ -74,7 +76,11 @@
getList();
}
});
- adapter = new RechargeAdapter(this, rechargeList);
+ adapter = new RechargeAdapter(this, rechargeList, position -> {
+ Intent intent = new Intent(RechargeListActivity.this, RechargeDetailActivity.class);
+ intent.putExtra("rechargeBean", rechargeList.get(position));
+ startActivity(intent);
+ });
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
rechargeListBinding.recyclerView.setLayoutManager(layoutManager);
rechargeListBinding.recyclerView.setAdapter(adapter);
@@ -98,9 +104,9 @@
// 鍦ㄨ繖閲屾墽琛屽紓姝ユ搷浣�
List<RechargeBean> beanList;
if (beginTime == 0 && endTime == 0) {
- beanList = asynchBaseDao.rechargeDao().findAll(page * limit, limit);
+ beanList = asynchBaseDao.rechargeDao().findAll(QHOnLineApplication.qhAloneApplication.adminId, page * limit, limit);
} else {
- beanList = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
+ beanList = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.qhAloneApplication.adminId, beginTime, endTime);
}
// 灏嗙粨鏋滃彂閫佺粰瑙傚療鑰�
emitter.onNext(beanList);
@@ -113,11 +119,16 @@
result -> {
// 鍦ㄨ繖閲屽鐞嗙粨鏋滐紝杩欓噷鏄湪涓荤嚎绋嬩腑
// System.out.println("Result: " + result);
- if (result.size() < limit) {
- myRefreshLayout.finishLoadMoreWithNoMoreData();
- }
- if (result != null && result.size() > 0) {
+ if (beginTime == 0 && endTime == 0) {
+ if (result.size() < limit) {
+ myRefreshLayout.finishLoadMoreWithNoMoreData();
+ }
+ if (result != null && result.size() > 0) {
+ rechargeList.addAll(result);
+ }
+ } else {
rechargeList.addAll(result);
+ myRefreshLayout.finishLoadMoreWithNoMoreData();
}
adapter.notifyDataSetChanged();
getTotal();
--
Gitblit v1.8.0