From ce2048b9a599b32b58d62d0212bd28e3f9c4d25a Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Thu, 30 Mar 2023 11:23:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A5=B3=E7=A5=9E=E8=AF=B4=E4=B8=BB?= =?UTF-8?q?=E6=92=AD=E7=AB=AF=E6=98=BE=E7=A4=BA=20update=20=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E6=96=B9=E5=BC=8F=E6=94=B9=E6=88=90svga=20update=20PK?= =?UTF-8?q?=E6=97=B6=E9=9A=90=E8=97=8F=E5=A5=B3=E7=A5=9E=E8=AF=B4=E5=92=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/assets/ic_live_anchor_call_me.svga | Bin 0 -> 43989 bytes .../yunbao/live/activity/LiveActivity.java | 2 +- .../live/activity/LiveAnchorActivity.java | 2 + .../live/activity/LiveRyAnchorActivity.java | 3 +- .../dialog/LiveAnchorEditCallMeDialog.java | 4 ++ .../live/dialog/LiveAnchorSayPopDialog.java | 7 ++- .../dialog/LiveNewFunctionDialogFragment.java | 5 +- .../yunbao/live/views/LiveRoomViewHolder.java | 48 ++++++++++----- .../live/views/PortraitLiveManager.java | 5 ++ .../live/views/TopBannerCustomViewHolder.java | 56 ++++++++++++++++++ .../main/res/drawable/bg_live_top_banner.xml | 9 +++ .../res/drawable/bg_live_top_banner_text.xml | 14 +++++ .../src/main/res/layout/dialog_anchor_say.xml | 2 +- .../res/layout/sim_live_room_anchor_say.xml | 6 +- live/src/main/res/layout/view_live_room.xml | 2 +- .../layout/view_live_top_banner_call_me.xml | 46 ++++++++++++++ live/src/main/res/values/strings.xml | 1 + 17 files changed, 186 insertions(+), 26 deletions(-) create mode 100644 live/src/main/assets/ic_live_anchor_call_me.svga create mode 100644 live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java create mode 100644 live/src/main/res/drawable/bg_live_top_banner.xml create mode 100644 live/src/main/res/drawable/bg_live_top_banner_text.xml create mode 100644 live/src/main/res/layout/view_live_top_banner_call_me.xml diff --git a/live/src/main/assets/ic_live_anchor_call_me.svga b/live/src/main/assets/ic_live_anchor_call_me.svga new file mode 100644 index 0000000000000000000000000000000000000000..ba388de6d6a9381dd330a6892caf2f239ba6d79b GIT binary patch literal 43989 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 literal 0 HcmV?d00001 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java index 1361344f5..533e60088 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java @@ -109,7 +109,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL public String anyway; public ViewGroup mContainer; protected ViewGroup mPageContainer; - protected LiveRoomViewHolder mLiveRoomViewHolder; + public LiveRoomViewHolder mLiveRoomViewHolder; protected AbsLiveViewHolder mLiveBottomViewHolder; protected LiveAddImpressViewHolder mLiveAddImpressViewHolder; protected LiveContributeViewHolder mLiveContributeViewHolder; diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java index 92e5187d1..788d257ce 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java @@ -483,6 +483,8 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic } mLiveRoomViewHolder.initHourRankList(); mLiveRoomViewHolder.startAnchorLight(); + //初始化女神说 + mLiveRoomViewHolder.initAnchorSay(); } if (mLiveAnchorViewHolder == null) { mLiveAnchorViewHolder = new LiveAnchorViewHolder(mContext, mContainer); diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index 1833f177a..3d17a4414 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -780,7 +780,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveRoomViewHolder.initHourRankList(); } mLiveRoomViewHolder.startAnchorLight(); - + //初始化女神说 + mLiveRoomViewHolder.initAnchorSay(); } if (mLiveAnchorViewHolder == null) { mLiveAnchorViewHolder = new LiveRyAnchorViewHolder(mContext, mContainer); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java index 01ed583ec..c78ad3c1e 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java @@ -114,6 +114,10 @@ public class LiveAnchorEditCallMeDialog extends AbsDialogPopupWindow { }); status.setTag(0); status.setOnClickListener(v -> { + if(callMeModel.getGiftId()==0){ + ToastUtil.show(R.string.live_anchor_edit_call_me_not_gift_toash); + return; + } int tag = (int) v.getTag(); if (tag == 0) { status.setImageResource(R.mipmap.special_icon_on); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java index 7ee0fe1b9..67006691c 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java @@ -122,12 +122,13 @@ public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow { public void onTextChanged(CharSequence s, int start, int before, int count) { sayModel.getLivePreview().setContent(s.toString()); StringBuilder sb = new StringBuilder(); - int n = (s.length() + 3) / 4; + int len=6; + int n = (s.length() + 3) / len; for (int i = 0; i < n; i++) { if (i < (n - 1)) { - sb.append(s.toString().substring(i * 4, (i + 1) * 4)).append("\n"); + sb.append(s.toString().substring(i * len, (i + 1) * len)).append("\n"); } else { - sb.append(s.toString().substring(i * 4)); + sb.append(s.toString().substring(i * len)); } } if (sb.length() == 0) { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java index f655da606..12a8fd209 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java @@ -25,7 +25,9 @@ import android.widget.TextView; import com.lxj.xpopup.XPopup; import com.yunbao.common.Constants; +import com.yunbao.common.bean.LiveAnchorSayModel; import com.yunbao.common.dialog.AbsDialogFragment; +import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.LiveAnchorMessageCustomPopup; @@ -195,7 +197,8 @@ public class LiveNewFunctionDialogFragment extends AbsDialogFragment implements } else if (id == R.id.live_tool_call_me) { new LiveAnchorEditCallMeDialog(mContext).setLiveUid(liveUid).showDialog(); } else if (id == R.id.live_tool_anchor_say) { - new LiveAnchorSayPopDialog(mContext).setLiveUid(liveUid).showDialog(); + new LiveAnchorSayPopDialog(mContext).setLiveUid(liveUid).setOnItemClickListener((bean, position) + -> mLiveRoomHandler.postDelayed(()-> ((LiveRyAnchorActivity)(mContext)).mLiveRoomViewHolder.initAnchorSayData(),1000)).showDialog(); } } 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 9f1122571..5a049048a 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -6,7 +6,6 @@ import static com.yunbao.live.views.LivePushRyViewHolder.btn_close; import android.app.Activity; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.graphics.Outline; import android.os.Bundle; import android.os.CountDownTimer; @@ -4259,15 +4258,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis LiveAnchorSayModel sayModel; - public void initAnchorSay() { - if (mAnchorSay.getTag() != null) { - mAnchorSay.setX((float) mAnchorSayImage.getTag()); - mAnchorSayImage.setTag(null); - mAnchorSayImage.setVisibility(View.VISIBLE); - mAnchorSayText.setVisibility(View.VISIBLE); - mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show); - } - mAnchorSay.setTag(null); + public void initAnchorSayData() { LiveNetManager.get(mContext) .getLivePreviewInfo(mLiveUid, new com.yunbao.common.http.base.HttpCallback() { @Override @@ -4291,7 +4282,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public String getText(String content) { - int t = 4; + int t = 6; float len = (float) content.length() / t; StringBuilder sb = new StringBuilder(); sb.append("\n"); @@ -4307,20 +4298,46 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }); } - private static final int TOP_BANNER_TYPE_CALL_ME = 100;//联系方式 + public void initAnchorSay() { + if (mAnchorSay.getTag() != null) { + mAnchorSay.setX((float) mAnchorSayImage.getTag()); + mAnchorSayImage.setTag(null); + mAnchorSayImage.setVisibility(View.VISIBLE); + mAnchorSayText.setVisibility(View.VISIBLE); + mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show); + } + mAnchorSay.setTag(null); + initAnchorSayData(); + } + public void hideAnchorSayAndCallAnchor(){ + mAnchorSay.setX((float) mAnchorSayImage.getTag()); + mAnchorSayImage.setTag(null); + mAnchorSayImage.setVisibility(View.VISIBLE); + mAnchorSayText.setVisibility(View.VISIBLE); + mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show); + topBanner1.setVisibility(View.GONE); + } + public void showAnchorSayAndCallAnchor(){ + mAnchorSayImage.setTag(mAnchorSay.getX()); + mAnchorSay.setX(-DpUtil.dp2px(45)); + mAnchorSayImage.setVisibility(View.INVISIBLE); + mAnchorSayText.setVisibility(View.INVISIBLE); + mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_hide); + topBanner1.setVisibility(View.VISIBLE); + } public void initTopBanner() { checkNewLetter(); mTopBannerList = new ArrayList<>(); topBanner1.setVisibility(View.GONE); topBanner1.setAutoPlay(true) - .setPages(mTopBannerList, new Banner4CustomViewHolder()) + .setPages(mTopBannerList, new TopBannerCustomViewHolder()) .setDelayTime(3000) .setBannerStyle(BannerConfig.NOT_INDICATOR) .setOnBannerClickListener(new OnBannerClickListener() { @Override public void onBannerClick(List datas, int position) { - if (mTopBannerList.get(position).getType() == TOP_BANNER_TYPE_CALL_ME) { + if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) { Dialog loading = DialogUitl.loadingDialog(mContext); loading.show(); LiveGiftDialogFragment fragment = new LiveGiftDialogFragment(); @@ -4348,9 +4365,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (data.getIsShow() == 1) { topBanner1.setVisibility(View.VISIBLE); BannerBean call = new BannerBean(); - call.setIconRes(R.mipmap.ic_live_float_call_me); call.setActivityId(data.getGiftId()); - call.setType(TOP_BANNER_TYPE_CALL_ME); + call.setType(TopBannerCustomViewHolder.TYPE_CALL_ANCHOR); mTopBannerList.add(0, call); topBanner1.update(mTopBannerList); } diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 23c6dc4fe..56a3862b0 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1328,6 +1328,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe public void setPkStatus(boolean isPk) { if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.hotAddVisibility(isPk); + if (isPk) { + mLiveRoomViewHolder.hideAnchorSayAndCallAnchor(); + } else { + mLiveRoomViewHolder.showAnchorSayAndCallAnchor(); + } } } diff --git a/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java b/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java new file mode 100644 index 000000000..a9edba0e6 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java @@ -0,0 +1,56 @@ +package com.yunbao.live.views; + +import android.content.Context; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; + +import com.ms.banner.holder.BannerViewHolder; +import com.opensource.svgaplayer.SVGADrawable; +import com.opensource.svgaplayer.SVGAImageView; +import com.opensource.svgaplayer.SVGAParser; +import com.opensource.svgaplayer.SVGAVideoEntity; +import com.yunbao.common.bean.BannerBean; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.SVGAViewUtils; +import com.yunbao.live.R; + +public class TopBannerCustomViewHolder implements BannerViewHolder { + public static final int TYPE_CALL_ANCHOR = 0;//联系主播 + public static final int TYPE_IMAGE = 1; + + @Override + public View createView(Context context, int position, BannerBean data) { + View view = null; + if (data.getType() == TYPE_IMAGE) { + ImageView icon = new ImageView(context); + if (data.getIconRes() != 0) { + ImgLoader.display(context, data.getIconRes(), icon); + } else { + ImgLoader.display(context, data.getImageUrl(), icon); + } + view = icon; + } else { + view = LayoutInflater.from(context).inflate(R.layout.view_live_top_banner_call_me, null); + SVGAImageView svga = view.findViewById(R.id.svga); + new SVGAParser(context).decodeFromAssets("ic_live_anchor_call_me.svga", new SVGAParser.ParseCompletion() { + @Override + public void onComplete(SVGAVideoEntity videoItem) { + SVGADrawable drawable = new SVGADrawable(videoItem); + svga.setImageDrawable(drawable); + svga.setTag("svga"); + SVGAViewUtils.playEndClear(svga, false); + svga.setClearsAfterStop(false); + } + + @Override + public void onError() { + Log.e("errqs", "errl"); + } + }, null); + } + + return view; + } +} diff --git a/live/src/main/res/drawable/bg_live_top_banner.xml b/live/src/main/res/drawable/bg_live_top_banner.xml new file mode 100644 index 000000000..bf21e74a3 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_top_banner.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_top_banner_text.xml b/live/src/main/res/drawable/bg_live_top_banner_text.xml new file mode 100644 index 000000000..1589f8921 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_top_banner_text.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_anchor_say.xml b/live/src/main/res/layout/dialog_anchor_say.xml index 94ebe87a1..520668864 100644 --- a/live/src/main/res/layout/dialog_anchor_say.xml +++ b/live/src/main/res/layout/dialog_anchor_say.xml @@ -8,7 +8,7 @@ + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index d8b84b36b..9bde8b6fe 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -74,6 +74,7 @@ 選擇禮物 未填寫 请填写联系方式后再启用 + 未選擇禮物 信內容 我能想到最浪漫的事,就是和你一起慢慢變老,一路上收藏點點滴滴的歡笑,留到以後坐著搖椅慢慢聊。 聯繫方式