~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -10,7 +10,6 @@
			<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
			<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
			<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
			<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> -->
			<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <!-- wifi状态权限 -->
			@@ -21,21 +20,18 @@
			<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- android 10.0使用wifi api新添加的权限 -->
			<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
			<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
			<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- bugly所需权限 -->
			<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
			<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- bugly所需权限 -->
			<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- bugly所需权限 start -->
			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<!-- UNI相机和存储的权限 -->
			<uses-feature android:name="android.hardware.camera" />
			<uses-feature android:name="android.hardware.camera.autofocus" />

			<uses-permission android:name="android.permission.RECORD_AUDIO" />
			<!-- 访问闪光灯 -->
			<uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- 访问闪光灯 -->
			<uses-permission android:name="android.permission.READ_PHONE_STATE" />
			<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
			<uses-permission android:name="android.permission.GET_TASKS" />
			@@ -43,57 +39,75 @@
			<uses-permission android:name="android.permission.FLASHLIGHT" />
			<uses-permission android:name="android.permission.WAKE_LOCK" />
			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

			<uses-permission android:name="android.permission.CALL_PHONE" />
			<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
			<uses-permission android:name="android.permission.BLUETOOTH" />

			<!-- Optional. Required for location feature -->
			<!-- 为了提高sdk识别唯一用户的能力，保证消息推送的精准送达，建议集成以下权限（可选）-->
			<uses-permission android:name="android.permission.BLUETOOTH" /> <!-- Optional. Required for location feature -->
			<!-- 为了提高sdk识别唯一用户的能力，保证消息推送的精准送达，建议集成以下权限（可选） -->
			<uses-permission android:name="android.permission.READ_PHONE_STATE" />
			<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
			<uses-permission android:name="android.permission.GET_TASKS" />
			<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

			<!-- 如您需要接入地理围栏业务，建议集成以下权限（可选）-->
			<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 如您需要接入地理围栏业务，建议集成以下权限（可选） -->
			<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
			<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
			<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
			<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- 如您需要对应设备通知相关的能力，建议集成以下权限（可选） -->
			<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /> <!-- 华为角标 -->
			<uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /> <!-- VIVO角标权限 -->
			<uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /> <!-- honor 角标 -->
			<uses-permission android:name="android.permission.VIBRATE" /> <!-- 振动器权限，JPUSH支持通知开启振动功能，小米推送必须 -->
			<!-- 扩展备用权限（可选） -->
			<permission
			android:name="${applicationId}.permission.JOPERATE_MESSAGE"
			android:protectionLevel="signature" />

			<!-- 如您需要对应设备通知相关的能力，建议集成以下权限（可选）-->
			<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /><!-- 华为角标 -->
			<uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /><!-- VIVO角标权限 -->
			<uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /><!--honor 角标-->
			<uses-permission android:name="android.permission.VIBRATE" /><!--振动器权限，JPUSH支持通知开启振动功能，小米推送必须-->

			<!-- 扩展备用权限（可选）-->
			<permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" android:protectionLevel="signature"/>
			<uses-permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" />


			<!-- Required -->
			<uses-permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" /> <!-- Required -->
			<permission
			android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE"
			android:protectionLevel="signature" />
			<uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" />

			<!-- 适配Android13，弹出通知必须权限-->
			<uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> <!-- 适配Android13，弹出通知必须权限 -->
			<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

			<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.message.MessageInfoActivity"
			android:name=".ui.me.QrCodeMainActivity"
			android:exported="false" />
			<activity
			android:name=".ui.message.TestMessageActivity"
			android:name=".ui.me.BPersonalDataActivity"
			android:exported="false" />
			<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" />
			<activity
			android:name=".ui.newC.PowerStationsListEdit"
			android:exported="false" />
			<activity
			android:name=".ui.CPowerStationActivity"
			android:exported="false" />
			<activity
			android:name=".ui.message.MessageInfoActivity"
			android:exported="false" />
			<activity
			android:name=".ui.me.BindMailActivity"
			@@ -111,7 +125,7 @@
			android:name=".ui.me.AccountAndSecurityActivity"
			android:exported="false" />
			<activity
			android:name=".ui.me.PersonalDataActivity"
			android:name=".ui.me.CPersonalDataActivity"
			android:exported="false" />

			<service android:name=".widget.apkwgtupload.ApkDownLoadService" />
			@@ -141,13 +155,13 @@
			android:name=".ui.account.RegisterAccountActivity"
			android:exported="false" />
			<activity
			android:name=".ui.device.FastScanActivity"
			android:name=".ui.device.ScanActivity"
			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
			@@ -159,8 +173,7 @@
			<category android:name="android.intent.category.LAUNCHER" />
			</intent-filter>
			</activity> <!-- 注册服务 -->
			<service android:name=".internet.HttpServer.MyNanoHttpService" />
			<!--加它uniapp才能唤起相机-->
			<service android:name=".internet.HttpServer.MyNanoHttpService" /> <!-- 加它uniapp才能唤起相机 -->
			<provider
			android:name="io.dcloud.common.util.DCloud_FileProvider"
			android:authorities="com.hdl.photovoltaic.dc.fileprovider"
			@@ -169,10 +182,7 @@
			<meta-data
			android:name="android.support.FILE_PROVIDER_PATHS"
			android:resource="@xml/dcloud_file_provider" />
			</provider>


			<!-- Since JCore2.0.0 Required SDK核心功能-->
			</provider> <!-- Since JCore2.0.0 Required SDK核心功能 -->
			<!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->
			<!-- 这个是自定义Service，要继承极光JCommonService，可以在更多手机平台上使得推送通道保持的更稳定 -->
			<service
			@@ -183,10 +193,7 @@
			<intent-filter>
			<action android:name="cn.jiguang.user.service.action" />
			</intent-filter>
			</service>


			<!-- Required since 5.2.0 -->
			</service> <!-- Required since 5.2.0 -->
			<!-- 新的 tag/alias 接口结果返回需要开发者配置一个自定义的Service -->
			<!-- 5.2.0开始所有事件将通过该类回调 -->
			<!-- 该广播需要继承 JPush 提供的 JPushMessageService 类, 并如下新增一个 Intent-Filter -->
			@@ -196,9 +203,13 @@
			android:exported="false">
			<intent-filter>
			<action android:name="cn.jpush.android.intent.SERVICE_MESSAGE" />

			<category android:name="com.hdl.photovoltaic" />
			</intent-filter>
			</service>
			</service> <!-- uniMqtt必要的,开启mqtt1883端口一个服务 -->
			<service
			android:name="org.eclipse.paho.android.service.MqttService"
			android:exported="false" />

			<meta-data
			android:name="design_height_in_dp"