From b3635dde3e5ca9485212aa67dbb6ceb96cba873a Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 10 三月 2017 16:54:19 +0800
Subject: [PATCH] 工作交接
---
VisitFace/DemoForBsk/app/build/intermediates/manifests/full/debug/AndroidManifest.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/manifests/full/debug/AndroidManifest.xml b/VisitFace/DemoForBsk/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
index e9b1399..358dcd5 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -6,7 +6,18 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="25" />
+ android:targetSdkVersion="23" />
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+ <uses-feature android:glEsVersion="0x00020000" />
+
+ <!-- INTERNET is needed to use a URI-based media player, depending on the URI -->
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+
+ <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:name="com.bsk.zhangbo.demoforbsk.base.BaseApplication"
@@ -17,13 +28,19 @@
android:theme="@style/AppTheme" >
<activity
android:name="com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity"
- android:screenOrientation="landscape" >
+ android:screenOrientation="landscape"
+ android:windowSoftInputMode="adjustPan" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity
+ android:name="com.bsk.zhangbo.demoforbsk.ui.activity.TestARGB8888Activity"
+ android:screenOrientation="landscape" />
+
+ <service android:name="com.lzy.okhttpserver.download.DownloadService" />
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.8.0