From fe79cc8b05637b7dd3fc8f4c37a54e5f85da1efc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 27 三月 2024 17:35:27 +0800
Subject: [PATCH] 优化卡标识设置界面提示
---
app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java | 120 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 87 insertions(+), 33 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 9786eb7..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,10 +3,10 @@
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.View;
import com.dayu.recharge.databinding.ActivityIdentyfyingBinding;
-import com.dayu.recharge.dbBean.IdentityBean;
+import com.dayu.recharge.dbBean.CardData;
+import com.dayu.recharge.utils.MyCommon;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.ChooseView;
@@ -22,73 +22,127 @@
public class IdentifyingActivity extends BaseActivity {
ActivityIdentyfyingBinding binding;
- IdentityBean myIdentityBean;
- String[] nianfen = {"绠＄悊鍗�", "娓呴浂鍗�", "閲嶆柊娉ㄥ唽璁惧鍗�", "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�", "璁剧疆鍩熷悕鍗�", "娴嬭瘯鍗�", "璁惧淇℃伅鍗�", "姘存车鍔熺巼鍗�"};
+ String[] nianfen = {"绠＄悊鍗�", "娓呴浂鍗�", "閲嶆柊娉ㄥ唽璁惧鍗�", "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�", "娴嬭瘯鍗�", "璁惧淇℃伅鍗�", "姘存车鍔熺巼鍗�"};
+
+ /**
+ * 褰撳墠閫変腑鐨勫崱绫诲瀷
+ */
+ String cardType;
+ CardData cardData;
@Override
protected void onCreate(Bundle savedInstanceState) {
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) {
+ binding.chooseCardType.setOnClickListener(v ->
+ ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), options1 -> {
+ chooseData(nianfen[options1]);
+ binding.chooseCardTypeText.setText(nianfen[options1]);
+ }).show());
- }
- }).show();
+ binding.electricOk.setOnClickListener(v -> {
+ if (TextUtils.isEmpty(cardType)) {
+ TipUtil.show("璇烽�夋嫨鍗＄被鍨�");
+ return;
}
- });
-
-
- IdentityBean identityBean = baseDao.identityDao().findFirst();
- if (identityBean != null) {
- myIdentityBean = identityBean;
- binding.electricOldNumber.setText(myIdentityBean.getIdentity());
- } else {
- myIdentityBean = new IdentityBean();
- binding.electricOldNumber.setText("3668F7A30119");
- }
- binding.electricOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String data = binding.electricOldNumber.getText().toString();
- if (!TextUtils.isEmpty(data)) {
- myIdentityBean.setIdentity(binding.electricOldNumber.getText().toString());
- baseDao.identityDao().insert(myIdentityBean);
+ String data = binding.electricNewNum.getText().toString();
+ if (!TextUtils.isEmpty(data)) {
+ if (data.length() % 2 == 0) {
+ if (cardData == null) {
+ cardData = new CardData();
+ cardData.setCardType(cardType);
+ }
+ cardData.setCardIdentifying(data);
+ baseDao.cardDataDao().insert(cardData);
TipUtil.show("淇濆瓨鎴愬姛");
} else {
- TipUtil.show("璇疯緭鍏ュ崱鏍囪瘑");
+ TipUtil.show("璇疯緭鍏ユ纭殑16杩涘埗瀛楃涓�");
}
+ } else {
+ TipUtil.show("璇疯緭鍏ュ崱鏍囪瘑");
}
});
}
private void chooseData(String data) {
+
switch (data) {
case "绠＄悊鍗�":
+ cardType = MyCommon.MANAGE_CRAD;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.MANAGE_CRAD);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
case "娓呴浂鍗�":
+ cardType = MyCommon.CLEAN_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.CLEAN_CARD_TYPE);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
case "閲嶆柊娉ㄥ唽璁惧鍗�":
+ cardType = MyCommon.REGISTERED_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.REGISTERED_CARD_TYPE);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
case "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�":
- break;
- case "璁剧疆鍩熷悕鍗�":
+ cardType = MyCommon.CLEAN_ALL_USER_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.CLEAN_ALL_USER_CARD_TYPE);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
case "娴嬭瘯鍗�":
+ cardType = MyCommon.TEST_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.TEST_CARD_TYPE);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
case "璁惧淇℃伅鍗�":
+ cardType = MyCommon.CONFIGURATION_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.CONFIGURATION_CARD_TYPE);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
case "姘存车鍔熺巼鍗�":
+ cardType = MyCommon.CONFIGURATION_POWER_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(MyCommon.CONFIGURATION_POWER_CARD_TYPE);
+ if (cardData != null) {
+ setData(cardData);
+ } else {
+ binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ }
break;
}
}
+ private void setData(CardData cardData) {
+ if (cardData != null) {
+ String Identifying = cardData.getCardIdentifying();
+ binding.electricOldNumber.setText(Identifying);
+ }
+ }
+
}
--
Gitblit v1.8.0