From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 93e20e2..8048fa1 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
@@ -48,6 +48,7 @@
List<CardInfoListResult.Records> records = new ArrayList<>();
int type;
ConfirmDialog confirmDialog;
+ CardInfoListResult.Records mRecord;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -75,6 +76,7 @@
adapter = new CardAdapter(this, records, new CardAdapter.OnItemClickListener() {
@Override
public void onItemClick(int position) {
+ mRecord = records.get(position);
String title;
if (type == BaseCommon.LOSS_CARD) {
title = "鎸傚け鍗＄墖";
@@ -86,14 +88,21 @@
String data = "鍗″彿锛�" + records.get(position).getIccardNum();
confirmDialog = new ConfirmDialog(CardSearchActivity.this, title, data, v -> {
- String iccardInfoId = records.get(position).getIccardInfoId();
+ String iccardInfoId = mRecord.getIccardInfoId();
if (type == BaseCommon.LOSS_CARD) {
lossCard(iccardInfoId);
} else if (type == BaseCommon.REPORT_LOSS_CARD) {
reportLossCard(iccardInfoId);
- } else if (type == BaseCommon.REPLACE_HAS_CARD) {
-
- } else if (type == BaseCommon.REPLACE_NO_CARD) {
+ } else if (type == BaseCommon.REPLACE_HAS_CARD) {//鏈叧娉佃ˉ鍗�
+ //琛ュ崱鍓嶉渶瑕佸厛鎸傚け
+ if (mRecord.getIccardStatus() == 0) {
+ lossCard(iccardInfoId);
+ } else if (mRecord.getIccardStatus() == 2) {
+ startManagerActivity(iccardInfoId, mRecord.getIccardNum());
+ } else {
+ TipUtil.show("褰撳墠鍗＄姸鎬佷笉鑳藉啀琛ュ崱");
+ }
+ } else if (type == BaseCommon.REPLACE_NO_CARD) {//宸插叧娉佃ˉ鍗�
//琛ュ崱鍓嶉渶瑕佸厛鎸傚け
if (records.get(position).getIccardStatus() == 0) {
lossCard(iccardInfoId);
@@ -102,14 +111,10 @@
} else {
TipUtil.show("褰撳墠鍗＄姸鎬佷笉鑳藉啀琛ュ崱");
}
-
-
}
confirmDialog.dismiss();
});
confirmDialog.show();
-
-
}
});
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
@@ -174,6 +179,8 @@
});
} else if (type == BaseCommon.REPLACE_NO_CARD) {
startNFCActivit(iccardInfoId);
+ } else if (type == BaseCommon.REPLACE_HAS_CARD) {
+ startNFCActivit(iccardInfoId);
}
} else {
@@ -205,6 +212,11 @@
});
}
+ /**
+ * 宸插叧娉佃ˉ鍗�
+ *
+ * @param iccardInfoId
+ */
private void startNFCActivit(String iccardInfoId) {
//鐩存帴琛ュ崱鐨勬柟寮�
Intent intent = new Intent(CardSearchActivity.this, NFCWreatActivity.class);
@@ -213,4 +225,19 @@
startActivity(intent);
CardSearchActivity.this.finish();
}
+
+ /**
+ * 鏈叧娉佃ˉ鍗�
+ *
+ * @param iccardInfoId
+ * @param oldCardNumber
+ */
+ private void startManagerActivity(String iccardInfoId, String oldCardNumber) {
+ Intent intent = new Intent(CardSearchActivity.this, ManagerWriteActivity.class);
+ intent.putExtra("iccardInfoId", iccardInfoId);
+ intent.putExtra("replaceType", type);
+ intent.putExtra("oldCardNumber", oldCardNumber);
+ startActivity(intent);
+ CardSearchActivity.this.finish();
+ }
}
--
Gitblit v1.8.0