yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、删除打包x86架构的配置

Browse Source 
2、声网SO不做动态加载
3、美颜so动态加载
This commit is contained in:
老皮
2024-09-24 18:20:38 +08:00
parent 13a373c73b
commit b300541ce9
11 changed files with 109 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib_faceunity/build.gradle
View File

@@ -35,13 +35,7 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
/*if (new File("$AGORA_RTC_SDK").exists()) {
api fileTree(dir: "${AGORA_RTC_SDK}", include: ['*.jar', '*.aar'])
} else {
api "$AGORA_RTC_SDK"
}*/
if (rootProject.ext.manifestPlaceholders.isGooglePlay != 0) {
/* if (rootProject.ext.manifestPlaceholders.isGooglePlay != 0) {
println("isGooglePlayyes " + rootProject.manifestPlaceholders.isGooglePlay)
println('应用市场安装包，使用远程依赖声网SDK')
api "$AGORA_RTC_SDK"
@@ -49,7 +43,8 @@ dependencies {
println("isGooglePlay 链接包：>>> " + rootProject.ext.manifestPlaceholders.isGooglePlay)
println('链接包，使用本地声网Jar + 下载SO')
api files('../libs/agora-rtc-sdk.jar')
}
}*/
api "$AGORA_RTC_SDK"
api project(path: ':FaceUnity')
api project(path: ':common')
}

25
lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java
View File

@@ -93,19 +93,12 @@ public class SWAuManager extends BaseCacheManager {
config.mAppId = CommonAppConfig.getSwAppId();
config.mEventHandler = mRtcEventHandler;
if(CommonAppConfig.IS_GOOGLE_PLAY == 0){
/*if(CommonAppConfig.IS_GOOGLE_PLAY == 0){
//链接包，声网加载下载的 So文件
String cpuAbi = "";
cpuAbi = Build.CPU_ABI;
File file = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_Agora_SO + File.separator + cpuAbi);
File file = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_Agora_SO + File.separator + Build.CPU_ABI);
config.mNativeLibPath = file.getAbsolutePath();
Log.i("downLoad", "声网 SO Path = " + config.mNativeLibPath);
// 美颜SO设置
File file_FaceUnity = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_FaceUnity_SO + File.separator + cpuAbi);
faceunity.LoadConfig.loadLibrary(file_FaceUnity.getAbsolutePath());
Log.i("downLoad", "美颜SO Path = " + file_FaceUnity.getAbsolutePath());
}
Log.i("downLoad", "声网 SO Path 1 = " + config.mNativeLibPath);
}*/
// 创建并初始化 RtcEngine
mRtcEngine = (RtcEngineEx) RtcEngineEx.create(config);
@@ -129,14 +122,12 @@ public class SWAuManager extends BaseCacheManager {
config.mContext = mContext;
config.mAppId = CommonAppConfig.getSwAppId();
config.mEventHandler = mEventHandler;
if(CommonAppConfig.IS_GOOGLE_PLAY == 0){
/* if(CommonAppConfig.IS_GOOGLE_PLAY == 0){
//链接包，声网加载下载的 So文件
String cpuAbi = "";
cpuAbi = Build.CPU_ABI;
File file = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_Agora_SO + File.separator + cpuAbi);
File file = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_Agora_SO + File.separator + Build.CPU_ABI);
config.mNativeLibPath = file.getAbsolutePath();
Log.i("downLoad", "config.mNativeLibPath 2 = " + config.mNativeLibPath);
}
Log.i("downLoad", "声网 SO Path 2 = " + config.mNativeLibPath);
}*/
// 创建并初始化 RtcEngine
mRtcEngine = (RtcEngineEx) RtcEngineEx.create(config);
}

12
lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java
View File

@@ -1,6 +1,7 @@
package io.agora.beautyapi.faceunity.agora;
import android.app.Activity;
import android.app.LauncherActivity;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
@@ -131,14 +132,13 @@ public class SWManager extends BaseCacheManager {
config.mContext = mContext;
config.mAppId = CommonAppConfig.getSwAppId();
config.mEventHandler = mRtcEventHandler;
if(CommonAppConfig.IS_GOOGLE_PLAY == 0){
/*if(CommonAppConfig.IS_GOOGLE_PLAY == 0){
//链接包，声网加载下载的 So文件
String cpuAbi = "";
cpuAbi = Build.CPU_ABI;
File file = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_Agora_SO + File.separator + cpuAbi);
File file = new File(mContext.getDir("lib", Context.MODE_PRIVATE).getAbsoluteFile(), com.yunbao.common.Constants.DOWNLOAD_Agora_SO + File.separator + Build.CPU_ABI);
config.mNativeLibPath = file.getAbsolutePath();
Log.i("downLoad", "config.mNativeLibPath 2 = " + config.mNativeLibPath);
}
Log.i("downLoad", "声网 SO Path 3 = " + config.mNativeLibPath);
}*/
// 创建并初始化 RtcEngine
mRtcEngine = (RtcEngineEx) RtcEngineEx.create(config);