From d097db1e26632ff6a484c5e3c3eda91d9df2dabf Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 15:33:21 +0800
Subject: [PATCH] Merge branch 'wxw_new' into lwj_new

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7d121ee..088a69e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,15 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.PhotovoltaicDebug">
         <activity
+            android:name=".ui.me.ContactUsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.message.SearchMessageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.powerstation.DeviceSearchActivity"
+            android:exported="false" />
+        <activity
             android:name=".ui.powerstation.HouseSearchActivity"
             android:exported="false" />
         <activity
@@ -149,10 +158,10 @@
             android:name=".ui.device.FastScanActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.MyPowerStationActivity"
+            android:name=".ui.BPowerStationActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.HomeLoginActivity"
+            android:name=".ui.LoginActivity"
             android:exported="false" />
         <activity android:name=".widget.apkwgtupload.AndroidPermissionActivity" />
         <activity

--
Gitblit v1.8.0