android/charge.git

			@@ -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卡信息id
			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) {