From 485c4e60955d1a9e82c9887da7d8b71ad68ad257 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Thu, 11 Aug 2022 09:58:47 +0000
Subject: [PATCH] 合并优化

---
 app/src/main/AndroidManifest.xml |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b509b3..b3b79ce 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,18 +42,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.main.MainActivity"
-            android:launchMode="singleTask"
-            tools:ignore="WrongManifestParent"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="com.zfwl.merchant.activities.MainActivity" />
-            </intent-filter>
-        </activity>
+        <activity android:name=".ui.main.MainActivity" />
         <activity android:name=".ui.login.RegisterLoginActivity" />
         <activity android:name=".ui.web.WebViewActivity" />
+        <activity android:name=".ui.SettingActivity" />
+        <activity android:name=".ui.AboutActivity" />
+        <activity android:name=".ui.msg.MsgDetailActivity" />
+
     </application>
 
 </manifest>
\ No newline at end of file

--
Gitblit v1.9.1