android/charge.git

			@@ -7,6 +7,7 @@
			import android.view.LayoutInflater;
			import android.view.View;

			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;
			@@ -22,7 +23,6 @@
			import com.dayu.qiheonlinelibrary.dbBean.AdminDataBean;
			import com.dayu.qiheonlinelibrary.net.ApiManager;
			import com.dayu.qiheonlinelibrary.net.BaseResponse;
			import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
			import com.dayu.qiheonlinelibrary.tools.NfcReadHelper;
			import com.dayu.qiheonlinelibrary.utils.CardCommon;
			import com.dayu.qiheonlinelibrary.view.ProgressDialog;
			@@ -37,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;
			@@ -57,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);
			}

			/**
			@@ -97,7 +97,7 @@

			if (!data.isEmpty()) {
			if (!TextUtils.isEmpty(cardNumber)) {
			userCard = UserCard.getBean(data);
			userCard = new UserCard().getBean(data);
			getUserInfoAndCardInfo(cardNumber,userCard.getMyUserCode());
			} else {