Skip to content

Commit

Permalink
Merge pull request #1256 from AstaTus/master
Browse files Browse the repository at this point in the history
Release 2.2.2
  • Loading branch information
KevinHuo authored Jul 1, 2021
2 parents d50dd54 + e5a7313 commit 35c6804
Show file tree
Hide file tree
Showing 119 changed files with 5,488 additions and 12 deletions.
8 changes: 8 additions & 0 deletions NiuDroidPlayer/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
1 change: 1 addition & 0 deletions NiuDroidPlayer/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
44 changes: 44 additions & 0 deletions NiuDroidPlayer/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.qiniu.droid.niuplayer"
minSdkVersion 14
targetSdkVersion 27
versionCode 4
versionName "2.1.3"
buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

sourceSets {
main {
jniLibs.srcDirs = ['../../releases/openssl']
jniLibs.srcDirs += ['../../releases/qplayer']
}
}

lintOptions {
checkReleaseBuilds false
}
}

dependencies {
implementation files('../../releases/pldroid-player-2.2.2.jar')
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:recyclerview-v7:27.0.2'
implementation 'com.journeyapps:zxing-android-embedded:3.0.2@aar'
implementation 'com.google.zxing:core:3.2.0'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
implementation 'com.bugsnag:bugsnag-android-ndk:1.+'
}
17 changes: 17 additions & 0 deletions NiuDroidPlayer/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/lujun/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
1 change: 1 addition & 0 deletions NiuDroidPlayer/app/release/output.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.qiniu.droid.niuplayer","split":"","minSdkVersion":"14"}}]
66 changes: 66 additions & 0 deletions NiuDroidPlayer/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.qiniu.droid.niuplayer">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.CAMERA" />

<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:resizeable="true"
android:smallScreens="true"
android:xlargeScreens="true" />

<application
android:allowBackup="true"
android:icon="@mipmap/player_icon"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">

<meta-data
android:name="com.bugsnag.android.API_KEY"
android:value="5f579af4e2d1280b06de214bf1b485fb"/>

<activity
android:name="com.qiniu.droid.niuplayer.MainActivity"
android:configChanges="keyboardHidden|orientation|screenSize|layoutDirection"
android:theme="@style/AppThemeFullscreen">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name="com.qiniu.droid.niuplayer.PLVideoTextureActivity"
android:theme="@style/AppThemeFullscreen" />
<activity
android:name=".ScanActivity"
android:theme="@style/AppThemeFullscreen" />
<service
android:name=".utils.DownloadService"
android:exported="false" />

<provider
android:name=".utils.UpgradeApkFileProvider"
android:authorities="${applicationId}.update.provider"
android:exported="false"
android:grantUriPermissions="true">

<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/update_apk_paths" />
</provider>
</application>
</manifest>
Loading

0 comments on commit 35c6804

Please sign in to comment.