|
|
@@ -1,13 +1,13 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<manifest package="com.xzjmyk.pm.activity"
|
|
|
- xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
- xmlns:tools="http://schemas.android.com/tools"
|
|
|
- android:versionCode="158"
|
|
|
- android:versionName="6.1.9">
|
|
|
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
+ xmlns:tools="http://schemas.android.com/tools"
|
|
|
+ package="com.xzjmyk.pm.activity"
|
|
|
+ android:versionCode="158"
|
|
|
+ android:versionName="6.1.9">
|
|
|
|
|
|
<uses-sdk
|
|
|
- android:minSdkVersion="11"
|
|
|
- android:targetSdkVersion="22" />
|
|
|
+ android:minSdkVersion="17"
|
|
|
+ android:targetSdkVersion="26" />
|
|
|
<!-- share umeng -->
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
|
@@ -71,12 +71,11 @@
|
|
|
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
|
|
|
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
|
|
|
|
|
|
- <!-- 适配Android N系统必需的ContentProvider写权限声明,写权限包含应用包名 -->
|
|
|
- <!-- <uses-permission android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example" /> -->
|
|
|
- <!-- <permission -->
|
|
|
- <!-- android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example" -->
|
|
|
- <!-- android:protectionLevel="normal"> -->
|
|
|
- <!-- </permission> -->
|
|
|
+ <!-- 适配Android N系统必需的ContentProvider写权限声明,写权限包含应用包名-->
|
|
|
+ <uses-permission android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.xzjmyk.pm.activity" />
|
|
|
+ <permission
|
|
|
+ android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.xzjmyk.pm.activity"
|
|
|
+ android:protectionLevel="signature"></permission>
|
|
|
|
|
|
<!-- 百度自动更新 -->
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
|
@@ -375,8 +374,7 @@
|
|
|
|
|
|
|
|
|
<activity android:name=".video.VideoRecordActivity" />
|
|
|
- <activity
|
|
|
- android:name="com.uas.appme.other.activity.CardcastActivity" />
|
|
|
+ <activity android:name="com.uas.appme.other.activity.CardcastActivity" />
|
|
|
<activity
|
|
|
android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
|
|
|
android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
|
|
|
@@ -522,10 +520,10 @@
|
|
|
<!-- 百度 -->
|
|
|
<meta-data
|
|
|
android:name="BDAPPID"
|
|
|
- android:value="7178311" />
|
|
|
+ android:value="10537889" />
|
|
|
<meta-data
|
|
|
android:name="BDAPPKEY"
|
|
|
- android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
|
|
|
+ android:value="bCH2mzKcIjefS9PvqwDdBrNBGSWrHETK" />
|
|
|
<!-- <meta-data -->
|
|
|
<!-- android:name="BDAPPID" -->
|
|
|
<!-- android:value="8037149" /> -->
|
|
|
@@ -556,8 +554,7 @@
|
|
|
<!--</intent-filter>-->
|
|
|
<!--</receiver>-->
|
|
|
|
|
|
- <activity
|
|
|
- android:name=".video.VideoActivity" />
|
|
|
+ <activity android:name=".video.VideoActivity" />
|
|
|
<activity
|
|
|
android:name=".ui.erp.activity.CompanyActivity"
|
|
|
android:hardwareAccelerated="true" />
|
|
|
@@ -767,14 +764,12 @@
|
|
|
</service>
|
|
|
<!-- </service> -->
|
|
|
|
|
|
-
|
|
|
<!-- 4.4版本新增的CommandService声明,提升小米和魅族手机上的实际推送到达率 -->
|
|
|
<service
|
|
|
android:name="com.baidu.android.pushservice.CommandService"
|
|
|
android:exported="true" />
|
|
|
<!-- push结束 -->
|
|
|
|
|
|
-
|
|
|
<!-- 适配Android N系统必需的ContentProvider声明,写权限包含应用包名 -->
|
|
|
<provider
|
|
|
android:name="com.baidu.android.pushservice.PushInfoProvider"
|
|
|
@@ -803,7 +798,6 @@
|
|
|
<!-- push应用定义消息receiver声明 -->
|
|
|
<receiver android:name=".ui.PushNetMessageReceiver">
|
|
|
<intent-filter android:priority="1000">
|
|
|
-
|
|
|
<!-- 接收push消息 -->
|
|
|
<action android:name="com.baidu.android.pushservice.action.MESSAGE" />
|
|
|
<!-- 接收bind,unbind,fetch,delete等反馈消息 -->
|
|
|
@@ -821,7 +815,7 @@
|
|
|
|
|
|
<meta-data
|
|
|
android:name="api_key"
|
|
|
- android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
|
|
|
+ android:value="bCH2mzKcIjefS9PvqwDdBrNBGSWrHETK" />
|
|
|
<!-- 百度推送相关结束 -->
|
|
|
|
|
|
|