Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 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