From 954eaed548efb75b3dc79343587acb79e53d214d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 23 八月 2024 17:19:59 +0800
Subject: [PATCH] 优化写卡逻辑，再次读取内容确认写卡成功再提示成功
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
index 91c4c32..2a47e87 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
@@ -5,12 +5,14 @@
import android.os.Bundle;
import android.view.LayoutInflater;
+import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.bean.CardInfoResult;
import com.dayu.qiheonlinelibrary.card.ManagerToUserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityManagerReadQhlBinding;
+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;
@@ -26,7 +28,7 @@
* author: zuo
* Date: 2024-08-12
* Time: 20:10
- * 澶囨敞锛�
+ * 澶囨敞锛� 璇诲彇绠＄悊鍗★紝浠庢帶鍒跺櫒璇诲崱鍚庡湪姝ょ晫闈㈣鍗�
*/
public class ManagerReadActivity extends BaseNfcActivity {
@@ -39,6 +41,8 @@
CardInfoResult cardInfoResult;
ManagerToUserCard managerToUserCard;
+
+ UserCardBean userCardBean = new UserCardBean();
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -56,8 +60,8 @@
intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
startActivity(intent);
ManagerReadActivity.this.finish();
- }else {
- TipUtil.show(ManagerReadActivity.this,"璇峰埛绠＄悊鍗�");
+ } else {
+ TipUtil.show(ManagerReadActivity.this, "璇峰埛绠＄悊鍗�");
}
});
}
@@ -79,7 +83,10 @@
managerToUserCard = NfcReadHelper.getInstence(intent, this).getManagerToUserCardData();
if (managerToUserCard != null) {
if (QHOnLineApplication.getInstance().arerNumber.equalsIgnoreCase(String.valueOf(managerToUserCard.getArerNumber()))) {
- getUserInfoAndCardInfo(managerToUserCard.getOldCardNumber());
+ String oldCardNumber = managerToUserCard.getOldCardNumber();
+ oldCardNumber = HexUtil.spaceHex(oldCardNumber);
+ oldCardNumber = HexUtil.HighLowHex(oldCardNumber);
+ getUserInfoAndCardInfo(oldCardNumber);
} else {
TipUtil.show(this, "涓嶆槸鏈尯鍩熷崱锛�");
}
@@ -105,20 +112,31 @@
Map<String, Object> data = new HashMap<>();
//ic鍗′俊鎭痠d
data.put("iccardNum", iccardCode);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
@Override
public void onNext(BaseResponse<CardInfoResult> t) {
String state = "";
if (t.isSuccess()) {
- cardInfoResult = t.getData();
- isReadSuccess = true;
- TipUtil.show(ManagerReadActivity.this, "璇诲崱鎴愬姛锛屼笅涓�姝ュ皢鍐欏崱锛�", () -> {
- Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
- intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
- intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
- startActivity(intent);
- ManagerReadActivity.this.finish();
- });
+ if (t.getData() != null) {
+ cardInfoResult = t.getData();
+ userCardBean.setUserName(cardInfoResult.getPeasantName());
+ userCardBean.setUserID(cardInfoResult.getPeasantIdNumber());
+ userCardBean.setPhone(cardInfoResult.getPeasantPhone());
+ userCardBean.setPersonId(cardInfoResult.getPeasantId());
+ userCardBean.setAddressCode(cardInfoResult.getAdcd());
+ userCardBean.setAddressName(cardInfoResult.getAdcdName());
+ isReadSuccess = true;
+ TipUtil.show(ManagerReadActivity.this, "璇诲崱鎴愬姛锛屼笅涓�姝ュ皢鍐欏崱锛�", () -> {
+ Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
+ intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
+ intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
+ intent.putExtra("userCardBean", userCardBean);
+ startActivity(intent);
+ ManagerReadActivity.this.finish();
+ });
+ } else {
+ TipUtil.show(ManagerReadActivity.this, "鏈煡璇㈠埌璇ュ崱淇℃伅锛岃妫�鏌ャ��");
+ }
}
}
});
--
Gitblit v1.8.0