diff --git a/common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java b/common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java index c4580cd8b..af2d07894 100644 --- a/common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java +++ b/common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java @@ -13,6 +13,7 @@ public class AllServerNotifyEvent extends BaseModel { //礼物名称 @SerializedName("giftname") private String giftName; + //盲盒名称 @SerializedName("box_type_name") private String boxTypeName; diff --git a/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java b/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java index f39d62344..9c99fab9b 100644 --- a/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java +++ b/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java @@ -91,6 +91,8 @@ public class SendBlindGiftEvent extends BaseModel { private Object dressId; @SerializedName("dress_name") private String dressName; + @SerializedName("dress_nameen") + private String dress_nameen; @SerializedName("display_src") private Object displaySrc; @SerializedName("effect_src") @@ -101,6 +103,8 @@ public class SendBlindGiftEvent extends BaseModel { private Object nobleDress; @SerializedName("dress_msg") private String dressMsg; + @SerializedName("dress_msg_en") + private String dressMsgEN; @SerializedName("dress_colour") private String dressColour; @SerializedName("dress_threshold_value") @@ -139,6 +143,15 @@ public class SendBlindGiftEvent extends BaseModel { return this; } + public String getDress_nameen() { + return dress_nameen; + } + + public SendBlindGiftEvent setDress_nameen(String dress_nameen) { + this.dress_nameen = dress_nameen; + return this; + } + public String getUid() { return uid; } @@ -545,6 +558,15 @@ public class SendBlindGiftEvent extends BaseModel { return this; } + public String getDressMsgEN() { + return dressMsgEN; + } + + public SendBlindGiftEvent setDressMsgEN(String dressMsgEN) { + this.dressMsgEN = dressMsgEN; + return this; + } + public String getDressColour() { return dressColour; } 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 62f2558c6..ae7caa662 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -57,6 +57,8 @@ import com.yunbao.common.http.CommonHttpConsts; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpClient; +import com.yunbao.common.http.LiveHttpConsts; +import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMRTCManager; @@ -87,8 +89,6 @@ import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience; import com.yunbao.live.dialog.RandomPkDialogFragment; import com.yunbao.live.event.LinkMicTxMixStreamEvent; import com.yunbao.live.event.LiveAudienceEvent; -import com.yunbao.common.http.LiveHttpConsts; -import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.live.interfaces.LiveFunctionClickListener; import com.yunbao.live.interfaces.LivePushListener; import com.yunbao.live.music.LiveMusicDialogFragment; @@ -379,7 +379,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl if (isDRPK != 1) { openMicWindow(1); } else { - ToastUtil.show(WordUtil.isNewZh()?"您已在PK中":"You are already in the PK"); + ToastUtil.show(WordUtil.isNewZh() ? "您已在PK中" : "You are already in the PK"); } break; case Constants.LIVE_FUNC_DR://多人PK @@ -460,7 +460,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl } }); } else { - ToastUtil.show(WordUtil.isNewZh()?"您已在PK中":"You are already in the PK"); + ToastUtil.show(WordUtil.isNewZh() ? "您已在PK中" : "You are already in the PK"); } break; case Constants.LIVE_FUNC_BEAUTY://美颜 @@ -489,14 +489,14 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl break; case Constants.LIVE_FUNC_WKS: String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; - ZhuangBanActivity.forward(mContext, url, false,0); + ZhuangBanActivity.forward(mContext, url, false, 0); break; case Constants.LIVE_FUNC_LINK_MIC://连麦 if (isDRPK != 1) { //openLinkMicAnchorWindow(false); openFreePkWindow(); } else { - ToastUtil.show(WordUtil.isNewZh()?"您已在PK中":"You are already in the PK"); + ToastUtil.show(WordUtil.isNewZh() ? "您已在PK中" : "You are already in the PK"); } break; case Constants.LIVE_FUNC_WISHLIST://心愿单 @@ -517,7 +517,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl if (isDRPK != 1) { openRandomPkWindow(); } else { - ToastUtil.show(WordUtil.isNewZh()?"您已在PK中":"You are already in the PK"); + ToastUtil.show(WordUtil.isNewZh() ? "您已在PK中" : "You are already in the PK"); } break; default: @@ -795,7 +795,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveRoomViewHolder.startAnchorLight(); //初始化女神说 mLiveRoomViewHolder.initAnchorSay(); - mLiveRoomViewHolder.setGiftWall(obj.getString("gift_wall_lighten_number"),obj.getString("gift_wall_lighten_total")); + mLiveRoomViewHolder.setGiftWall(obj.getString("gift_wall_lighten_number"), obj.getString("gift_wall_lighten_total")); } if (mLiveAnchorViewHolder == null) { mLiveAnchorViewHolder = new LiveRyAnchorViewHolder(mContext, mContainer); @@ -1245,10 +1245,10 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl }); //todo 安卓端状态码说明文档：https://docs.rongcloud.cn/v4/views/rtc/call/code/android.html Log.e("ry", rtcErrorCode + "aaaaaa" + CommonAppConfig.getInstance().getUid() + "VDSSSS" + pkUid); - if(WordUtil.isNewZh()) { + if (WordUtil.isNewZh()) { ToastUtil.show("邀请 " + pkUid + " 发送失败 ：" + rtcErrorCode); - }else{ - ToastUtil.show("invite " + pkUid + " failed:"+rtcErrorCode); + } else { + ToastUtil.show("invite " + pkUid + " failed:" + rtcErrorCode); } } }); @@ -1298,9 +1298,9 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl @Override public void onSuccess() { if (!extra.equals(SOCKET_LIVE_DRPK_RANDOM)) { - if(WordUtil.isNewZh()) { + if (WordUtil.isNewZh()) { ToastUtil.show("邀请 " + pkUid + " 发送成功"); - }else{ + } else { ToastUtil.show("invite " + pkUid + " successful"); } } @@ -1490,8 +1490,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl } //插入盲盒礼物消息 bean.getLiveChatBean().setType(LiveChatBean.BLIND_BOX); - bean.getLiveChatBean().setContent(WordUtil.isNewZh()?event.getGiftMsg():event.getGiftMsgen()); - bean.getLiveChatBean().setGiftName(WordUtil.isNewZh()?event.getGiftname():event.getGiftname_en()); + bean.getLiveChatBean().setContent(WordUtil.isNewZh() ? event.getGiftMsg() : event.getGiftMsgen()); + bean.getLiveChatBean().setGiftName(WordUtil.isNewZh() ? event.getGiftname() : event.getGiftname_en()); bean.getLiveChatBean().setUserNiceName(event.getUserNiceName()); } @@ -1548,7 +1548,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + userInfo.getId() + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; - ZhuangBanActivity.forward(mContext, weeklyStarUrl, false,0); + ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 0); break; case WISH_LIST: LiveWishListDialogFragment4Audience fragment4Audience = new LiveWishListDialogFragment4Audience(); @@ -1629,6 +1629,9 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl if (mLiveRyLinkMicPkPresenter != null) { mLiveRyLinkMicPkPresenter.upDataPkScore(event.getPkScores(), event.getUid(), event.getTime()); } + if (mLiveRoomViewHolder != null) { + mLiveRoomViewHolder.seisShowGif(true); + } // if (mLiveRoomViewHolder != null) { // mLiveRoomViewHolder.hotAddVisibility(true); // } @@ -1669,7 +1672,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl break; case GIFT_WALL: if (mLiveRoomViewHolder != null) { - mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar()); + mLiveRoomViewHolder.showGiftWall(event.getUid(), event.isVoicePress(), event.getUname(), event.getAvatar()); } break; case INPUT_DIALOG: @@ -1690,12 +1693,14 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl break; } } + @Subscribe(threadMode = ThreadMode.MAIN) public void GiftWallIlluminateEvent(GiftWallIlluminateEvent event) { if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.setGiftWall(String.valueOf(event.getNewNumber()), String.valueOf(event.getMaxNumber())); } } + /** * 检查指定直播间连麦人数 * @@ -1773,7 +1778,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl @Override public void onError(String error) { - ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred"); + ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred"); } }); } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index b6c90ffc6..5c98a21d6 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -1102,10 +1102,10 @@ public class LiveGiftPopup extends AbsDialogFragment { } if (!TextUtils.isEmpty(event.getDressName()) && !TextUtils.isEmpty(event.getDressMsg())) { SpannableStringBuilder stringBuilder = new SpannableStringBuilder(); - String boxBlindMsg = String.format(mContext.getString(R.string.random_availability2), WordUtil.isNewZh()?event.getGiftname():event.getGiftname_en(), event.getDressName()); + String boxBlindMsg = String.format(mContext.getString(R.string.random_availability2), WordUtil.isNewZh()?event.getGiftname():event.getGiftname_en(),WordUtil.isNewZh()? event.getDressName():event.getDress_nameen()); stringBuilder.append(boxBlindMsg); - int dressNameIndex = boxBlindMsg.indexOf(event.getDressName()); - int dressNameSize = event.getDressName().length(); + int dressNameIndex = boxBlindMsg.indexOf(WordUtil.isNewZh()? event.getDressName():event.getDress_nameen()); + int dressNameSize =(WordUtil.isNewZh()? event.getDressName():event.getDress_nameen()).length(); int giftNameIndex = boxBlindMsg.indexOf(WordUtil.isNewZh()?event.getGiftname():event.getGiftname_en()); int giftNameSize = (WordUtil.isNewZh()?event.getGiftname():event.getGiftname_en()).length(); stringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor(event.getDressColour())), diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java index a5e55dccd..95406d0a0 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java @@ -2500,6 +2500,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { * 更新Pk分数 */ public void upDataPkScore(JSONArray pkScores, String uid, int time) { + String userID1 = (String) imageGrade1.getTag(); String userID2 = (String) imageGrade2.getTag(); String userID4 = (String) imageGrade4.getTag(); diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 0caa65834..6d72f9f58 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -23,7 +23,6 @@ import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppContext; import com.yunbao.common.Constants; import com.yunbao.common.bean.AiAutomaticSpeechModel; -import com.yunbao.common.bean.FansMedalBean; import com.yunbao.common.bean.FansModel; import com.yunbao.common.bean.LinkMicUserBean; import com.yunbao.common.bean.LiveUserGiftBean; @@ -391,20 +390,30 @@ public class SocketRyClient { } else if (action2 == 66) {//购买贵族 buyVipByNotify(map); } else if (action2 == 88) { - + JSONObject mCt = map.getJSONObject("ct"); + String boxType = map.getString("box_type"); + String boxTypeName = ""; + if (TextUtils.equals(boxType, "1")) { + boxTypeName = WordUtil.isNewZh() ? "迷你盲盒" : "Mini blind box"; + } else if (TextUtils.equals(boxType, "2")) { + boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box"; + } else { + boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box"; + } AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent() .setBlindBoxId(map.getString("blind_box_id")) - .setBoxType(map.getString("box_type")) - .setBoxTypeName(map.getString("box_type_name")) - .setDressName(map.getString("dress_name")) + .setBoxType(boxType) + .setBoxTypeName(map.getString(boxTypeName)) + .setDressName(WordUtil.isNewZh() ? map.getString("dress_name") : TextUtils.isEmpty(map.getString("dress_nameen")) ? map.getString("dress_name") : map.getString("dress_nameen")) .setGiftNotification(map.getString("gift_notification")) - .setGiftName(WordUtil.isNewZh()?map.getString("giftname"):map.getString("giftname_en")) + .setGiftName(WordUtil.isNewZh() ? mCt.getString("giftname") : mCt.getString("giftnameen")) .setUserNiceName(map.getString("uname")) .setGiftIcon(map.getString("gifticon")) .setAnchorName(map.getString("ancherName")) .setDisplaySrc(map.getString("display_src")); Log.e("AllServerNotifyEvent", allServerNotifyEvent.toString()); + Log.e("AllServerNotifyEvent", map.toJSONString()); Bus.get().post(new LiveAudienceEvent() .setType(LiveAudienceEvent.LiveAudienceType.BLIND_BOX) .setAllServerNotifyEvent(allServerNotifyEvent)); @@ -413,7 +422,7 @@ public class SocketRyClient { AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent() .setUserNiceName(mCt.getString("user_nicename")) - .setGiftName(WordUtil.isNewZh()?map.getString("giftname"):map.getString("giftname_en")) + .setGiftName(WordUtil.isNewZh() ? map.getString("giftname") : map.getString("giftname_en")) .setGiftIcon(mCt.getString("gifticon")) .setRedPacket(true); Bus.get().post(new LiveAudienceEvent() @@ -672,7 +681,7 @@ public class SocketRyClient { break; case Constants.WISH_LIST_PROGRESS: StringBuffer conString = new StringBuffer(); - conString.append(map.getString("msg")); + conString.append(WordUtil.isNewZh() ? map.getString("msg") : map.getString("msg_en")); EventBus.getDefault().post(new LiveAudienceEvent() .setType(LiveAudienceEvent.LiveAudienceType.WISH_LIST_PROGRESS) .setWishListProgress(new WishModel() @@ -865,7 +874,7 @@ public class SocketRyClient { String msgtype = map.getString("msgtype"); if ("2".equals(msgtype)) {//发言，点亮 if ("409002".equals(received.getRetcode())) { - ToastUtil.show(WordUtil.isNewZh()?"你已經被禁言":"You\'ve been banned"); + ToastUtil.show(WordUtil.isNewZh() ? "你已經被禁言" : "You\'ve been banned"); return; } @@ -1117,7 +1126,7 @@ public class SocketRyClient { chatBean.setGuardType(map.getInteger("guard_type")); } - if (CommonAppContext.lang.equals("chinese")) { + if (WordUtil.isNewZh()) { chatBean.setContent(mContext.getString(R.string.live_send_gift_1) + receiveGiftBean.getGiftCount() + mContext.getString(R.string.live_send_gift_2) + receiveGiftBean.getGiftName()); } else { chatBean.setContent(mContext.getString(R.string.live_send_gift_1) + " " + +receiveGiftBean.getGiftCount() + " " + mContext.getString(R.string.live_send_gift_2) + receiveGiftBean.getGiftnameen()); diff --git a/live/src/main/java/com/yunbao/live/utils/AllMsgTextRender.java b/live/src/main/java/com/yunbao/live/utils/AllMsgTextRender.java index 2f82bff2e..7908daae8 100644 --- a/live/src/main/java/com/yunbao/live/utils/AllMsgTextRender.java +++ b/live/src/main/java/com/yunbao/live/utils/AllMsgTextRender.java @@ -235,26 +235,29 @@ public class AllMsgTextRender { } private void blind(SpannableStringBuilder spannableStringBuilder, TextView textView, AllServerNotifyEvent serverNotifyEvent, int giftNameIndex, int endName) { - switch (Integer.parseInt(serverNotifyEvent.getBoxType())) { - case 1: - spannableStringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor("#336DF7")), - giftNameIndex, - endName, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - break; - case 2: - spannableStringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor("#FD5A9D")), - giftNameIndex, - endName, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - break; - default: - spannableStringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor("#FCB514")), - giftNameIndex, - endName, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - break; + if (giftNameIndex>0){ + switch (Integer.parseInt(serverNotifyEvent.getBoxType())) { + case 1: + spannableStringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor("#336DF7")), + giftNameIndex, + endName, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + break; + case 2: + spannableStringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor("#FD5A9D")), + giftNameIndex, + endName, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + break; + default: + spannableStringBuilder.setSpan(new ForegroundColorSpan(Color.parseColor("#FCB514")), + giftNameIndex, + endName, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + break; + } } + textView.setText(spannableStringBuilder); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java index 8d5168ed4..40f0dcec0 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java @@ -18,6 +18,7 @@ import android.widget.TextView; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsViewHolder; import com.yunbao.live.R; import com.yunbao.live.bean.LiveReceiveGiftBean; @@ -153,7 +154,7 @@ public class LiveGiftViewHolder extends AbsViewHolder { } if (TextUtils.isEmpty(mLastGiftKey) || !mLastGiftKey.equals(bean.getKey())) { ImgLoader.display(mContext, bean.getGiftIcon(), mGiftIcon); - mContent.setText(new LiveTextRender().renderGiftInfo2(bean.getGiftName())); + mContent.setText(new LiveTextRender().renderGiftInfo2(WordUtil.isNewZh()?bean.getGiftName():bean.getGiftnameen())); if (bean.getGiftCount() > 1) { mGiftGroupCount.setText("x" + bean.getGiftCount()); mMulSign.setText(R.string.live_gift_send_lian_3); 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 75eaf6114..492c070ca 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -717,7 +717,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis RequestOptions options = new RequestOptions().skipMemoryCache(true);//配置 Glide.with(mContext).asGif() .apply(options)//应用配置 - .load(R.mipmap.drpkend) + .load(WordUtil.isNewZh()?R.mipmap.drpkend:R.mipmap.drpkend_en) .listener(new RequestListener() { @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { @@ -1064,6 +1064,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis changePkTime(); break; case 1: + isShowGif = false; dr_pk_end_gif.setVisibility(View.GONE); break; } @@ -2380,7 +2381,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void onError(String error) { - ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred"); + ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred"); pkUidTmp = ""; } }); @@ -4824,6 +4825,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis */ private String userId2, userId3 = "", userId4; + public void seisShowGif(boolean isShowGif) { + this.isShowGif = isShowGif; + } + public void upDataPkScore(JSONArray pkScores, int time) { isShowGif = true; if (detailsView == null) { diff --git a/live/src/main/java/com/yunbao/live/views/LuckLiveGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/LuckLiveGiftViewHolder.java index b856e4782..05f93ed5f 100644 --- a/live/src/main/java/com/yunbao/live/views/LuckLiveGiftViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LuckLiveGiftViewHolder.java @@ -201,7 +201,7 @@ public class LuckLiveGiftViewHolder extends AbsViewHolder { } if (TextUtils.isEmpty(mLastGiftKey) || !mLastGiftKey.equals(bean.getKey())) { ImgLoader.display(mContext, bean.getGiftIcon(), mGiftIcon); - mContent.setText(new LiveTextRender().renderGiftInfo2(bean.getGiftName())); + mContent.setText(new LiveTextRender().renderGiftInfo2(WordUtil.isNewZh()?bean.getGiftName():bean.getGiftnameen())); if (bean.getGiftCount() > 1) { mGiftGroupCount.setText("x" + bean.getGiftCount()); mMulSign.setText(R.string.live_gift_send_lian_3); 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 6a0ea3194..b70ec9327 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1199,7 +1199,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe liveChatBean.setUserNiceName(event.getUserNiceName()); liveChatBean.setType(LiveChatBean.BLIND_BOX); liveChatBean.setGiftName(event.getDressName()); - liveChatBean.setContent(event.getDressMsg()); + liveChatBean.setContent(WordUtil.isNewZh()?event.getDressMsg():event.getDressMsgEN()); } //插入盲盒礼物消息 bean.getLiveChatBean().setType(LiveChatBean.BLIND_BOX); diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 8c538300a..bc52b669c 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -2398,8 +2398,8 @@