完成美颜UI 90%

live/src/main/java/com/yunbao/live/dialog/LiveFaceUnityDialogFragment.java

@@ -0,0 +1,74 @@
+package com.yunbao.live.dialog;
+
+import android.app.ActionBar;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+
+import com.yunbao.common.dialog.AbsDialogFragment;
+import com.yunbao.common.utils.DpUtil;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.faceunity.FaceManager;
+import com.yunbao.faceunity.ui.FaceUnityView;
+import com.yunbao.live.R;
+
+public class LiveFaceUnityDialogFragment extends AbsDialogFragment {
+    private Context mContext;
+    private FaceUnityView faceView;
+    private FaceManager manager;
+
+    public LiveFaceUnityDialogFragment(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return 0;
+    }
+
+    @Override
+    protected View getLayoutView() {
+        faceView = new FaceUnityView(mContext);
+        return faceView;
+    }
+
+    @Override
+    protected int getDialogStyle() {
+        return R.style.dialog4;
+    }
+
+    @Override
+    protected boolean canCancel() {
+        return false;
+    }
+
+    @Override
+    protected void setWindowAttributes(Window window) {
+
+        WindowManager.LayoutParams params = window.getAttributes();
+        params.width = ActionBar.LayoutParams.MATCH_PARENT;
+        params.height =  ActionBar.LayoutParams.WRAP_CONTENT;
+        params.gravity = Gravity.BOTTOM;
+        window.setAttributes(params);
+
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        manager.bindControlView(faceView);
+    }
+
+    public void setManager(FaceManager manager) {
+        this.manager = manager;
+    }
+
+
+}

live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java

@@ -1,5 +1,6 @@
 package com.yunbao.live.views;
 
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -37,6 +38,7 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.bean.LiveRoomTypeBean;
+import com.yunbao.live.dialog.LiveFaceUnityDialogFragment;
 import com.yunbao.live.dialog.LiveNewRoomClassDialogFragment;
 import com.yunbao.live.dialog.LiveNewRoomTypeDialogFragment;
 import com.yunbao.live.dialog.LiveNewWishListDialogFragment;
@@ -68,7 +70,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
     private boolean mOpenLocation = true;
     private int mLiveSdk;
     private LiveClassBean classBean;
-    private FaceUnityView faceUnityView;
+    private FaceManager manager;
 
     public LiveNewReadyRyViewHolder(Context context, ViewGroup parentView, int liveSdk) {
         super(context, parentView, liveSdk);
@@ -119,7 +121,6 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
         mLiveTypeTextView = (TextView) findViewById(R.id.text_room_type);
         mLiveWishListTextView = (TextView) findViewById(R.id.text_wishlist);
         mImageUtil = ((LiveActivity) mContext).getProcessImageUtil();
-        faceUnityView = (FaceUnityView) findViewById(R.id.faceunity_control);
         mImageUtil.setImageResultCallback(new ImageResultCallback() {
 
             @Override
@@ -187,11 +188,10 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
             }
         };
         manager = new FaceManager();
-        manager.initFURender(mContext, faceUnityView);
+        manager.initFURender(mContext);
         manager.drawRongFrame(mContext);
     }
 
-    FaceManager manager;
 
     @Override
     public void onClick(View v) {
@@ -227,7 +227,11 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
     }
 
     public void setFaceUnity() {
-        faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+        LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext);
+        fragment.setManager(manager);
+        if (mContext instanceof LiveRyAnchorActivity) {
+            fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "FaceUnity");
+        }
     }
 
     /**
@@ -503,6 +507,5 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
     @Override
     public void onDestroy() {
         LiveHttpUtil.cancel(LiveHttpConsts.CREATE_ROOM);
-        manager.onClose();
     }
 }

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -2541,7 +2541,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      */
     public void startFace() {
         manager=new FaceManager();
-        manager.initFURender(mContext,faceUnityView);
+        manager.initFURender(mContext);
         manager.drawRongFrame(mContext);
     }
 

live/src/main/res/layout/view_new_live_ready.xml

@@ -249,16 +249,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-
-    <com.yunbao.faceunity.ui.FaceUnityView
-        android:id="@+id/faceunity_control"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="120dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent" />
+    
 </androidx.constraintlayout.widget.ConstraintLayout>