diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BeautySkinViewHolder.java b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BeautySkinViewHolder.java index c8a73e0ae..899640402 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BeautySkinViewHolder.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BeautySkinViewHolder.java @@ -89,5 +89,6 @@ public class BeautySkinViewHolder extends BaseViewHolder{ for (BaseBean bean : list) { adapter.del(getName(this)+bean.getKey()); } + adapter.notifyDataSetChanged(); } } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 760cf0cc1..dd39927a5 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -84,7 +84,6 @@ 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.faceunity.ui.FaceUnityView; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveAnchorActivity; @@ -294,7 +293,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private RoundedImageView msgUserIcon; //悬浮窗icon private FullServiceNotificationView fullScreen;//全副喇叭 private NobleNoticeView noble;//全副喇叭 - private FaceUnityView faceUnityView; private FaceManager manager; public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) { @@ -688,7 +686,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis lt_trickery.setOnClickListener(this); dialog = new Dialog(mContext, R.style.dialog); - faceUnityView = (FaceUnityView) findViewById(R.id.faceunity_control); if (!SpUtil.getInstance().getBooleanValue("private_chat_message_switch")) { msgLayout.setVisibility(View.GONE); @@ -968,7 +965,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis reloadIM(); } - public void hideFloatMsg(){ + public void hideFloatMsg() { msgLayout.setVisibility(View.GONE); } @@ -2278,57 +2275,57 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis switch (bean.getNobilityid()) { case "1": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.BARON) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; case "2": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.VISCOUNT) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; case "3": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.MARQUIS) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; case "4": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.DUKE) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; case "5": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.KING) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; case "6": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.EMPEROR) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; case "7": noble.setRootView(bean.getUhead(), - bean.getUname(), - bean.getAncherName(), - bean.getRoomnum()) + bean.getUname(), + bean.getAncherName(), + bean.getRoomnum()) .setRoleType(NobleNoticeView.RoleType.BETTER_EMPEROR) .setCallBack(() -> gotoLive(bean.getRoomnum())); break; @@ -2607,7 +2604,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) { @@ -2621,11 +2618,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis /** * 切换美颜UI */ - public void changeFaceUnityView(){ - // faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE); - LiveFaceUnityDialogFragment fragment=new LiveFaceUnityDialogFragment(mContext); + public void changeFaceUnityView() { + // faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE); + LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext); fragment.setManager(manager); - fragment.show(((LiveActivity)mContext).getSupportFragmentManager(),"faceUi"); + fragment.show(((LiveActivity) mContext).getSupportFragmentManager(), "faceUi"); } private static class LiveRoomHandler extends Handler {