~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -1,7 +1,7 @@
			<?xml version="1.0" encoding="utf-8"?>
			<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120080401" android:installLocation="auto" android:versionName="1.1.0120080401">
			<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120080601" android:installLocation="auto" android:versionName="1.1.0120080601">
			<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
			<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
			<permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
			<uses-permission android:name="android.permission.WAKE_LOCK" />
			<!--8.0权限-->
			<uses-permission android:name="android.permission.GET_TASKS" />
			@@ -72,7 +72,7 @@
			<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
			<!--极光推送 Required 一些系统要求的权限，如访问网络等-->
			<!-- Required 一些系统要求的权限，如访问网络等-->
			<uses-permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" />
			<uses-permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" />
			<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
			<uses-permission android:name="android.permission.INTERNET" />
			<uses-permission android:name="android.permission.READ_PHONE_STATE" />
			@@ -92,10 +92,11 @@
			<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
			<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
			<uses-permission android:name="android.permission.GET_TASKS" />
			<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
			<!-- 极光推送结束 -->
			<application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon">
			<!-- 自动更新 -->
			<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.home.fileProvider" android:grantUriPermissions="true" android:exported="false">
			<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.evoyo.home.fileProvider" android:grantUriPermissions="true" android:exported="false">
			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
			</provider>
			<!--自动更新结束-->
			@@ -105,7 +106,7 @@
			<intent-filter>
			<action android:name="cn.jpush.android.ui.PushActivity" />
			<category android:name="android.intent.category.DEFAULT" />
			<category android:name="com.hdl.home" />
			<category android:name="com.evoyo.home" />
			</intent-filter>
			</activity>
			<service android:name="cn.jpush.android.service.PushService" android:process=":mult">
			@@ -117,19 +118,19 @@
			</intent-filter>
			</service>
			<!-- since 3.0.9 Required SDK 核心功能-->
			<provider android:authorities="com.hdl.home.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" android:exported="false" />
			<provider android:authorities="com.evoyo.home.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" android:exported="false" />
			<service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
			<intent-filter>
			<action android:name="cn.jpush.android.intent.DaemonService" />
			<category android:name="com.hdl.home" />
			<category android:name="com.evoyo.home" />
			</intent-filter>
			</service>
			<!-- since 3.1.0 Required SDK 核心功能-->
			<provider android:authorities="com.hdl.home.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
			<provider android:authorities="com.evoyo.home.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
			<receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true">
			<intent-filter android:priority="1000">
			<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
			<category android:name="com.hdl.home" />
			<category android:name="com.evoyo.home" />
			</intent-filter>
			<intent-filter>
			<action android:name="android.intent.action.USER_PRESENT" />
			@@ -144,27 +145,12 @@
			</receiver>
			<receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" />
			<!-- User defined. For test only 用户自定义的广播接收器-->
			<receiver android:name="com.hdl.home.JpushNotificationReceiver" android:exported="false" android:enabled="true">
			<intent-filter>
			<action android:name="cn.jpush.android.intent.REGISTRATION" />
			<!--Required 用户注册SDK的intent-->
			<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
			<!--Required 用户接收SDK消息的intent-->
			<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
			<!--Required 用户接收SDK通知栏信息的intent-->
			<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
			<!--Required 用户打开自定义通知栏的intent-->
			<action android:name="cn.jpush.android.intent.CONNECTION" />
			<!-- 接收网络变化连接/断开 since 1.6.3 -->
			<category android:name="com.hdl.home" />
			</intent-filter>
			</receiver>
			<!-- Required . Enable it you can get statistics data with channel -->
			<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
			<meta-data android:name="JPUSH_APPKEY" android:value="f4a3322fbc45e58d04c85191" />
			<meta-data android:name="JPUSH_APPKEY" android:value="07cfd3177490173e7c072f49" />
			<!-- </>值来自开发者平台取得的AppKey-->
			<!-- 极光推送结束 -->
			<!-- 设置高德地图key -->
			<meta-data android:name="com.amap.api.v2.apikey" android:value="1f753413955012c9594c5df69eaa0aff" />
			<meta-data android:name="com.amap.api.v2.apikey" android:value="f78f951092602db3962811e736758559" />
			</application>
			</manifest>