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

恢复momo美颜

Browse Source 
调整进场svga动画填充类型
This commit is contained in:
zlzw
2022-09-26 17:18:07 +08:00
parent 59256c9cf7
commit ec730e850a
210 changed files with 114 additions and 9739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@@ -1,5 +1,16 @@
package com.yunbao.live.activity;
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_DISABLE;
import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_ENABLE;
import static com.yunbao.common.Constants.SOCKET_LIVE_DRPK;
import static com.yunbao.live.views.AbsRyLivePushViewHolder.mPreView;
import static com.yunbao.live.views.LivePushRyViewHolder.dr_pk_view;
import static com.yunbao.live.views.LivePushRyViewHolder.rtcRoom;
import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_dr_pk_nub;
import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk;
import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk_view;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
@@ -47,13 +58,10 @@ import com.yunbao.live.bean.LiveKsyConfigBean;
import com.yunbao.live.bean.LiveReceiveGiftBean;
import com.yunbao.live.bean.WishlistModel;
import com.yunbao.live.dialog.LiveBeautyDialogFragment;
import com.yunbao.live.dialog.LiveFaceUnityDialogFragment;
import com.yunbao.live.dialog.LiveFunctionDialogFragment;
import com.yunbao.live.dialog.LiveLinkMicListDialogFragment;
import com.yunbao.live.dialog.LiveMicUserDialogFragment;
import com.yunbao.live.dialog.LiveNewFunctionDialogFragment;
import com.yunbao.live.dialog.LiveNewWishListDialogFragment;
import com.yunbao.live.dialog.LiveWishListDialogFragment;
import com.yunbao.live.event.LinkMicTxMixStreamEvent;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
@@ -67,7 +75,6 @@ import com.yunbao.live.presenter.LiveRyLinkMicPkPresenter;
import com.yunbao.live.socket.SocketRyChatUtil;
import com.yunbao.live.socket.SocketRyClient;
import com.yunbao.live.socket.SocketSendBean;
import com.yunbao.live.views.AbsRyLivePushViewHolder;
import com.yunbao.live.views.LiveEndViewHolder;
import com.yunbao.live.views.LiveMusicViewHolder;
import com.yunbao.live.views.LiveNewReadyRyViewHolder;
@@ -91,17 +98,6 @@ import io.rong.imlib.model.Message;
import io.rong.message.TextMessage;
import pl.droidsonroids.gif.GifImageView;
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_DISABLE;
import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_ENABLE;
import static com.yunbao.common.Constants.SOCKET_LIVE_DRPK;
import static com.yunbao.live.views.AbsRyLivePushViewHolder.mPreView;
import static com.yunbao.live.views.LivePushRyViewHolder.dr_pk_view;
import static com.yunbao.live.views.LivePushRyViewHolder.rtcRoom;
import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_dr_pk_nub;
import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk;
import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk_view;
/**
@@ -474,12 +470,12 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
if (mLiveReadyViewHolder != null) {
mLiveReadyViewHolder.hide();
}
if(mLiveRoomViewHolder!=null){
/* if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.changeFaceUnityView();
}
/* LiveBeautyDialogFragment fragment = new LiveBeautyDialogFragment();
}*/
LiveBeautyDialogFragment fragment = new LiveBeautyDialogFragment();
fragment.setiBeautyModule(BeautyManager.iBeautyModule, BeautyManager.iLookupModule, BeautyManager.iBeautyBodyModule);
fragment.show(getSupportFragmentManager(), "LiveBeautyDialogFragment");*/
fragment.show(getSupportFragmentManager(), "LiveBeautyDialogFragment");
}
/**

15
live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java
View File

@@ -76,12 +76,15 @@ public class LiveReadyClassAdapter extends RecyclerView.Adapter<LiveReadyClassAd
mName = itemView.findViewById(R.id.name);
mDes = itemView.findViewById(R.id.des);
mRadioButton = itemView.findViewById(R.id.radioButton);
itemView.setOnClickListener(view -> {
Object tag = view.getTag();
if (tag != null && mOnItemClickListener != null) {
mOnItemClickListener.onItemClick((LiveClassBean) tag, 0);
}
});
itemView.setOnClickListener(view -> click());
mRadioButton.setOnClickListener(v -> click());
}
void click() {
Object tag = itemView.getTag();
if (tag != null && mOnItemClickListener != null) {
mOnItemClickListener.onItemClick((LiveClassBean) tag, 0);
}
}
void setData(LiveClassBean bean) {

20
live/src/main/java/com/yunbao/live/dialog/LiveFaceUnityDialogFragment.java
View File

@@ -12,14 +12,15 @@ import android.view.WindowManager;
import androidx.annotation.Nullable;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.faceunity.FaceManager;
import com.yunbao.faceunity.ui.FaceUnityView;
import com.yunbao.live.R;
/**
* 新娱美颜SDK，暂时不用，不要删除
*/
public class LiveFaceUnityDialogFragment extends AbsDialogFragment {
private Context mContext;
private FaceUnityView faceView;
private FaceManager manager;
// private FaceUnityView faceView;
// private FaceManager manager;
private View mRootView;
public LiveFaceUnityDialogFragment(Context mContext) {
@@ -33,8 +34,9 @@ public class LiveFaceUnityDialogFragment extends AbsDialogFragment {
@Override
protected View getLayoutView() {
faceView = new FaceUnityView(mContext);
return faceView;
// faceView = new FaceUnityView(mContext);
// return faceView;
return null;
}
@Override
@@ -61,7 +63,7 @@ public class LiveFaceUnityDialogFragment extends AbsDialogFragment {
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
manager.setFaceUnityView(faceView);
// manager.setFaceUnityView(faceView);
}
@Override
@@ -72,9 +74,9 @@ public class LiveFaceUnityDialogFragment extends AbsDialogFragment {
}
}
public void setManager(FaceManager manager) {
/* public void setManager(FaceManager manager) {
this.manager = manager;
}
}*/
public void setDismissShowUi(View mRootView) {

25
live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java
View File

@@ -33,8 +33,8 @@ import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.faceunity.FaceManager;
import com.yunbao.live.R;
import com.yunbao.live.activity.Beauty360Activity3;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.bean.LiveRoomTypeBean;
@@ -70,7 +70,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
private boolean mOpenLocation = true;
private int mLiveSdk;
private LiveClassBean classBean;
private FaceManager manager;
// private FaceManager manager;
private TextView faceTextView;//提示人脸未检测到的TextView
public LiveNewReadyRyViewHolder(Context context, ViewGroup parentView, int liveSdk) {
@@ -190,7 +190,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
}
}
};
manager = new FaceManager();
/* manager = new FaceManager();
manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() {
final Handler handler = new Handler(Looper.getMainLooper());
@@ -204,9 +204,10 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
}
});
}
});
manager.initFURender(mContext);
manager.drawRongFrame(mContext);
});*/
//新美颜
//manager.initFURender(mContext);
//manager.drawRongFrame(mContext);
}
@@ -226,7 +227,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
} else if (i == R.id.btn_live_class) {
chooseLiveClass();
} else if (i == R.id.btn_beauty) {
setFaceUnity();
beauty();//momo美颜
//setFaceUnity(); //新娱美颜
} else if (i == R.id.btn_wishlist) {
//点击心愿单
openWishListWindow();
@@ -243,9 +245,12 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
}
}
/**
* 新娱美颜
*/
public void setFaceUnity() {
LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext);
fragment.setManager(manager);
// fragment.setManager(manager);
fragment.setDismissShowUi(mRootView);
if (mContext instanceof LiveRyAnchorActivity) {
fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "FaceUnity");
@@ -359,8 +364,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
*/
private void beauty() {
((LiveRyAnchorActivity) mContext).beauty();
// Intent intent = new Intent(mContext, Beauty360Activity3.class);
// mContext.startActivity(intent);
// Intent intent = new Intent(mContext, Beauty360Activity3.class);
// mContext.startActivity(intent);
}

4
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@@ -532,7 +532,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
//美颜
new Handler(Looper.getMainLooper()).post(new Runnable() {
public void run() {
/* //旧美颜不需要了
//旧美颜不需要了
RCRTCEngine.getInstance().getDefaultVideoStream().setVideoFrameListener(new IRCRTCVideoOutputFrameListener() {
@Override
public RCRTCVideoFrame processVideoFrame(RCRTCVideoFrame rtcVideoFrame) {
@@ -541,7 +541,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
return rtcVideoFrame;
}
});
*/
}
});
}

9
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -84,7 +84,6 @@ import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.common.views.weight.FullServiceNotificationView;
import com.yunbao.common.views.weight.NobleNoticeView;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.faceunity.FaceManager;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveAnchorActivity;
@@ -295,7 +294,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private RoundedImageView msgUserIcon; //悬浮窗icon
private FullServiceNotificationView fullScreen;//全副喇叭
private NobleNoticeView noble;//全副喇叭
private FaceManager manager;
//private FaceManager manager;
public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) {
super(context, parentView);
@@ -2608,7 +2607,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
* 启动美颜SDK
*/
public void startFace() {
manager = new FaceManager();
/* manager = new FaceManager();
manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() {
@Override
public void onFaceChanged(int num) {
@@ -2616,7 +2615,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
});
manager.initFURender(mContext);
manager.drawRongFrame(mContext);
manager.drawRongFrame(mContext);*/
}
/**
@@ -2625,7 +2624,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void changeFaceUnityView() {
// faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext);
fragment.setManager(manager);
// fragment.setManager(manager);
fragment.show(((LiveActivity) mContext).getSupportFragmentManager(), "faceUi");
}