From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 06 五月 2024 10:03:04 +0800
Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug
---
qihealonelibrary/src/main/AndroidManifest.xml | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/qihealonelibrary/src/main/AndroidManifest.xml b/qihealonelibrary/src/main/AndroidManifest.xml
index 4328df0..b945f37 100644
--- a/qihealonelibrary/src/main/AndroidManifest.xml
+++ b/qihealonelibrary/src/main/AndroidManifest.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.dayu.qihealonelibrary">
+ >
<application
android:allowBackup="true"
@@ -8,18 +10,18 @@
<activity
- android:name="com.dayu.qihealonelibrary.activity.AdminSetupActivity"
+ android:name="com.dayu.qihealonelibrary.activity.AdminSetupActivityQHAlone"
android:exported="true">
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.HomeActivity"
+ android:name="com.dayu.qihealonelibrary.activity.HomeActivityQHAlone"
android:exported="true">
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.NewCardActivity"
+ android:name="com.dayu.qihealonelibrary.activity.NewCardActivityQHAlone"
android:exported="true"
android:launchMode="singleTop"
android:screenOrientation="portrait">
@@ -29,15 +31,15 @@
</intent-filter>
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.SysActivity"
+ android:name="com.dayu.qihealonelibrary.activity.SysActivityQHAlone"
android:exported="true">
</activity>
- <activity android:name="com.dayu.qihealonelibrary.activity.PassWordActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.MyActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PassWordActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.MyActivityQHAlone" />
<activity
- android:name="com.dayu.qihealonelibrary.activity.RechargeActivity"
+ android:name="com.dayu.qihealonelibrary.activity.RechargeActivityQHAlone"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
@@ -57,7 +59,7 @@
</intent-filter>
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.NFCWreatActivity"
+ android:name="com.dayu.qihealonelibrary.activity.NFCWreatActivityQHAlone"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
@@ -65,17 +67,17 @@
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
- <activity android:name="com.dayu.qihealonelibrary.activity.RechargeListActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.NewCardListActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.ParameterActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.PowerActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.DomainActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.ElectricPriceActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.IdentifyingActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.ReplacementActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.RechargeListActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.NewCardListActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.ParameterActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PowerActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.DomainActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.ElectricPriceActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.IdentifyingActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.ReplacementActivityQHAlone" />
<activity android:name="com.dayu.qihealonelibrary.activity.RechargeDetail" />
- <activity android:name="com.dayu.qihealonelibrary.activity.PasswordCardActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.RegionActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PasswordCardActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.RegionActivityQHAlone" />
</application>
--
Gitblit v1.8.0