|
|
@@ -2,12 +2,8 @@
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
package="com.xzjmyk.pm.activity"
|
|
|
- android:versionCode="55"
|
|
|
- android:versionName="5.5.0">
|
|
|
-
|
|
|
- <uses-sdk
|
|
|
- android:minSdkVersion="11"
|
|
|
- android:targetSdkVersion="23" />
|
|
|
+ android:versionCode="56"
|
|
|
+ android:versionName="5.6.0">
|
|
|
<!--share umeng-->
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
|
@@ -80,7 +76,6 @@
|
|
|
<uses-permission android:name="android.permission.INTERNET" />
|
|
|
<uses-permission android:name="android.permission.GET_TASKS" />
|
|
|
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
|
|
- <uses-permission android:name="android.permission.CAMERA" />
|
|
|
<uses-permission android:name="android.permission.INTERNET" />
|
|
|
<uses-permission android:name="android.permission.VIBRATE" />
|
|
|
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
|
|
@@ -90,8 +85,6 @@
|
|
|
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
|
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
|
<uses-permission android:name="android.permission.VIBRATE" />
|
|
|
- <!-- 震动权限 -->
|
|
|
- <uses-permission android:name="android.permission.CAMERA" />
|
|
|
|
|
|
<uses-feature android:name="android.hardware.camera" />
|
|
|
<!-- 使用照相机权限 -->
|
|
|
@@ -106,7 +99,7 @@
|
|
|
android:label="@string/app_name"
|
|
|
android:largeHeap="true"
|
|
|
android:theme="@style/AppTheme">
|
|
|
-
|
|
|
+
|
|
|
<meta-data
|
|
|
android:name="UMENG_CHANNEL"
|
|
|
android:value="baidu" />
|
|
|
@@ -418,6 +411,11 @@
|
|
|
android:name="BDAPPKEY"
|
|
|
android:value="GMZFDGbbchdQQXjpabX38rTlychRGnEF" />
|
|
|
|
|
|
+ <service
|
|
|
+ android:name="com.baidu.location.f"
|
|
|
+ android:enabled="true"
|
|
|
+ android:process=":remote" />
|
|
|
+
|
|
|
<activity
|
|
|
android:name="com.baidu.autoupdatesdk.ConfirmDialoigActivity"
|
|
|
android:configChanges="keyboardHidden|orientation"
|
|
|
@@ -598,18 +596,17 @@
|
|
|
<activity android:name=".ui.erp.activity.oa.OptionActivity" />
|
|
|
<activity android:name=".ui.erp.activity.oa.SelectListActivity" />
|
|
|
<activity android:name=".ui.erp.activity.crm.SubsActivity" />
|
|
|
- <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity"/>
|
|
|
- <activity android:name=".ui.erp.activity.me.UpdateSexActivity"/>
|
|
|
+ <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity" />
|
|
|
+ <activity android:name=".ui.erp.activity.me.UpdateSexActivity" />
|
|
|
<activity
|
|
|
android:name=".ui.erp.activity.me.FeedbackActivity"
|
|
|
- android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
|
|
|
+ android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
|
|
|
<activity android:name=".ui.erp.activity.oa.OAActivity" />
|
|
|
-
|
|
|
+
|
|
|
<!--umeng api key-->
|
|
|
<meta-data
|
|
|
android:name="UMENG_APPKEY"
|
|
|
- android:value="57ea27bb67e58e088c003bbf" >
|
|
|
- </meta-data>
|
|
|
+ android:value="57ea27bb67e58e088c003bbf"></meta-data>
|
|
|
<!--weixin-->
|
|
|
<activity
|
|
|
android:name=".wxapi.WXEntryActivity"
|
|
|
@@ -617,11 +614,11 @@
|
|
|
android:exported="true"
|
|
|
android:screenOrientation="portrait"
|
|
|
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
|
|
|
- <!--qq-->
|
|
|
+ <!--qq-->
|
|
|
<activity
|
|
|
android:name="com.tencent.tauth.AuthActivity"
|
|
|
android:launchMode="singleTask"
|
|
|
- android:noHistory="true" >
|
|
|
+ android:noHistory="true">
|
|
|
<intent-filter>
|
|
|
<action android:name="android.intent.action.VIEW" />
|
|
|
|
|
|
@@ -633,14 +630,14 @@
|
|
|
</activity>
|
|
|
<activity
|
|
|
android:name="com.tencent.connect.common.AssistActivity"
|
|
|
+ android:configChanges="orientation|keyboardHidden|screenSize"
|
|
|
android:screenOrientation="portrait"
|
|
|
- android:theme="@android:style/Theme.Translucent.NoTitleBar"
|
|
|
- android:configChanges="orientation|keyboardHidden|screenSize"/>
|
|
|
+ android:theme="@android:style/Theme.Translucent.NoTitleBar" />
|
|
|
|
|
|
<activity
|
|
|
android:name=".WBShareActivity"
|
|
|
android:configChanges="keyboardHidden|orientation"
|
|
|
- android:screenOrientation="portrait" >
|
|
|
+ android:screenOrientation="portrait">
|
|
|
<intent-filter>
|
|
|
<action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
|
|
|
<category android:name="android.intent.category.DEFAULT" />
|
|
|
@@ -649,11 +646,10 @@
|
|
|
<activity
|
|
|
android:name="com.sina.weibo.sdk.component.WeiboSdkBrowser"
|
|
|
android:configChanges="keyboardHidden|orientation"
|
|
|
- android:windowSoftInputMode="adjustResize"
|
|
|
- android:exported="false" >
|
|
|
- </activity>
|
|
|
-
|
|
|
- <activity android:name=".ui.erp.activity.oa.SelectActivity"/>
|
|
|
+ android:exported="false"
|
|
|
+ android:windowSoftInputMode="adjustResize"></activity>
|
|
|
+
|
|
|
+ <activity android:name=".ui.erp.activity.oa.SelectActivity" />
|
|
|
|
|
|
<activity
|
|
|
android:name="com.umeng.socialize.editorpage.ShareActivity"
|