diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 4e9f63bf8..bb48ad393 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -232,4 +232,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; } -keep class com.yunbao.faceunity.utils.FaceUnityConfig{ public static java.lang.String BUNDLE_FACE_BEAUTIFICATION; +} +-keep class com.faceunity.wrapper.faceunity$LoadConfig*{ + private static boolean sLoadedLibrary; } \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/utils/PluginManager.java b/common/src/main/java/com/yunbao/common/utils/PluginManager.java index e665425e6..395dbee7c 100644 --- a/common/src/main/java/com/yunbao/common/utils/PluginManager.java +++ b/common/src/main/java/com/yunbao/common/utils/PluginManager.java @@ -18,6 +18,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Field; import java.util.Arrays; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -104,6 +105,13 @@ public class PluginManager { File plugins = new File(outDir + File.separator + "lib" + File.separator + abi); loadSo(plugins, "libfuai"); loadSo(plugins, "libCNamaSDK"); + try { + Field field = Class.forName("com.faceunity.wrapper.faceunity$LoadConfig").getDeclaredField("sLoadedLibrary"); + field.setAccessible(true); + field.set(null,true); + }catch (Exception e){ + e.printStackTrace(); + } } /** diff --git a/lib_country_code/src/main/assets/code.json b/lib_country_code/src/main/assets/code.json index 150846b69..753f172c0 100644 --- a/lib_country_code/src/main/assets/code.json +++ b/lib_country_code/src/main/assets/code.json @@ -723,7 +723,7 @@ }, { "code": 223, - "tw": "馬里", + "tw": "馬裏", "en": "Mali", "locale": "ML", "zh": "马里"