修改中英文
This commit is contained in:
parent
4ff529ace9
commit
e15953dc64
@ -22,10 +22,10 @@ ext {
|
||||
|
||||
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
|
||||
// true表示谷歌支付 false
|
||||
isGooglePlay : true,
|
||||
isGooglePlay : false,
|
||||
//是否上报异常日志
|
||||
isUploadLog : true,
|
||||
//是否打包成插件包模式
|
||||
isPluginModel : false,
|
||||
isPluginModel : true,
|
||||
]
|
||||
}
|
||||
|
@ -721,7 +721,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
|
||||
@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");
|
||||
//直播间上部轮播【新人特惠】【趣味游戏】【幸运天使】 轮播接口
|
||||
mLiveRoomViewHolder.showLiveRoomActivityBanner();
|
||||
}
|
||||
@ -1135,6 +1135,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
.dismissOnBackPressed(false)
|
||||
.asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
|
||||
.show();
|
||||
createSudRoomModel = null;
|
||||
}
|
||||
// String jsonCreateSudRoom = IMLoginManager.get(mContext).getSudGame();
|
||||
// if (!TextUtils.isEmpty(jsonCreateSudRoom)) {
|
||||
@ -1199,12 +1200,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
liveChatBean.setUserNiceName(event.getUserNiceName());
|
||||
liveChatBean.setType(LiveChatBean.BLIND_BOX);
|
||||
liveChatBean.setGiftName(event.getDressName());
|
||||
liveChatBean.setContent(WordUtil.isNewZh()?event.getDressMsg():event.getDressMsgEN());
|
||||
liveChatBean.setContent(WordUtil.isNewZh() ? event.getDressMsg() : event.getDressMsgEN());
|
||||
}
|
||||
//插入盲盒礼物消息
|
||||
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());
|
||||
}
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_class_name"
|
||||
android:layout_width="56dp"
|
||||
android:layout_width="65dp"
|
||||
android:layout_height="26dp"
|
||||
android:text="音乐"
|
||||
android:textSize="16sp"
|
||||
|
Loading…
Reference in New Issue
Block a user