Skip to content

Commit 35c6804

Browse files
KevinHuoKevinHuo
authored
Merge pull request #1256 from AstaTus/master
Release 2.2.2
2 parents d50dd54 + e5a7313 commit 35c6804

119 files changed

Lines changed: 5488 additions & 12 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NiuDroidPlayer/.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
*.iml
2+
.gradle
3+
/local.properties
4+
/.idea/workspace.xml
5+
/.idea/libraries
6+
.DS_Store
7+
/build
8+
/captures

‎NiuDroidPlayer/app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎NiuDroidPlayer/app/build.gradle‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 27
5+
buildToolsVersion '27.0.3'
6+
7+
defaultConfig {
8+
applicationId "com.qiniu.droid.niuplayer"
9+
minSdkVersion 14
10+
targetSdkVersion 27
11+
versionCode 4
12+
versionName "2.1.3"
13+
buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
14+
}
15+
buildTypes {
16+
release {
17+
minifyEnabled false
18+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
19+
}
20+
}
21+
22+
sourceSets {
23+
main {
24+
jniLibs.srcDirs = ['../../releases/openssl']
25+
jniLibs.srcDirs += ['../../releases/qplayer']
26+
}
27+
}
28+
29+
lintOptions {
30+
checkReleaseBuilds false
31+
}
32+
}
33+
34+
dependencies {
35+
implementation files('../../releases/pldroid-player-2.2.2.jar')
36+
implementation 'com.android.support:appcompat-v7:27.0.2'
37+
implementation 'com.android.support:design:27.0.2'
38+
implementation 'com.android.support:recyclerview-v7:27.0.2'
39+
implementation 'com.journeyapps:zxing-android-embedded:3.0.2@aar'
40+
implementation 'com.google.zxing:core:3.2.0'
41+
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
42+
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
43+
implementation 'com.bugsnag:bugsnag-android-ndk:1.+'
44+
}

‎NiuDroidPlayer/app/proguard-rules.pro‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in /Users/lujun/Library/Android/sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}

‎NiuDroidPlayer/app/release/output.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.qiniu.droid.niuplayer","split":"","minSdkVersion":"14"}}]

‎NiuDroidPlayer/app/src/main/AndroidManifest.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.qiniu.droid.niuplayer">
4+
5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
7+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8+
<uses-permission android:name="android.permission.WAKE_LOCK" />
9+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
10+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
11+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
12+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
13+
<uses-permission android:name="android.permission.CAMERA" />
14+
15+
<supports-screens
16+
android:anyDensity="true"
17+
android:largeScreens="true"
18+
android:normalScreens="true"
19+
android:resizeable="true"
20+
android:smallScreens="true"
21+
android:xlargeScreens="true" />
22+
23+
<application
24+
android:allowBackup="true"
25+
android:icon="@mipmap/player_icon"
26+
android:label="@string/app_name"
27+
android:supportsRtl="true"
28+
android:theme="@style/AppTheme">
29+
30+
<meta-data
31+
android:name="com.bugsnag.android.API_KEY"
32+
android:value="5f579af4e2d1280b06de214bf1b485fb"/>
33+
34+
<activity
35+
android:name="com.qiniu.droid.niuplayer.MainActivity"
36+
android:configChanges="keyboardHidden|orientation|screenSize|layoutDirection"
37+
android:theme="@style/AppThemeFullscreen">
38+
<intent-filter>
39+
<action android:name="android.intent.action.MAIN" />
40+
41+
<category android:name="android.intent.category.LAUNCHER" />
42+
</intent-filter>
43+
</activity>
44+
45+
<activity
46+
android:name="com.qiniu.droid.niuplayer.PLVideoTextureActivity"
47+
android:theme="@style/AppThemeFullscreen" />
48+
<activity
49+
android:name=".ScanActivity"
50+
android:theme="@style/AppThemeFullscreen" />
51+
<service
52+
android:name=".utils.DownloadService"
53+
android:exported="false" />
54+
55+
<provider
56+
android:name=".utils.UpgradeApkFileProvider"
57+
android:authorities="${applicationId}.update.provider"
58+
android:exported="false"
59+
android:grantUriPermissions="true">
60+
61+
<meta-data
62+
android:name="android.support.FILE_PROVIDER_PATHS"
63+
android:resource="@xml/update_apk_paths" />
64+
</provider>
65+
</application>
66+
</manifest>

0 commit comments

Comments
 (0)