From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bdce55a..d8b4c23 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,18 @@
         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
             android:name=".ui.powerstation.HouseListEditActivity"
             android:exported="false" />
         <activity
@@ -90,9 +102,6 @@
             android:exported="false" />
         <activity
             android:name=".ui.message.MessageInfoActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.message.TestMessageActivity"
             android:exported="false" />
         <activity
             android:name=".ui.me.BindMailActivity"
@@ -143,10 +152,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