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"
    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"
@@ -15,7 +28,8 @@
            android:exported="false" />
        <activity
            android:name=".ui.MyPowerStationActivity"
            android:exported="false" />
            android:exported="false"
            />
        <activity
            android:name=".ui.HomeLoginActivity"
            android:exported="false" />