From 765d5165b18938eaefbd5b3af00e8775bfb1a91f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 28 二月 2025 09:43:35 +0800
Subject: [PATCH] 1.优化代码将http通信通用模块放在baselibrary内 2.创建通用版本的library
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java | 80 ++++++++++-----------------------------
1 files changed, 21 insertions(+), 59 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
index cd85db7..1df455d 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
@@ -7,7 +7,7 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.baselibrary.tools.HexUtil;
+import com.dayu.baselibrary.net.subscribers.SubscriberListener;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.ConfirmDialog;
@@ -17,22 +17,16 @@
import com.dayu.qiheonlinelibrary.card.DomainCard;
import com.dayu.qiheonlinelibrary.card.ElectricPriceCard;
import com.dayu.qiheonlinelibrary.card.ManageCard;
-import com.dayu.qiheonlinelibrary.card.ManagerToUserCard;
import com.dayu.qiheonlinelibrary.card.RegionCard;
import com.dayu.qiheonlinelibrary.card.UserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityRedCardQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.AdminDataBean;
-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;
-import com.dayu.qiheonlinelibrary.tools.NFCWriteHelper;
import com.dayu.qiheonlinelibrary.tools.NfcReadHelper;
import com.dayu.qiheonlinelibrary.utils.CardCommon;
import com.dayu.qiheonlinelibrary.view.ProgressDialog;
-
-import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -43,7 +37,7 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends QHOlineBaseNfcActivity {
volatile UserCard userCard;
ActivityRedCardQhlBinding redCardBinding;
@@ -63,14 +57,14 @@
}
+
@Override
- public void onNewIntent(Intent intent) {
+ public void onNfcBack(Intent intent) {
this.intent = intent;
ProgressDialog.show(this);
if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
readAllData(intent);
}
- super.onNewIntent(intent);
}
/**
@@ -103,8 +97,8 @@
if (!data.isEmpty()) {
if (!TextUtils.isEmpty(cardNumber)) {
- userCard = UserCard.getBean(data);
- getUserInfoAndCardInfo(cardNumber);
+ userCard = new UserCard().getBean(data);
+ getUserInfoAndCardInfo(cardNumber,userCard.getMyUserCode());
} else {
}
@@ -115,46 +109,11 @@
break;
case CardCommon.MANAGE_CRAD://绠＄悊鍗�
ManageCard manageCard = ManageCard.getBean(data);
- viweGone(false);
- userCardStr = manageCard.getUserCard().toUpperCase();
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
- + "鍘熷鍗″彿锛�" + userCardStr);
- if (manageCard.getType() == (byte) 1) {
- //褰�01鏃跺皢1鎵囧尯0鍧楀師绠＄悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
- confirmDialog = new ConfirmDialog(this, "鏄惁纭琛ュ崱锛岃鍗″皢鎴愪负鏂扮敤鎴峰崱锛熷苟涓斾笉瑕佺Щ鍔ㄥ崱鐗�", new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- ProgressDialog.show(ReadCardAcitivy.this);
- try {
- confirmDialog.dismiss();
-
- List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(userCardStr);
- if (userCardBeans != null && !userCardBeans.isEmpty()) {
- UserCardBean userName = userCardBeans.get(0);
- userName.setCardNumber(cardNumber);
- baseDao.userCardDao().update(userName);
- }
-
- NFCWriteHelper nfcWriteHelper = NFCWriteHelper.getInstence(intent, ReadCardAcitivy.this);
- adminData = baseDao.adminDao().findFirst();
- ManagerToUserCard managerToUserCard = new ManagerToUserCard();
- managerToUserCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
- managerToUserCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
- managerToUserCard.setTotalElectric(manageCard.getTotalElectric());
- if (nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(), 1, 0)) {
- TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
- } else {
- TipUtil.show(ReadCardAcitivy.this, "琛ュ崱澶辫触锛岃閲嶆柊鍒峰崱", () -> ReadCardAcitivy.this.finish());
- }
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- stopAnim();
- }
- });
- confirmDialog.show();
+ if (manageCard != null) {
+ viweGone(false);
+ userCardStr = manageCard.getUserCard().toUpperCase();
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
+ + "鍘熷鍗″彿锛�" + userCardStr);
}
break;
case CardCommon.CLEAN_CARD_TYPE:
@@ -262,16 +221,19 @@
*
* @param iccardCode
*/
- public void getUserInfoAndCardInfo(String iccardCode) {
+ public void getUserInfoAndCardInfo(String iccardNum,String iccardCode) {
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>>() {
+ data.put("iccardNum", iccardNum);
+ data.put("iccardCode", iccardCode);
+ 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()) {
+ if (t.isSuccess() && t.getData() instanceof CardInfoResult) {
setUserData(t.getData());
+ } else {
+ TipUtil.show(ReadCardAcitivy.this, "浠庤幏鍙栧钩鍙板崱淇℃伅澶辫触锛�");
}
}
});
@@ -283,9 +245,9 @@
redCardBinding.redName.setText(cardInfoResult.getPeasantName());
redCardBinding.redCardCode.setText(cardNumber);
redCardBinding.redUserCode.setText(cardInfoResult.getIccardCode());
- redCardBinding.redBlance.setText(MornyUtil.changeF2Y(userCard.getBalance())+"鍏�");
- redCardBinding.redElectric.setText(MornyUtil.changeF2Y(userCard.getSurplusElecticity())+"搴�");
- redCardBinding.redTotalMorny.setText(MornyUtil.changeF2Y(userCard.getTotalMorny())+"鍏�");
+ redCardBinding.redBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
+ redCardBinding.redElectric.setText(MornyUtil.changeF2Y(userCard.getSurplusElecticity()) + "搴�");
+ redCardBinding.redTotalMorny.setText(cardInfoResult.getTotalRechargeMoney() + "鍏�");
redCardBinding.redPhone.setText(cardInfoResult.getPeasantPhone());
redCardBinding.redCodeId.setText(cardInfoResult.getPeasantIdNumber());
if (cardInfoResult.getIccardStatus() == 0) {
--
Gitblit v1.8.0