Skip to content

Commit

Permalink
发布SDK版本:7.4.9211,Demo版本:7.4.281
Browse files Browse the repository at this point in the history
  • Loading branch information
whalehe committed Jul 3, 2020
1 parent 237f323 commit afc8d96
Show file tree
Hide file tree
Showing 2,024 changed files with 80,489 additions and 63,583 deletions.
38 changes: 37 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,40 @@
*/.gradle/
**/build/
*.iml
*.properties
*.properties

*.iml
.gradle
/local.properties
.DS_Store
/build
/captures
.externalNativeBuild
# Built application files
*.apk
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log
9 changes: 9 additions & 0 deletions Demo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
*.iml
*.gradle/
/local.properties
*.idea/
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
4 changes: 0 additions & 4 deletions Demo/README.md

This file was deleted.

1 change: 1 addition & 0 deletions Demo/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
76 changes: 36 additions & 40 deletions Demo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,32 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.tencent.liteav.demo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "2.0"
multiDexEnabled true
versionCode 6
versionName "7.4.281"

multiDexEnabled true
ndk {
abiFilters "armeabi-v7a","arm64-v8a"
abiFilters "armeabi-v7a"
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

signingConfigs{
release{
}
}

buildTypes {
release {
signingConfig signingConfigs.release
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
dexOptions {
jumboMode true
javaMaxHeapSize "4g"
}

// sourceSets {
// main {
// jniLibs.srcDirs = ['libs']
// }
// }
//
// configurations{
// all*.exclude module: 'okhttp'
// all*.exclude module: 'okio'
// }


packagingOptions {
pickFirst '**/libc++_shared.so'
Expand All @@ -46,30 +37,35 @@ android {
doNotStrip "*/x86/libYTCommon.so"
doNotStrip "*/arm64-v8a/libYTCommon.so"
}

}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')

compile fileTree(dir: 'libs', include: ['*.jar'])

compile project(':trtcliveroomdemo')
compile project(':trtcvoiceroomdemo')
compile project(':trtcaudiocalldemo')
compile project(':trtcvideocalldemo')
compile project(':trtcmeetingdemo')
compile project(':login')
compile project(':ugcvideoeditdemo')
compile project(':ugcvideojoindemo')
compile project(':ugcvideorecorddemo')
compile project(':ugcvideouploaddemo')
compile project(':superplayerdemo')
compile project(':liveplayerdemo')
compile project(':livepusherdemo')
compile project(':mlvbliveroomdemo')

compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support:recyclerview-v7:25.+'
compile "com.tencent.liteav:LiteAVSDK_Professional:$rootProject.ext.liteavsdk_version"
compile 'com.mcxiaoke.volley:library:1.0.19'
compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
compile 'com.github.ctiao:DanmakuFlameMaster:0.5.3'
compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
compile 'com.android.support:multidex:1.0.0'
compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support.constraint:constraint-layout:1.1.3'
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'

compile 'com.tencent.bugly:crashreport:3.1.0'
compile 'com.tencent.bugly:nativecrashreport:3.7.0'
compile project(':lvb')
compile project(':player')
compile project(':trtc')
compile project(':trtcvoiceroom')
compile project(':trtcaudiocalldemo')
compile project(':videoediter')
compile project(':videojoiner')
compile project(':videorecorder')
compile project(':videouploader')
}
11 changes: 0 additions & 11 deletions Demo/app/libs/readme.txt

This file was deleted.

9 changes: 3 additions & 6 deletions Demo/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/kuenzhang/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
# You can control the set of applied configuration files using the
# proguardFiles setting 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:
Expand All @@ -23,3 +19,4 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
-keep class com.tencent.** { *; }
Loading

0 comments on commit afc8d96

Please sign in to comment.