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 | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5591c6..d8b4c23 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,12 +70,27 @@
<application
android:name=".HDLApp"
android:allowBackup="true"
- android:icon="@drawable/version_icon"
+ android:icon="@drawable/logo"
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
- android:roundIcon="@drawable/version_icon"
+ android:roundIcon="@drawable/logo"
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
android:name=".ui.newC.MessageCenterList"
android:exported="false" />
@@ -87,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"
@@ -140,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