~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -42,6 +42,38 @@
			<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" /> <!-- 振动器权限，JPUSH支持通知开启振动功能，小米推送必须 -->
			<!-- <!– 厂商通道所需权限 –> -->
			<!-- <!– 小米 –> -->
			<!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
			<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
			<!-- <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" /> -->
			<!-- <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" /> -->
			<!-- <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" /> -->
			<!-- <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" /> -->
			<!-- <uses-permission android:name="android.permission.RESTART_PACKAGES" /> -->
			<!-- <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> -->
			<!-- <uses-permission android:name="com.xiaomi.permission.AUTH_SERVICE" /> -->
			<!-- <!– 华为 –> -->
			<!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
			<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
			<!-- <!– OPPO –> -->
			<!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
			<!-- <!– vivo –> -->
			<!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
			<!-- <!– 魅族 –> -->
			<!-- <uses-permission android:name="android.permission.INTERNET" /> -->
			<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
			<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
			<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
			<!-- 扩展备用权限（可选） -->
			<permission
			android:name="${applicationId}.permission.JOPERATE_MESSAGE"
			@@ -66,8 +98,62 @@
			android:label="@string/app_name"
			android:persistent="true"
			android:requestLegacyExternalStorage="true"
			android:supportsRtl="true"
			android:theme="@style/Theme.PhotovoltaicDebug">
			android:supportsRtl="false"
			android:theme="@style/Theme.PhotovoltaicDebug"
			tools:replace="android:supportsRtl">
			<!-- 厂商通道专用Activity（透明中转页）,创建一个透明的Activity来处理厂商通道点击 -->
			<!-- <activity-->
			<!-- android:name=".push.VendorChannelActivity"-->
			<!-- android:excludeFromRecents="true"-->
			<!-- android:exported="true"-->
			<!-- android:launchMode="singleTask"-->
			<!-- android:noHistory="true"-->
			<!-- android:screenOrientation="portrait"-->
			<!-- android:taskAffinity="">-->
			<activity
			android:name=".push.VendorChannelActivity"
			android:exported="true"
			android:screenOrientation="portrait">

			<!-- <!– 小米通道 –>-->
			<!-- <intent-filter>-->
			<!-- <action android:name="android.intent.action.VIEW" />-->
			<!-- <category android:name="android.intent.category.DEFAULT" />-->
			<!-- <category android:name="android.intent.category.BROWSABLE" />-->

			<!-- <data-->
			<!-- android:host="com.hdl.photovoltaic"-->
			<!-- android:scheme="push" />-->
			<!-- </intent-filter>-->

			<!-- <!– 华为通道 –>-->
			<!-- <intent-filter>-->
			<!-- <action android:name="android.intent.action.VIEW" />-->
			<!-- <category android:name="android.intent.category.DEFAULT" />-->
			<!-- <data-->
			<!-- android:host="com.hdl.photovoltaic.huawei"-->
			<!-- android:scheme="push" />-->
			<!-- </intent-filter>-->

			<!-- <!– OPPO通道 –>-->
			<!-- <intent-filter>-->
			<!-- <action android:name="android.intent.action.VIEW" />-->
			<!-- <category android:name="android.intent.category.DEFAULT" />-->
			<!-- <data-->
			<!-- android:host="com.hdl.photovoltaic.oppo"-->
			<!-- android:scheme="push" />-->
			<!-- </intent-filter>-->

			<!-- <!– vivo通道 –>-->
			<!-- <intent-filter>-->
			<!-- <action android:name="android.intent.action.VIEW" />-->
			<!-- <category android:name="android.intent.category.DEFAULT" />-->
			<!-- <data-->
			<!-- android:host="com.hdl.photovoltaic.vivo"-->
			<!-- android:scheme="push" />-->
			<!-- </intent-filter>-->
			</activity>

			<activity
			android:name=".ui.me.NotificationSettingsActivity"
			android:exported="false" />
			@@ -180,7 +266,6 @@
			android:theme="@style/AppWelcome">
			<intent-filter>
			<action android:name="android.intent.action.MAIN" />

			<category android:name="android.intent.category.LAUNCHER" />
			</intent-filter>
			</activity>
			@@ -209,7 +294,7 @@
			<!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->
			<!-- 这个是自定义Service，要继承极光JCommonService，可以在更多手机平台上使得推送通道保持的更稳定 -->
			<service
			android:name=".jpush.JpushService"
			android:name=".push.jpush.JpushService"
			android:enabled="true"
			android:exported="false"
			android:process=":pushcore">
			@@ -221,7 +306,7 @@
			<!-- 5.2.0开始所有事件将通过该类回调 -->
			<!-- 该广播需要继承 JPush 提供的 JPushMessageService 类, 并如下新增一个 Intent-Filter -->
			<service
			android:name=".jpush.JPushReceiverService"
			android:name=".push.jpush.JPushReceiverService"
			android:enabled="true"
			android:exported="false">
			<intent-filter>
			@@ -244,6 +329,28 @@
			<!-- android:name=".services.ForeService" -->
			<!-- android:enabled="true" -->
			<!-- android:exported="true" /> -->
			<service
			android:name=".push.fcm.MyFirebaseMessagingService"
			android:exported="false">
			<intent-filter>
			<action android:name="com.google.firebase.MESSAGING_EVENT" />
			</intent-filter>
			</service>

			<receiver
			android:name=".push.aliyun.MyAliYunMessageReceiver"
			android:exported="false">
			<intent-filter>
			<action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
			</intent-filter>
			<intent-filter>
			<action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
			</intent-filter>
			<intent-filter>
			<action android:name="com.alibaba.sdk.android.push.RECEIVE" />
			</intent-filter>
			</receiver>

			<meta-data
			android:name="design_height_in_dp"
			android:value="812" />