diff --git a/FaceUnity/build.gradle b/FaceUnity/build.gradle index 4d0686f41..440319b62 100644 --- a/FaceUnity/build.gradle +++ b/FaceUnity/build.gradle @@ -1,12 +1,18 @@ -apply plugin: 'com.android.library' -apply plugin: 'img-optimizer' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +//apply plugin: 'com.android.library' +//apply plugin: 'img-optimizer' +//apply plugin: 'kotlin-android' +//apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-parcelize' + id 'img-optimizer' +} android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.yunbao.faceunity" + compileSdk rootProject.ext.android.compileSdkVersion packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" @@ -48,8 +54,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 + } + buildFeatures { + buildConfig = true } } repositories { diff --git a/FaceUnity/src/main/AndroidManifest.xml b/FaceUnity/src/main/AndroidManifest.xml index 220544321..7730054ac 100644 --- a/FaceUnity/src/main/AndroidManifest.xml +++ b/FaceUnity/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -11,7 +10,9 @@ + android:allowBackup="true" + tools:replace="allowBackup" + > diff --git a/IAP6Helper/build.gradle b/IAP6Helper/build.gradle index d8fc4749a..c44647428 100644 --- a/IAP6Helper/build.gradle +++ b/IAP6Helper/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.samsung.android.sdk.iap.lib" + compileSdk rootProject.ext.android.compileSdkVersion defaultConfig { - minSdkVersion minSdkVersion + minSdkVersion rootProject.ext.android.minSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - versionCode versionCode - versionName versionName - targetSdkVersion targetSdkVersion + versionCode rootProject.ext.android.versionCode + versionName rootProject.ext.android.versionName + targetSdkVersion rootProject.ext.android.targetSdkVersion } buildTypes { @@ -18,7 +18,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + buildFeatures { + buildConfig = true + } +} +repositories { + flatDir { + dirs 'libs', '../libs' + } } - dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) } \ No newline at end of file diff --git a/IAP6Helper/libs/samsung-iap-6.1.1.aar b/IAP6Helper/libs/samsung-iap-6.1.1.aar new file mode 100644 index 000000000..4195da69d Binary files /dev/null and b/IAP6Helper/libs/samsung-iap-6.1.1.aar differ diff --git a/IAP6Helper/src/main/AndroidManifest.xml b/IAP6Helper/src/main/AndroidManifest.xml index b5f9f1046..15497edba 100644 --- a/IAP6Helper/src/main/AndroidManifest.xml +++ b/IAP6Helper/src/main/AndroidManifest.xml @@ -1,11 +1,12 @@ - - + + > @@ -19,7 +19,7 @@ tools:ignore="ExportedContentProvider" /> - + variant.mergeAssetsProvider.configure { @@ -33,9 +31,7 @@ android { } } }*/ - - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + compileSdk rootProject.ext.android.compileSdkVersion packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" @@ -105,8 +101,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 + } + buildFeatures { + buildConfig = true } applicationVariants.all { variant -> println "清空build文件夹"; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ded4c2c0f..6cd079c27 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + > diff --git a/beauty/build.gradle b/beauty/build.gradle index a41bf38a8..613c86161 100644 --- a/beauty/build.gradle +++ b/beauty/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'img-optimizer' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + compileSdk rootProject.ext.android.compileSdkVersion + targetSdk rootProject.ext.android.buildToolsVersion packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" @@ -45,8 +45,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 } } repositories { diff --git a/beauty/src/main/AndroidManifest.xml b/beauty/src/main/AndroidManifest.xml index c6ceee92c..a3e44eaff 100644 --- a/beauty/src/main/AndroidManifest.xml +++ b/beauty/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + /> diff --git a/build.gradle b/build.gradle index 7212cbfef..0441438d0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,27 +4,28 @@ apply from: "dependencies.gradle" buildscript { - ext.kotlin_version = '1.6.20' + ext.kotlin_version = '1.8.22' repositories { maven { url "https://mvn.mob.com/android" } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.fabric.io/public' } - maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库 + maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库 maven { url 'https://repo1.maven.org/maven2/' }//埋点 maven {url 'https://developer.huawei.com/repo/'} + maven { url "https://jitpack.io" } google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:8.3.1' //一键压缩png工具 classpath 'com.chenenyu:img-optimizer:1.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20" classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' - classpath "com.alibaba:arouter-register:1.0.2" + classpath "com.github.jadepeakpoet.ARouter:arouter-register:1.0.3" classpath 'com.huawei.agconnect:agcp:1.5.2.300' } @@ -40,9 +41,9 @@ allprojects { maven { url "https://mvn.mob.com/android" } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } - maven { url 'http://developer.huawei.com/repo'}//华为库 + maven { url 'https://developer.huawei.com/repo'}//华为库 maven { url 'https://maven.fabric.io/public' } - maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库 + maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库 maven { url "https://jitpack.io" } maven { url 'https://repo1.maven.org/maven2/' }//埋点 google() // Google's Maven repository diff --git a/common/build.gradle b/common/build.gradle index d59049c32..5e0dd1852 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'img-optimizer' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.yunbao.common" + compileSdk rootProject.ext.android.compileSdkVersion defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion @@ -53,8 +53,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 + } + buildFeatures { + buildConfig = true } } repositories { @@ -158,14 +161,14 @@ dependencies { //腾讯im api 'com.tencent.imsdk:imsdk-plus:5.4.666' api 'com.google.code.gson:gson:2.8.8' - api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库 + api 'cn.rongcloud.sdk:rtc_lib:5.6.9' // 音视频通话基础能力库 //此处以集成 5.1.2 版本为例 - api 'cn.rongcloud.sdk:im_lib:5.2.0.2' + api 'cn.rongcloud.sdk:im_lib:5.6.10' //此处以集成 5.1.2 版本为例 - api 'cn.rongcloud.sdk:im_kit:5.2.5.4' // 即时通讯 UI 基础组件 + api 'cn.rongcloud.sdk:im_kit:5.6.10' // 即时通讯 UI 基础组件 //融云小视频模块 - api 'cn.rongcloud.sdk:sight:5.2.5.4' + api 'cn.rongcloud.sdk:sight:5.6.10' api 'com.facebook.android:facebook-android-sdk:15.2.0' implementation 'com.facebook.android:facebook-android-sdk:15.2.0' diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index 5b9ff7982..aca593564 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -1,11 +1,14 @@ + xmlns:tools="http://schemas.android.com/tools"> - + diff --git a/config.gradle b/config.gradle index f20f2246d..8b36c9a53 100644 --- a/config.gradle +++ b/config.gradle @@ -2,10 +2,11 @@ ext { android = [ compileSdkVersion: 33, buildToolsVersion: "29.0.2", - minSdkVersion : 21, + minSdkVersion : 23, targetSdkVersion : 33, versionCode : 469, - versionName : "6.6.5" + versionName : "6.6.5", + namespace : "com.pandoralive.shayu" ] manifestPlaceholders = [ //正式、 diff --git a/dependencies.gradle b/dependencies.gradle index 3a028a4df..fd32a5d29 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -27,8 +27,8 @@ ext { "magicIndicator" : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器 "banner" : 'com.ms:banner:1.0.0',//轮播图 "Luban" : 'top.zibin:Luban:1.1.8',//鲁班压缩图片 - "arouter" : 'com.alibaba:arouter-api:1.5.2',//ARouter - "arouter-compiler" : 'com.alibaba:arouter-compiler:1.2.2', + "arouter" : 'com.github.jadepeakpoet.ARouter:arouter-api:1.0.3',//ARouter + "arouter-compiler" : 'com.github.jadepeakpoet.ARouter:arouter-compiler:1.0.3', "leakcanary" : 'com.squareup.leakcanary:leakcanary-android:2.9.1', "blank-utilcode" : 'com.blankj:utilcode:1.30.0', diff --git a/gradle.properties b/gradle.properties index 15d390c86..36a9d2f4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,13 +13,14 @@ #Thu Feb 04 00:05:45 CST 2021 android.injected.testOnly=false org.gradle.daemon=true -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.parallel=true org.gradle.configureondemand=true android.useAndroidX=true android.enableJetifier=true +android.nonTransitiveRClass=false systemProp.http.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9276a5849..36be9d94f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip diff --git a/lib_country_code/build.gradle b/lib_country_code/build.gradle index 03733b197..d79070cf8 100644 --- a/lib_country_code/build.gradle +++ b/lib_country_code/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'img-optimizer' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.sahooz.library" + compileSdk rootProject.ext.android.compileSdkVersion packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" @@ -25,10 +25,10 @@ android { } defaultConfig { - minSdkVersion minSdkVersion - targetSdkVersion targetSdkVersion - versionCode versionCode - versionName versionName + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode rootProject.ext.android.versionCode + versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -42,8 +42,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 } } diff --git a/lib_country_code/src/main/AndroidManifest.xml b/lib_country_code/src/main/AndroidManifest.xml index 9de290553..f2f766304 100644 --- a/lib_country_code/src/main/AndroidManifest.xml +++ b/lib_country_code/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + > diff --git a/lib_google/build.gradle b/lib_google/build.gradle index 262c095e4..d62050566 100644 --- a/lib_google/build.gradle +++ b/lib_google/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.library' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.shayu.lib_google" + compileSdk rootProject.ext.android.compileSdkVersion defaultConfig { - minSdkVersion minSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - versionCode versionCode - versionName versionName - targetSdkVersion targetSdkVersion + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode rootProject.ext.android.versionCode + versionName rootProject.ext.android.versionName } buildTypes { @@ -20,8 +20,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 } } diff --git a/lib_google/src/main/AndroidManifest.xml b/lib_google/src/main/AndroidManifest.xml index deeb96ae2..12bbd5002 100644 --- a/lib_google/src/main/AndroidManifest.xml +++ b/lib_google/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + > \ No newline at end of file diff --git a/lib_huawei/build.gradle b/lib_huawei/build.gradle index 5e8964d43..9755b0a61 100644 --- a/lib_huawei/build.gradle +++ b/lib_huawei/build.gradle @@ -1,8 +1,9 @@ apply plugin: 'com.android.library' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.shayu.lib_huawei" + compileSdk rootProject.ext.android.compileSdkVersion + targetSdk rootProject.ext.android.buildToolsVersion defaultConfig { minSdkVersion minSdkVersion @@ -20,8 +21,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 } } diff --git a/lib_huawei/src/main/AndroidManifest.xml b/lib_huawei/src/main/AndroidManifest.xml index b9b2617ac..901e222d4 100644 --- a/lib_huawei/src/main/AndroidManifest.xml +++ b/lib_huawei/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + > \ No newline at end of file diff --git a/live/build.gradle b/live/build.gradle index b9a209670..53402f163 100644 --- a/live/build.gradle +++ b/live/build.gradle @@ -1 +1 @@ -apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation (name:'../libs/beautysdk-202202241203',ext:'aar') implementation (name:'../libs/svgaplayer-release-v1.2.1',ext:'aar') //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common api project(path: ':common') api project(path:':FaceUnity')//新娱美颜 api project(':Share')//分享 annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" //ExoPlayer,腾讯的播放器不支持无缝切换 implementation 'com.google.android.exoplayer:exoplayer:2.18.2' implementation 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar' } \ No newline at end of file +apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { namespace "com.yunbao.live" compileSdk rootProject.ext.android.compileSdkVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_18 targetCompatibility JavaVersion.VERSION_18 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation (name:'../libs/beautysdk-202202241203',ext:'aar') implementation (name:'../libs/svgaplayer-release-v1.2.1',ext:'aar') //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common api project(path: ':common') api project(path:':FaceUnity')//新娱美颜 api project(':Share')//分享 annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" //ExoPlayer,腾讯的播放器不支持无缝切换 implementation 'com.google.android.exoplayer:exoplayer:2.18.2' implementation 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar' } \ No newline at end of file diff --git a/live/src/main/AndroidManifest.xml b/live/src/main/AndroidManifest.xml index 1af89a691..74b45afdf 100644 --- a/live/src/main/AndroidManifest.xml +++ b/live/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + > @@ -11,7 +11,7 @@ + > - + xmlns:tools="http://schemas.android.com/tools">