From 98994189864f045551f7d06f78017b5df70e1be3 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 19 六月 2025 11:03:52 +0800
Subject: [PATCH] feat(card): 添加补扣功能并优化卡片操作界面

---
 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