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/CardSearchActivity.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
index bbe4343..c4fbd08 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
@@ -6,7 +6,6 @@
import androidx.recyclerview.widget.LinearLayoutManager;
-import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.DeviceUtils;
import com.dayu.baselibrary.utils.TipUtil;
@@ -16,6 +15,7 @@
import com.dayu.qiheonlinelibrary.bean.CardInfoListResult;
import com.dayu.qiheonlinelibrary.bean.UserListResult;
import com.dayu.qiheonlinelibrary.databinding.ActivityCardSearchQhlBinding;
+import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -50,6 +50,8 @@
ConfirmDialog confirmDialog;
CardInfoListResult.Records mRecord;
+ UserCardBean userCardBean;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -57,6 +59,7 @@
setContentView(binding.getRoot());
pearsontId = this.getIntent().getStringExtra("pearsontId");
type = this.getIntent().getIntExtra("type", 0);
+ userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("dbUserCard");
initView();
selectUser(true);
}
@@ -142,20 +145,24 @@
data.put("peasantId", pearsontId);
data.put("current", page);
data.put("pageSize", size);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/info/getIccardPeasantVoList", CardInfoListResult.class, data, new SubscriberListener<BaseResponse<CardInfoListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/info/getIccardPeasantVoList", CardInfoListResult.class, data, new SubscriberListener<BaseResponse<CardInfoListResult>>() {
@Override
public void onNext(BaseResponse<CardInfoListResult> t) {
if (t.isSuccess()) {
- if (t.getData().getTotal() == records.size()) {
- myRefreshLayout.finishLoadMoreWithNoMoreData();
- } else {
+ if (t.getData() != null) {
+ if (t.getData().getTotal() == records.size() || size > t.getData().getTotal()) {
+ myRefreshLayout.finishLoadMoreWithNoMoreData();
+ }
records.addAll(t.getData().getRecords());
+ adapter.notifyDataSetChanged();
+ myRefreshLayout.finishLoadMore();
+ if (isRefresh) {
+ myRefreshLayout.finishRefresh();
+ }
}
- adapter.notifyDataSetChanged();
- myRefreshLayout.finishLoadMore();
- if (isRefresh) {
- myRefreshLayout.finishRefresh();
- }
+
+ } else {
+ TipUtil.show(CardSearchActivity.this, t.getMsg());
}
}
});
@@ -169,18 +176,25 @@
Map<String, Object> data = new HashMap<>();
data.put("iccardInfoId", iccardInfoId);
data.put("equipCode", DeviceUtils.getSN());
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/reportLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/reportLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
@Override
public void onNext(BaseResponse<UserListResult> t) {
if (t.isSuccess()) {
- if (type == BaseCommon.LOSS_CARD) {
- TipUtil.show(CardSearchActivity.this, "鎸傚け鎴愬姛", () -> {
- CardSearchActivity.this.finish();
- });
- } else if (type == BaseCommon.REPLACE_NO_CARD) {
- startNFCActivit(iccardInfoId);
+ if (t.getData() != null) {
+ if (type == BaseCommon.LOSS_CARD) {
+ TipUtil.show(CardSearchActivity.this, "鎸傚け鎴愬姛", () -> {
+ CardSearchActivity.this.finish();
+ if (UserSearchActivity.userSearchActivity != null) {
+ UserSearchActivity.userSearchActivity.finish();
+ UserSearchActivity.userSearchActivity = null;
+ }
+ });
+ } else if (type == BaseCommon.REPLACE_NO_CARD) {
+ startNFCActivit(iccardInfoId);
+ } else if (type == BaseCommon.REPLACE_HAS_CARD) {
+ startManagerActivity(iccardInfoId, mRecord.getIccardNum());
+ }
}
-
} else {
ToastUtil.show(t.getMsg());
}
@@ -196,7 +210,7 @@
Map<String, Object> data = new HashMap<>();
data.put("iccardInfoId", iccardInfoId);
data.put("equipCode", DeviceUtils.getSN());
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/releaseLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/releaseLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
@Override
public void onNext(BaseResponse<UserListResult> t) {
if (t.isSuccess()) {
@@ -210,17 +224,29 @@
});
}
+ /**
+ * 宸插叧娉佃ˉ鍗�
+ *
+ * @param iccardInfoId
+ */
private void startNFCActivit(String iccardInfoId) {
//鐩存帴琛ュ崱鐨勬柟寮�
Intent intent = new Intent(CardSearchActivity.this, NFCWreatActivity.class);
intent.putExtra("iccardInfoId", iccardInfoId);
intent.putExtra("replaceType", type);
+ intent.putExtra("userCardBean", userCardBean);
startActivity(intent);
CardSearchActivity.this.finish();
}
+ /**
+ * 鏈叧娉佃ˉ鍗�
+ *
+ * @param iccardInfoId
+ * @param oldCardNumber
+ */
private void startManagerActivity(String iccardInfoId, String oldCardNumber) {
- Intent intent = new Intent(CardSearchActivity.this, ManagerReadActivity.class);
+ Intent intent = new Intent(CardSearchActivity.this, ManagerWriteActivity.class);
intent.putExtra("iccardInfoId", iccardInfoId);
intent.putExtra("replaceType", type);
intent.putExtra("oldCardNumber", oldCardNumber);
--
Gitblit v1.8.0