From c746c5117023148ce7d95c822f5487239b8151f1 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 04:51:53 +0000
Subject: [PATCH] Merge branch 'master' into page
---
app/src/main/AndroidManifest.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1b81d3c..f076df2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_security_config"
+ tools:replace="android:theme"
android:theme="@style/Theme.OpemMvvm" >
<activity
android:name=".ui.splash.SplashActivity"
@@ -41,7 +42,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".MainActivity"
+ <activity android:name=".ui.main.MainActivity"
android:launchMode="singleTask"
tools:ignore="WrongManifestParent"
android:exported="true">
@@ -51,6 +52,8 @@
<action android:name="com.zfwl.merchant.activities.MainActivity" />
</intent-filter>
</activity>
+ <activity android:name=".ui.login.RegisterLoginActivity" />
+ <activity android:name=".ui.web.WebViewActivity" />
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.9.1