From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
generallibrary/src/main/AndroidManifest.xml | 106 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 insertions(+), 16 deletions(-)
diff --git a/generallibrary/src/main/AndroidManifest.xml b/generallibrary/src/main/AndroidManifest.xml
index 3172cdf..24cbef4 100644
--- a/generallibrary/src/main/AndroidManifest.xml
+++ b/generallibrary/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.NFC" />
<!--鐢ㄤ簬璁块棶缃戠粶锛岀綉缁滃畾浣嶉渶瑕佷笂缃�-->
@@ -39,28 +39,31 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
- <!-- <activity-->
- <!-- android:name="com.dayu.recharge.activity.LoginActivity"-->
- <!-- android:exported="true">-->
- <!-- <intent-filter>-->
- <!-- <action android:name="android.intent.action.MAIN" />-->
- <!-- <category android:name="android.intent.category.LAUNCHER" />-->
- <!-- </intent-filter>-->
- <!-- </activity>-->
<activity android:name="com.dayu.general.activity.NewCardActivity" />
<activity android:name="com.dayu.general.activity.ManageListActivity" />
- <activity android:name="com.dayu.general.activity.SearchUserListActivity"/>
- <activity android:name="com.dayu.general.activity.NfcWreatActivity"
+ <activity android:name="com.dayu.general.activity.SearchUserListActivity" />
+ <activity android:name="com.dayu.general.activity.RechargeDetailActivity" />
+ <activity
+ android:name="com.dayu.general.activity.NfcWreatActivity"
android:exported="false"
- android:launchMode="singleTop"
- >
+ android:launchMode="singleTop">
<intent-filter>
<action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
- <activity android:name=".activity.MainActivity"/>
+ <activity
+ android:name=".activity.MainActivity"
+ android:launchMode="singleTop"
+ android:windowSoftInputMode="adjustPan">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
+
<activity
android:name=".activity.ManagerReadActivity"
android:exported="false"
@@ -71,9 +74,80 @@
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
- <activity android:name=".activity.SearchCardListActivity"/>
+ <activity android:name=".activity.SearchCardListActivity" />
+ <activity
+ android:name=".activity.NewCard2Activity"
+ android:exported="false"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
+ <!-- 鍐欏崱鎴愬姛椤甸潰 -->
+ <activity android:name=".activity.CardWriteSuccessActivity" />
+ <!-- 鎸傚け椤甸潰 -->
+ <activity android:name=".activity.CardLossActivity" />
+ <!-- 璇诲崱椤甸潰 -->
+ <activity
+ android:name=".activity.CardReadActivity"
+ android:exported="false"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
+
+ <!-- 閿�鍗￠〉闈� -->
+ <activity
+ android:name=".activity.CardCancelActivity"
+ android:exported="false"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
+
+ <activity
+ android:name=".activity.CardReturnActivity"
+ android:exported="false"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".activity.CardDeductActivity"
+ android:exported="false"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".activity.CardUnlossActivity"
+ android:exported="false"
+ android:launchMode="singleTop"/>
+ <activity android:name=".activity.CardReplaceActivity"
+ android:exported="false"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
<meta-data
android:name="BUGLY_APP_VERSION"
--
Gitblit v1.8.0