Merge branch 'dev_20221020'

2022-10-22 14:48:25 +08:00
parent 90e249e2d7 3dd9f3f551
commit be0f81e059
907 changed files with 1663 additions and 1402 deletions
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -40,6 +40,7 @@ import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.faceunity.FaceManager;
 import com.yunbao.live.socket.SocketRyClient;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.live.views.PortraitLiveManager;
@@ -256,7 +257,7 @@ public class AppContext extends CommonAppContext {
        });
        configSPApp();
        //初始化美颜SDK
-        //   FaceManager.initFaceUnity(this);
+           FaceManager.initFaceUnity(this);
    }

    /**