diff --git a/app/build.gradle b/app/build.gradle index 3c0ec46c9..d301f417a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,20 +21,20 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true - ndk { - // 设置支持的SO库架构 - if (onlyArm64) { - abiFilters "arm64-v8a" - } else { - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - flavorDimensions 'default' manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()] } + splits { + abi { + enable true + reset() + include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' + universalApk true + } + } + bundle { language { enableSplit = false @@ -48,12 +48,21 @@ android { } //在apk文件后边生成版本号信息 - android.applicationVariants.all { - variant -> - variant.outputs.all { - def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08")) - outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}-${date}.apk" + android.applicationVariants.configureEach { variant -> + variant.outputs.configureEach { output -> + def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08")) + + def outputFile = output.outputFile + if (outputFile == null || !outputFile.name.endsWith('.apk')) { + return } + + def abi = output.getFilter(com.android.build.OutputFile.ABI) + if (abi == null) { + abi = "universal" + } + outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk" + } } lintOptions { diff --git a/core/build.gradle b/core/build.gradle index e0a59799b..7ce634d0c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -102,8 +102,8 @@ dependencies { api project(':nim_uikit') api project(':library') - api project(':trtc_release') + implementation 'com.tencent.liteav:LiteAVSDK_TRTC:11.4.0.13189' } repositories { mavenCentral() diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java index 47d2a26c4..db05cfcee 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java @@ -917,8 +917,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl { if (role == CLIENT_ROLE_BROADCASTER) { userRole = TRTCRoleAnchor; if (!TRtcEngineManager.get().isMute) { - trtcCloud.getDeviceManager().setSystemVolumeType(TXDeviceManager.TXSystemVolumeType.TXSystemVolumeTypeMedia); - trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_DEFAULT); + trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_MUSIC); } } else if (role == CLIENT_ROLE_AUDIENCE) { userRole = TRTCRoleAudience; diff --git a/settings.gradle b/settings.gradle index 956654a99..518ee2234 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ include ':app' include ':android_crop_lib' -include ':trtc_release' include ':core' include ':library' include ':nim_uikit' diff --git a/trtc_release/.gitignore b/trtc_release/.gitignore deleted file mode 100644 index 36af4938d..000000000 --- a/trtc_release/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build -*.iml -*.DS_Store \ No newline at end of file diff --git a/trtc_release/LiteAVSDK_TRTC_11.4.0.13189.aar b/trtc_release/LiteAVSDK_TRTC_11.4.0.13189.aar deleted file mode 100644 index d1ac66293..000000000 Binary files a/trtc_release/LiteAVSDK_TRTC_11.4.0.13189.aar and /dev/null differ diff --git a/trtc_release/build.gradle b/trtc_release/build.gradle deleted file mode 100644 index 125f4af3f..000000000 --- a/trtc_release/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('LiteAVSDK_TRTC_11.4.0.13189.aar'))