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颜色
---
generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt b/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt
index 9ab0d3d..55330fd 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt
@@ -6,14 +6,18 @@
import android.text.TextWatcher
import android.view.View
import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.view.TitleBar.ClickType_LEFT_IMAGE
import com.dayu.general.BaseApplication
import com.dayu.general.R
+import com.dayu.general.bean.db.CardRegistrationBean
+import com.dayu.general.dao.BaseDaoSingleton
import com.dayu.general.databinding.ActivityNewCard1GeBinding
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
import com.dayu.general.tool.NfcReadHelper
+import kotlinx.coroutines.launch
/**
* Description: 鐢ㄦ埛寮�鍗＄晫闈�
@@ -167,10 +171,30 @@
object : SubscriberListener<BaseResponse<String>>() {
override fun onNext(response: BaseResponse<String>) {
if (response.success) {
- // 婵�娲绘垚鍔�
- Toast.makeText(this@NewCard2Activity, "寮�鍗℃垚鍔�", Toast.LENGTH_SHORT).show()
- setResult(RESULT_OK)
- finish()
+ // 淇濆瓨寮�鍗′俊鎭埌鏁版嵁搴�
+ val cardRegistration = CardRegistrationBean(
+ cardNumber = cardPhysicalId,
+ userName = binding.newCardUserName.text.toString(),
+ idCard = binding.newCardIdCard.text.toString(),
+ farmerCode = binding.newCardFarmerCode.text.toString(),
+ cardFee = cardFee,
+ remark = binding.newCardRemark.text.toString(),
+ paymentMethod = paymentId,
+ isReported = true,
+ isCardWritten = true
+ )
+
+ // 浣跨敤鍗忕▼鍦ㄥ悗鍙扮嚎绋嬩腑淇濆瓨鏁版嵁
+ lifecycleScope.launch {
+ try {
+ BaseDaoSingleton.getInstance(this@NewCard2Activity).cardRegistrationDao().insert(cardRegistration)
+ Toast.makeText(this@NewCard2Activity, "寮�鍗℃垚鍔�", Toast.LENGTH_SHORT).show()
+ setResult(RESULT_OK)
+ finish()
+ } catch (e: Exception) {
+ Toast.makeText(this@NewCard2Activity, "淇濆瓨寮�鍗′俊鎭け璐�: ${e.message}", Toast.LENGTH_SHORT).show()
+ }
+ }
} else {
// 婵�娲诲け璐�
Toast.makeText(
@@ -215,10 +239,15 @@
binding.newCardArerNumber.text = cardNumber
// 闅愯棌NFC璇诲崱鐣岄潰
binding.nfcContainer.visibility = View.GONE
-
- Toast.makeText(this, "璇诲崱鎴愬姛", Toast.LENGTH_SHORT).show()
+ binding.centerScroll.visibility = View.VISIBLE
+ binding.newCardRegistBtn.visibility = View.VISIBLE
}
}
+
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0