From 55b196ea2e28a8d859c85326f2147a4f7b7196de Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期四, 10 四月 2025 10:58:32 +0800
Subject: [PATCH] feat(general): 新增开卡信息保存功能并优化界面布局- 新增 CardRegistrationBean 数据模型用于保存开卡信息 - 在数据库中添加 card_registration 表用于存储开卡记录 - 优化 NewCard2Activity 界面布局，调整样式和间距 - 添加协程支持，实现异步保存开卡信息到数据库 - 更新颜色配置，统一使用新加的 base_blue_bg 和 base_green_bg颜色
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java
index 1438c35..053720c 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java
@@ -6,9 +6,9 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.ChooseView;
-import com.dayu.henanlibrary.databinding.ActivityIdentyfyingBinding;
+import com.dayu.henanlibrary.databinding.ActivityIdentyfyingHnBinding;
import com.dayu.henanlibrary.dbBean.CardData;
-import com.dayu.henanlibrary.utils.MyCommon;
+import com.dayu.henanlibrary.utils.CardCommon;
import java.util.Arrays;
@@ -21,7 +21,7 @@
*/
public class IdentifyingActivity extends HNBaseActivity {
- ActivityIdentyfyingBinding binding;
+ ActivityIdentyfyingHnBinding binding;
String[] nianfen = {"绠＄悊鍗�", "娓呴浂鍗�", "閲嶆柊娉ㄥ唽璁惧鍗�", "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�", "娴嬭瘯鍗�", "璁惧淇℃伅鍗�", "姘存车鍔熺巼鍗�"};
@@ -35,7 +35,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityIdentyfyingBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityIdentyfyingHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
binding.chooseCardType.setOnClickListener(v ->
ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), options1 -> {
@@ -73,66 +73,66 @@
switch (data) {
case "绠＄悊鍗�":
- cardType = MyCommon.MANAGE_CRAD;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.MANAGE_CRAD);
+ cardType = CardCommon.MANAGE_CRAD;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.MANAGE_CRAD);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
case "娓呴浂鍗�":
- cardType = MyCommon.CLEAN_CARD_TYPE;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.CLEAN_CARD_TYPE);
+ cardType = CardCommon.CLEAN_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.CLEAN_CARD_TYPE);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
case "閲嶆柊娉ㄥ唽璁惧鍗�":
- cardType = MyCommon.REGISTERED_CARD_TYPE;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.REGISTERED_CARD_TYPE);
+ cardType = CardCommon.REGISTERED_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.REGISTERED_CARD_TYPE);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
case "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�":
- cardType = MyCommon.CLEAN_ALL_USER_CARD_TYPE;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.CLEAN_ALL_USER_CARD_TYPE);
+ cardType = CardCommon.CLEAN_ALL_USER_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.CLEAN_ALL_USER_CARD_TYPE);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
case "娴嬭瘯鍗�":
- cardType = MyCommon.TEST_CARD_TYPE;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.TEST_CARD_TYPE);
+ cardType = CardCommon.TEST_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.TEST_CARD_TYPE);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
case "璁惧淇℃伅鍗�":
- cardType = MyCommon.CONFIGURATION_CARD_TYPE;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.CONFIGURATION_CARD_TYPE);
+ cardType = CardCommon.CONFIGURATION_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.CONFIGURATION_CARD_TYPE);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
case "姘存车鍔熺巼鍗�":
- cardType = MyCommon.CONFIGURATION_POWER_CARD_TYPE;
- cardData = baseDao.cardDataDao().findFirst(MyCommon.CONFIGURATION_POWER_CARD_TYPE);
+ cardType = CardCommon.CONFIGURATION_POWER_CARD_TYPE;
+ cardData = baseDao.cardDataDao().findFirst(CardCommon.CONFIGURATION_POWER_CARD_TYPE);
if (cardData != null) {
setData(cardData);
} else {
- binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
+ binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
}
break;
}
--
Gitblit v1.8.0