diff --git a/config.gradle b/config.gradle index 8494e2aaa..b236d3a94 100644 --- a/config.gradle +++ b/config.gradle @@ -22,10 +22,10 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : true, + isGooglePlay : false, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式 - isPluginModel : false, + isPluginModel : true, ] } 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 b70ec9327..fd1d2677e 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -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()); } diff --git a/main/src/main/res/layout/item_main_home_lives_class.xml b/main/src/main/res/layout/item_main_home_lives_class.xml index 151a361b2..c17159264 100644 --- a/main/src/main/res/layout/item_main_home_lives_class.xml +++ b/main/src/main/res/layout/item_main_home_lives_class.xml @@ -11,7 +11,7 @@