Merge branch 'wjc'

wjc

2023-06-19 a1ac20d9cbe90b566bffe3ed39a6e07700c3248f

 app/src/main/AndroidManifest.xml

@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.hdl.photovoltaic">
    xmlns:tools="http://schemas.android.com/tools"
    package="com.hdl.photovoltaic" >

    <uses-permission
        android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
        tools:ignore="ProtectedPermissions" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />



    <application
        android:name=".HDLApp"
@@ -9,19 +22,20 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.PhotovoltaicDebug">
        android:theme="@style/Theme.PhotovoltaicDebug" >
        <activity
            android:name=".ui.device.FastScanActivity"
            android:exported="false" />
        <activity
            android:name=".ui.MyPowerStationActivity"
            android:exported="false" />
            android:exported="false"
            />
        <activity
            android:name=".ui.HomeLoginActivity"
            android:exported="false" />
        <activity
            android:name=".ui.StartActivity"
            android:exported="true">
            android:exported="true" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />