From 6c29fda2b7408c13a486554c5be9d3c6b8296b95 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Thu, 11 Aug 2022 09:01:04 +0000
Subject: [PATCH] 设置界面

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f076df2..58fd4f1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/app_icon"
+        android:icon="@mipmap/ic_launcher"
         android:name=".MyApplication"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -42,18 +42,12 @@
                 <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" />
+
     </application>
 
 </manifest>
\ No newline at end of file

--
Gitblit v1.9.1