From cece79bf75a9b672b33b772acffca209eecfc8f2 Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期四, 26 六月 2025 08:27:25 +0800 Subject: [PATCH] refactor(generallibrary):优化补卡界面布局和样式- 调整了卡片信息展示区域的样式,包括背景色、文字颜色等 - 优化了输入区域的布局结构,减小了控件间距和尺寸- 更新了确认补卡按钮的样式 - 统一了文字大小和颜色,提高了可读性 --- generallibrary/src/main/java/com/dayu/general/BaseApplication.kt | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 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..62bd69b 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,32 @@ return myApplication as BaseApplication } + /** + * 璁剧疆MainActivity瀹炰緥 + */ + fun setMainActivity(activity: com.dayu.general.activity.MainActivity?) { + mainActivityInstance = activity + } + + /** + * 鑾峰彇MainActivity瀹炰緥 + */ + fun getMainActivity(): com.dayu.general.activity.MainActivity? { + return mainActivityInstance + } + + /** + * 璇锋眰鑾峰彇姘翠环锛屽鏋滀负绌哄垯璋冪敤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