From 44e05fc867c3f028cf110f7b2fefb417d51646b2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 三月 2024 12:01:13 +0800
Subject: [PATCH] 添加密码校验 修复用户卡bug
---
app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java | 64 ++++++++++++--------------------
1 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java b/app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java
index 520ed07..0ed8d25 100644
--- a/app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java
@@ -3,17 +3,9 @@
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.View;
-import com.dayu.recharge.card.CleanCard;
-import com.dayu.recharge.card.ConfigurationPowerCard;
-import com.dayu.recharge.card.ConfigureDeviceRegistrationCrad;
-import com.dayu.recharge.card.ManageCard;
-import com.dayu.recharge.card.RegisteredCard;
-import com.dayu.recharge.card.TestCard;
import com.dayu.recharge.databinding.ActivityIdentyfyingBinding;
import com.dayu.recharge.dbBean.CardData;
-import com.dayu.recharge.dbBean.IdentityBean;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.ChooseView;
@@ -45,31 +37,20 @@
super.onCreate(savedInstanceState);
binding = ActivityIdentyfyingBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
- binding.chooseCardType.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), new ChooseView.ChooseCallBack() {
- @Override
- public void onOptionsSelect(int options1) {
- chooseData(nianfen[options1]);
- binding.chooseCardTypeText.setText(nianfen[options1]);
- }
- }).show();
+ binding.chooseCardType.setOnClickListener(v ->
+ ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), options1 -> {
+ chooseData(nianfen[options1]);
+ binding.chooseCardTypeText.setText(nianfen[options1]);
+ }).show());
+
+ binding.electricOk.setOnClickListener(v -> {
+ if (TextUtils.isEmpty(cardType)) {
+ TipUtil.show("璇烽�夋嫨鍗＄被鍨�");
+ return;
}
- });
-
-
- IdentityBean identityBean = baseDao.identityDao().findFirst();
-
- binding.electricOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (TextUtils.isEmpty(cardType)) {
- TipUtil.show("璇烽�夋嫨鍗＄被鍨�");
- return;
- }
- String data = binding.electricOldNumber.getText().toString();
- if (!TextUtils.isEmpty(data)) {
+ String data = binding.electricNewNum.getText().toString();
+ if (!TextUtils.isEmpty(data)) {
+ if (data.length() % 2 == 0) {
if (cardData == null) {
cardData = new CardData();
cardData.setCardType(cardType);
@@ -78,8 +59,11 @@
baseDao.cardDataDao().insert(cardData);
TipUtil.show("淇濆瓨鎴愬姛");
} else {
- TipUtil.show("璇疯緭鍏ュ崱鏍囪瘑");
+ TipUtil.show("璇疯緭鍏ユ纭殑16杩涘埗瀛楃涓�");
}
+
+ } else {
+ TipUtil.show("璇疯緭鍏ュ崱鏍囪瘑");
}
});
}
@@ -94,7 +78,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new ManageCard().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
case "娓呴浂鍗�":
@@ -103,7 +87,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new CleanCard().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
case "閲嶆柊娉ㄥ唽璁惧鍗�":
@@ -112,7 +96,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new RegisteredCard().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
case "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�":
@@ -121,7 +105,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new RegisteredCard().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
case "娴嬭瘯鍗�":
@@ -130,7 +114,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new TestCard().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
case "璁惧淇℃伅鍗�":
@@ -139,7 +123,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new ConfigureDeviceRegistrationCrad().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
case "姘存车鍔熺巼鍗�":
@@ -148,7 +132,7 @@
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(new ConfigurationPowerCard().getCardData());
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
}
break;
}
--
Gitblit v1.8.0