From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
generallibrary/src/main/java/com/dayu/general/view/ProjectDialog.kt | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/view/ProjectDialog.kt b/generallibrary/src/main/java/com/dayu/general/view/ProjectDialog.kt
index 557e677..e3fe009 100644
--- a/generallibrary/src/main/java/com/dayu/general/view/ProjectDialog.kt
+++ b/generallibrary/src/main/java/com/dayu/general/view/ProjectDialog.kt
@@ -1,5 +1,6 @@
package com.dayu.general.view
+import android.app.Application
import android.app.Dialog
import android.content.Context
import android.os.Bundle
@@ -8,6 +9,8 @@
import android.widget.RadioGroup
import android.widget.TextView
import com.dayu.baselibrary.view.ConfirmDialog
+import com.dayu.general.BaseApplication
+import com.dayu.general.BaseApplication.Companion.application
import com.dayu.general.R
import com.dayu.general.bean.db.ProjectDataBean
import com.dayu.general.dao.BaseDaoSingleton
@@ -18,12 +21,12 @@
* Author: zuo
* Date: 2025/3/17
*/
-class ProjectDialog(context: Context):Dialog(context,com.dayu.baselibrary.R.style.ws_pay_showSelfDialog){
+class ProjectDialog(private val mContext: Context,private val myApplication: Application):Dialog(mContext,com.dayu.baselibrary.R.style.ws_pay_showSelfDialog){
var confirmDialog: ConfirmDialog? = null
var mLibraryBack: LibraryBack? = null
var isChose: Boolean = false
- var projectDataDao = BaseDaoSingleton.getInstance(context)?.projectDataDao()
+ var projectDataDao = BaseDaoSingleton.getInstance(mContext)?.projectDataDao()
var projectBean: ProjectDataBean = ProjectDataBean()
var type: Int = 0
var data: String = ""
@@ -48,12 +51,14 @@
R.id.yuanMouLibrary -> {
type = BaseCommon.YuanMo
projectBean.projectType = type
- data = "纭閫夋嫨娌冲崡鐗堟湰鍚楋紵"
+ projectBean.projectTag="ym"
+ data = "纭閫夋嫨鍏冭皨椤圭洰鍚楋紵"
}
R.id.qiHeLibrary -> {
type = BaseCommon.QiHe
projectBean.projectType = type
- data = "纭閫夋嫨榻愭渤鍗曟満鐗堟湰鍚楋紵"
+ projectBean.projectTag="qh"
+ data = "纭閫夋嫨榻愭渤椤圭洰鍚楋紵"
}
}
@@ -63,8 +68,9 @@
okBtn.setOnClickListener {
if (isChose) {
// 浜屾纭
- confirmDialog = ConfirmDialog(context, data) {
+ confirmDialog = ConfirmDialog(mContext, data) {
projectDataDao?.insert(projectBean)
+ BaseApplication.getInstance(myApplication).init()
mLibraryBack?.listener(type)
dismiss()
confirmDialog?.dismiss()
--
Gitblit v1.8.0