删除老PDlive 图片

2、更换是否有免费礼物判断字段
3、获取举报主播名称接口更换

FaceUnity/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'img-optimizer'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
+apply plugin: 'kotlin-parcelize'
+apply from: "../package_config.gradle"
 
 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"
@@ -34,6 +34,7 @@ android {
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
+//            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
         }
     }
     aaptOptions {
@@ -48,8 +49,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {
@@ -58,15 +59,15 @@ repositories {
     }
 }
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies["appcompat-androidx"]
-    implementation rootProject.ext.dependencies["recyclerview-androidx"]
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api rootProject.ext.dependencies["appcompat-androidx"]
+    api rootProject.ext.dependencies["recyclerview-androidx"]
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //common
-    implementation project(path: ':common')
+    api project(path: ':common')
 
-    implementation 'com.faceunity:core:8.3.1'
-    implementation 'com.faceunity:model:8.3.1'
+    api 'com.faceunity:core:8.7.0'
+    api 'com.faceunity:model:8.7.0'
     //implementation 'com.faceunity:nama:8.3.1' //底层库-标准版
 
 

FaceUnity/src/androidTest/java/com/yunbao/faceunity/ExampleInstrumentedTest.java

@@ -2,7 +2,7 @@ package com.yunbao.faceunity;
 
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.platform.app.Instrimport com.yunbao.common.utils.MobclickAgent;ntationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;

FaceUnity/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.yunbao.faceunity"
-    >
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />

FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java

@@ -38,9 +38,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
-import cn.rongcloud.rtc.api.RCRTCEngine;
-import cn.rongcloud.rtc.api.callback.IRCRTCVideoOutputFrameListener;
-import cn.rongcloud.rtc.base.RCRTCVideoFrame;
 
 /**
  * 美颜模块管理类
@@ -96,11 +93,17 @@ public class FaceManager implements SensorEventListener {
         faceUnityView.setIFaceUnityInter(new FaceUnityView.IFaceUnityInter() {
             @Override
             public void onPause() {
+                if(onMirrorChanged!=null){
+                    onMirrorChanged.onChange(false);
+                }
                 pauseFace = true;
             }
 
             @Override
             public void onStart() {
+                if(onMirrorChanged!=null){
+                    onMirrorChanged.onChange(true);
+                }
                 pauseFace = false;
             }
         });
@@ -172,44 +175,6 @@ public class FaceManager implements SensorEventListener {
     private static final int CAMERA_SWITCH_SKIP_FRAME = 0;
     private volatile boolean mSkip;
 
-    /**
-     * 渲染融云视频帧
-     */
-    public void drawRongFrame(Context context) {
-        RCRTCEngine.getInstance().getDefaultVideoStream().setVideoFrameListener(new IRCRTCVideoOutputFrameListener() {
-            @Override
-            public RCRTCVideoFrame processVideoFrame(RCRTCVideoFrame callVideoFrame) {
-                //Log.i(TAG, "processVideoFrame: egl context " + EGL14.eglGetCurrentContext());
-                if (pauseFace) {
-                    return callVideoFrame;
-                }
-                int width = callVideoFrame.getWidth();
-                int height = callVideoFrame.getHeight();
-
-                if (mIsFirstFrame) {
-                    mIsFirstFrame = false;
-                    //initCsvUtil(context);
-                    mFURenderer.prepareRenderer(mFURendererListener);
-                }
-                //long start = System.nanoTime();
-                mFURenderer.setInputOrientation(callVideoFrame.getRotation());
-                FURenderOutputData data = mFURenderer.onDrawFrameInputWithReturn(callVideoFrame.getData(), width, height);
-               /* long time = System.nanoTime() - start;
-                if (mCSVUtils != null) {
-                    mCSVUtils.writeCsv(null, time);
-                }*/
-                if (mSkippedFrames > 0 || mSkip) {
-                    --mSkippedFrames;
-                    return callVideoFrame;
-                }
-                if (data != null && data.getImage() != null && data.getImage().getBuffer() != null) {
-                    callVideoFrame.setData(data.getImage().getBuffer());
-                }
-                return callVideoFrame;
-            }
-        });
-
-    }
 
     /**
      * 记录渲染工具，调试用，在processVideoFrame里使用
@@ -272,12 +237,6 @@ public class FaceManager implements SensorEventListener {
     }
 
 
-    /**
-     * 离开渲染界面时注销融云监听器，不然会绿屏
-     */
-    public void onClose() {
-        RCRTCEngine.getInstance().getDefaultVideoStream().setVideoFrameListener(null);
-    }
 
     /**
      * 释放资源
@@ -295,7 +254,18 @@ public class FaceManager implements SensorEventListener {
 
     }
 
+    OnMirrorChanged onMirrorChanged;
+
+    public void setOnMirrorChanged(OnMirrorChanged onMirrorChanged) {
+        this.onMirrorChanged = onMirrorChanged;
+    }
+
     public interface FaceStatusChanged {
         void onFaceChanged(int num);
     }
+
+
+    public interface OnMirrorChanged{
+        void onChange(boolean falg);
+    }
 }

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java

@@ -52,10 +52,10 @@ public class FURenderer extends IFURenderer {
 
 
     /* 特效FURenderKit*/
-    private FURenderKit mFURenderKit;
+    public FURenderKit mFURenderKit;
 
     /* AI道具*/
-    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
+    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor.bundle";
     public static  String BUNDLE_AI_HUMAN = "model" + File.separator + "ai_human_processor.bundle";
 
     /* GL 线程 ID */

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FaceUnityConfig.java

@@ -15,7 +15,7 @@ public class FaceUnityConfig {
 
     /************************** 算法Model  ******************************/
     // 人脸识别
-    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
+    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor.bundle";
     // 手势
     public static String BUNDLE_AI_HAND = "model" + File.separator + "ai_hand_processor.bundle";
 

FaceUnity/src/main/java/com/yunbao/faceunity/utils/net/StickerDownloadHelper.java

@@ -13,7 +13,7 @@ import com.google.gson.JsonObject;
 import com.yunbao.faceunity.entity.net.FineStickerEntity;
 import com.yunbao.faceunity.utils.FaceUnityData;
 import com.yunbao.faceunity.utils.FileUtils;
-import com.yunbao.faceunity.utils.ZipUtils;
+import com.yunbao.common.utils.ZipUtils;
 
 import java.io.File;
 import java.util.ArrayList;