From 72880a3df304d21b897aecae5ab25a66069c0187 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 六月 2025 17:47:18 +0800
Subject: [PATCH] refactor(generallibrary):优化卡片信息展示和处理逻辑- 修改卡片信息展示布局，调整字段顺序和格式 - 优化卡片读取和处理逻辑，增加日志输出 - 调整金额显示和计算方式，确保精度正确 - 修复部分字段解析和填充逻辑
---
generallibrary/src/main/res/layout/activity_card_read.xml | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/generallibrary/src/main/res/layout/activity_card_read.xml b/generallibrary/src/main/res/layout/activity_card_read.xml
index e6ab761..2e2cf6b 100644
--- a/generallibrary/src/main/res/layout/activity_card_read.xml
+++ b/generallibrary/src/main/res/layout/activity_card_read.xml
@@ -11,7 +11,8 @@
android:layout_height="@dimen/dimen_title_height"
android:background="@color/title_bar_bg"
android:elevation="4dp"
- app:centerText="璇诲崱" />
+ app:centerText="璇诲崱"
+ app:leftImage="@mipmap/icon_back" />
<ScrollView
android:layout_width="match_parent"
@@ -32,7 +33,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
- android:visibility="gone">
+ android:visibility="visible">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
@@ -95,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:visibility="visible">
+ android:visibility="gone">
<!-- 鍗″唴鏁版嵁鍖哄煙 -->
<androidx.cardview.widget.CardView
@@ -116,9 +117,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="#F8F9FA"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
android:padding="12dp">
<TextView
@@ -143,15 +144,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="#FFFFFF"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
android:padding="12dp">
<TextView
android:layout_width="105dp"
android:layout_height="wrap_content"
- android:text="鍗″彿锛�"
+ android:text="鍗″湴鍧�锛�"
android:textColor="#333333"
android:textSize="@dimen/text_size" />
@@ -164,15 +165,42 @@
android:textColor="#666666"
android:textSize="@dimen/text_size" />
</LinearLayout>
+ <!-- 鍗＄墖鐘舵�� -->
+ <LinearLayout
+ android:id="@+id/ll_card_status"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="2dp"
+ android:background="#FFFFFF"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="12dp"
+ android:visibility="visible">
+ <TextView
+ android:layout_width="105dp"
+ android:layout_height="wrap_content"
+ android:text="鍗＄墖鐘舵�侊細"
+ android:textColor="#333333"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/tv_card_status"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="姝ｅ父"
+ android:textColor="#4CAF50"
+ android:textSize="@dimen/text_size" />
+ </LinearLayout>
<!-- 鍗＄墖绫诲瀷 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="#F8F9FA"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
android:padding="12dp">
<TextView
@@ -198,11 +226,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:visibility="visible"
- android:gravity="center_vertical"
android:background="#FFFFFF"
- android:padding="12dp">
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="12dp"
+ android:visibility="visible">
<TextView
android:layout_width="105dp"
@@ -228,11 +256,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:visibility="visible"
- android:gravity="center_vertical"
android:background="#F8F9FA"
- android:padding="12dp">
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="12dp"
+ android:visibility="visible">
<TextView
android:layout_width="105dp"
@@ -256,9 +284,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="#FFFFFF"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
android:padding="12dp">
<TextView
@@ -283,9 +311,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="#F8F9FA"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
android:padding="12dp">
<TextView
@@ -305,34 +333,6 @@
android:textSize="@dimen/text_size" />
</LinearLayout>
- <!-- 鍗＄墖鐘舵�� -->
- <LinearLayout
- android:id="@+id/ll_card_status"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:visibility="visible"
- android:gravity="center_vertical"
- android:background="#FFFFFF"
- android:padding="12dp">
-
- <TextView
- android:layout_width="105dp"
- android:layout_height="wrap_content"
- android:text="鍗＄墖鐘舵�侊細"
- android:textColor="#333333"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/tv_card_status"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="姝ｅ父"
- android:textColor="#4CAF50"
- android:textSize="@dimen/text_size" />
- </LinearLayout>
<!-- 鏈�鍚庝娇鐢ㄦ椂闂� -->
<LinearLayout
@@ -340,11 +340,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
- android:orientation="horizontal"
- android:visibility="visible"
- android:gravity="center_vertical"
android:background="#F8F9FA"
- android:padding="12dp">
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="12dp"
+ android:visibility="visible">
<TextView
android:layout_width="105dp"
--
Gitblit v1.8.0