From d58bc0e2057f58342f490f5605eda3b80dc0ca29 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 27 三月 2024 11:47:21 +0800
Subject: [PATCH] 添加中安身份证识别相关功能 优化贴卡提示 优化二次确认的按钮样式 添加超时时不在主线程的处理
---
app/src/main/AndroidManifest.xml | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95b1bec..c151d2d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
<application
android:name=".MyApplication"
android:allowBackup="true"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@mipmap/logo"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
@@ -44,7 +44,10 @@
<activity
android:name=".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=".activity.AdminSetupActivity"
@@ -55,15 +58,13 @@
<activity
android:name=".activity.HomeActivity"
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=".activity.NewCardActivity"
android:exported="true"
- android:launchMode="singleTop">
+ android:launchMode="singleTop"
+ android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.nfc.action.TAG_DISCOVERED" />
<data android:mimeType="text/plain" />
@@ -77,14 +78,22 @@
<activity android:name=".activity.PassWordActivity" />
<activity android:name=".activity.MyActivity" />
- <activity android:name=".activity.RechargeActivity" />
+ <activity
+ android:name=".activity.RechargeActivity"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.TAG_DISCOVERED" />
+ <data android:mimeType="text/plain" />
+ </intent-filter>
+ </activity>
<activity
android:name=".activity.ReadCardAcitivy"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
- <action android:name="android.nfc.action.TAG_DISCOVERED" />
+ <action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
+<!-- <category android:name="android.intent.category.DEFAULT"/>-->
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
@@ -102,7 +111,11 @@
<activity android:name=".activity.SysIpActivity" />
<activity android:name=".activity.ParameterActivity" />
<activity android:name=".activity.PowerActivity" />
- <activity android:name=".activity.DomainActivity"/>
+ <activity android:name=".activity.DomainActivity" />
+ <activity android:name=".activity.ElectricPriceActivity" />
+ <activity android:name=".activity.IdentifyingActivity" />
+ <activity android:name=".activity.ReplacementActivity" />
+ <activity android:name=".activity.RechargeDetail" />
<meta-data
--
Gitblit v1.8.0