From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮，跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity，优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity，支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作
---
generallibrary/src/main/java/com/dayu/general/BaseApplication.kt | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt b/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
index facf186..dd81a63 100644
--- a/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
+++ b/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
@@ -27,6 +27,11 @@
var blockId:String=""
var blockName:String=""
+ // 姘翠环淇℃伅
+ var waterPrice: Double = 0.0
+
+ // MainActivity鐨勫紩鐢紝鐢ㄤ簬璋冪敤姘翠环鑾峰彇鏂规硶
+ private var mainActivityInstance: com.dayu.general.activity.MainActivity? = null
var projectDataDao: ProjectDataDao? = null
@@ -42,6 +47,25 @@
return myApplication as BaseApplication
}
+ /**
+ * 璁剧疆MainActivity瀹炰緥
+ */
+ fun setMainActivity(activity: com.dayu.general.activity.MainActivity?) {
+ mainActivityInstance = activity
+ }
+
+ /**
+ * 璇锋眰鑾峰彇姘翠环锛屽鏋滀负绌哄垯璋冪敤MainActivity鐨勮幏鍙栨柟娉�
+ */
+ fun requestWaterPrice(): Double {
+ if (waterPrice <= 0.0) {
+ // 濡傛灉姘翠环涓虹┖涓擬ainActivity瀹炰緥瀛樺湪锛屽垯璋冪敤鑾峰彇鏂规硶
+ mainActivityInstance?.getWaterPriceFromActivity()
+ }
+ // 濡傛灉姘翠环浠嶄负0锛岃繑鍥為粯璁ゅ��
+ return if (waterPrice > 0.0) waterPrice else 0.9
+ }
+
--
Gitblit v1.8.0