android/charge.git

			@@ -15,11 +15,9 @@
			import com.dayu.qihealonelibrary.card.ElectricPriceCard;
			import com.dayu.qihealonelibrary.card.RegionCard;
			import com.dayu.qihealonelibrary.card.UserCard;
			import com.dayu.qihealonelibrary.databinding.ActivityRedCardBinding;

			import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
			import com.dayu.qihealonelibrary.tools.NfcReadHelper;

			import com.dayu.qihealonelibrary.utils.MyCommon;
			import com.dayu.qihealonelibrary.utils.CardCommon;
			import com.dayu.qihealonelibrary.view.ProgressDialog;

			import java.util.Calendar;
			@@ -31,10 +29,10 @@
			* Date: 2023-11-10 19:52
			* Description: 读卡界面
			*/
			public class ReadCardAcitivy extends BaseNfcActivity {
			public class ReadCardAcitivy extends BaseNfcActivityQHAlone {

			volatile UserCard userCard;
			ActivityRedCardBinding redCardBinding;
			ActivityRedCardQhaBinding redCardBinding;


			Intent intent;
			@@ -42,7 +40,7 @@
			@Override
			protected void onCreate(Bundle savedInstanceState) {
			super.onCreate(savedInstanceState);
			redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
			redCardBinding = ActivityRedCardQhaBinding.inflate(LayoutInflater.from(this));
			setContentView(redCardBinding.getRoot());
			}

			@@ -96,33 +94,33 @@
			byte cardType = data.get(0)[0];
			String cardTypeStr = HexUtil.byteToHex(cardType);
			switch (cardTypeStr) {
			case MyCommon.USER_CARD_TYPE_1:
			case MyCommon.USER_CARD_TYPE_2:
			case MyCommon.USER_CARD_TYPE_3:
			case CardCommon.USER_CARD_TYPE_1:
			case CardCommon.USER_CARD_TYPE_2:
			case CardCommon.USER_CARD_TYPE_3:
			userCard = UserCard.getBean(data);
			break;
			case MyCommon.MANAGE_CRAD:
			case CardCommon.MANAGE_CRAD:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为管理卡");
			stopAnim();
			break;
			case MyCommon.CLEAN_CARD_TYPE:
			case CardCommon.CLEAN_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为清零卡");
			stopAnim();
			break;
			case MyCommon.REGISTERED_CARD_TYPE:
			case CardCommon.REGISTERED_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为重新注册设备卡");
			stopAnim();

			break;
			case MyCommon.CLEAN_ALL_USER_CARD_TYPE:
			case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为删除全部用户卡");
			stopAnim();
			break;
			case MyCommon.DOMAIN_CARD_TYPE:
			case CardCommon.DOMAIN_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为设置域名卡");
			DomainCard domainCard = DomainCard.toBean(data);
			@@ -130,30 +128,30 @@
			redCardBinding.readCardDataTV.setText("序号：" + domainCard.getDomainNumber() + "\n" + "域名：" + domainCard.getDomainName() + "\n" + "端口号：" + domainCard.getPort());
			stopAnim();
			break;
			case MyCommon.TEST_CARD_TYPE:
			case CardCommon.TEST_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为测试卡");
			stopAnim();
			break;
			case MyCommon.CONFIGURATION_CARD_TYPE:
			case CardCommon.CONFIGURATION_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为配置设备注册信息卡");
			stopAnim();
			break;
			case MyCommon.CONFIGURATION_POWER_CARD_TYPE:
			case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前配置水泵功率卡");
			ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
			redCardBinding.readCardDataTV.setText(powerCard.getPower());
			stopAnim();
			break;
			case MyCommon.BLACK:
			case CardCommon.BLACK:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为黑卡");
			BlackCard blackCard = BlackCard.getBean(data);
			redCardBinding.readCardDataTV.setText("当前黑卡用户号为：" + blackCard.getBlackCard());
			break;
			case MyCommon.REGION:
			case CardCommon.REGION:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为区域表号卡");
			RegionCard regionCard = RegionCard.getBean(data);
			@@ -162,7 +160,7 @@
			stringBuilder.append("控制器编号：").append(regionCard.getControllerCodel()).append("\n");
			redCardBinding.readCardDataTV.setText(stringBuilder.toString());
			break;
			case MyCommon.ELECTRIC_PRICE:
			case CardCommon.ELECTRIC_PRICE:
			viweGone(false);
			redCardBinding.readCardTypeTV.setText("当前为电量单价卡");
			ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
			@@ -186,7 +184,7 @@
			@Override
			public void error(int code) {
			switch (code) {
			case MyCommon.ERROR_MOVE:
			case CardCommon.ERROR_MOVE:
			stopAnim();
			TipUtil.show("连接中断，请重新贴合卡片");
			break;