From f5180b600511d1871635bd364beb5bdd15f6ae88 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期三, 26 三月 2025 18:05:07 +0800
Subject: [PATCH] feat(nfc): 优化 NFC写卡功能并添加新方法- 在 BaseNfcWriteHelper 中添加了新的 writeData 方法，增加了 isConnect 参数 - 优化了 NativeNfcWriteHelper 中的 writeData 实现，支持选择性连接 NFC - 更新了 NfcWriteAdapter，支持新的 writeData 方法- 修改了 NfcWreatHelper 中的 writeData 方法，使用新的接口 - 优化了 NfcWreatActivity 中的写卡逻辑
---
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index a01d709..f933594 100644
--- a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
@@ -28,7 +28,8 @@
android:id="@+id/my_village"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="gone">
<TextView
@@ -57,18 +58,40 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍖哄煙鍙凤細"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/my_adminName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/my_waterPriceLL"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢靛崟浠�(鍏�/搴�)锛�"
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/my_waterPrice"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size" />
+
+ </LinearLayout>
<RelativeLayout
@@ -83,7 +106,7 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/my_newCardOut"
android:text="寮�鎴疯褰�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -92,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="瀵煎嚭璁板綍"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</RelativeLayout>
@@ -108,7 +131,7 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/my_rechargeOut"
android:text="鍏呭�艰褰�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -117,7 +140,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="瀵煎嚭璁板綍"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</RelativeLayout>
@@ -129,9 +152,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="IP璁剧疆"
- android:visibility="gone"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<TextView
android:id="@+id/card_replacement"
@@ -139,9 +162,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鐢ㄦ埛琛ュ崱"
- android:visibility="gone"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<TextView
@@ -149,8 +172,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="瀵嗙爜璁剧疆"
- android:textColor="@color/text_selecter"
+ android:text="鐧诲綍瀵嗙爜璁剧疆"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -159,9 +182,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鏈繛鎺ユ暟鎹腑蹇�"
- android:visibility="gone"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
</LinearLayout>
</ScrollView>
--
Gitblit v1.8.0