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

修改中英文

Browse Source
This commit is contained in:
18401019693 2023-10-18 17:26:37 +08:00
parent 4ff529ace9
commit e15953dc64
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.gradle
View File

@ -22,10 +22,10 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : true, isGooglePlay : false,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式
isPluginModel : false, isPluginModel : true,
] ]
} }

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

@ -721,7 +721,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override @Override
public void onError(String error) { 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(); mLiveRoomViewHolder.showLiveRoomActivityBanner();
} }
@ -1135,6 +1135,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
.dismissOnBackPressed(false) .dismissOnBackPressed(false)
.asCustom(new LiveSudGamePopup(mContext, createSudRoomModel)) .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
.show(); .show();
createSudRoomModel = null;
} }
// String jsonCreateSudRoom = IMLoginManager.get(mContext).getSudGame(); // String jsonCreateSudRoom = IMLoginManager.get(mContext).getSudGame();
// if (!TextUtils.isEmpty(jsonCreateSudRoom)) { // if (!TextUtils.isEmpty(jsonCreateSudRoom)) {
@ -1199,12 +1200,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
liveChatBean.setUserNiceName(event.getUserNiceName()); liveChatBean.setUserNiceName(event.getUserNiceName());
liveChatBean.setType(LiveChatBean.BLIND_BOX); liveChatBean.setType(LiveChatBean.BLIND_BOX);
liveChatBean.setGiftName(event.getDressName()); 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().setType(LiveChatBean.BLIND_BOX);
bean.getLiveChatBean().setContent(WordUtil.isNewZh()?event.getGiftMsg():event.getGiftMsgen()); bean.getLiveChatBean().setContent(WordUtil.isNewZh() ? event.getGiftMsg() : event.getGiftMsgen());
bean.getLiveChatBean().setGiftName(WordUtil.isNewZh()?event.getGiftname():event.getGiftname_en()); bean.getLiveChatBean().setGiftName(WordUtil.isNewZh() ? event.getGiftname() : event.getGiftname_en());
bean.getLiveChatBean().setUserNiceName(event.getUserNiceName()); bean.getLiveChatBean().setUserNiceName(event.getUserNiceName());
} }

2
main/src/main/res/layout/item_main_home_lives_class.xml
View File

@ -11,7 +11,7 @@
<TextView <TextView
android:id="@+id/tv_class_name" android:id="@+id/tv_class_name"
android:layout_width="56dp" android:layout_width="65dp"
android:layout_height="26dp" android:layout_height="26dp"
android:text="音乐" android:text="音乐"
android:textSize="16sp" android:textSize="16sp"