diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 52149a069..8fb233925 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1230,7 +1230,7 @@ 4.未被領取的紅包如何處理? 紅包打開后未被領取,以及主播下播后未打開的紅包,會退回您的賬戶 5.搶到的紅包能幹嘛? - 搶到紅包所得金豆可用於平臺一切金豆行爲,不轉增,不可體現 + 搶到紅包所得金豆可用於平臺一切金豆行爲,不可轉增,不可體現 恭喜搶到紅包 獲得%s 查看幸運觀衆> diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 15746caca..bffbc8271 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1229,7 +1229,7 @@ 4.未被領取的紅包如何處理? 紅包打開后未被領取,以及主播下播后未打開的紅包,會退回您的賬戶 5.搶到的紅包能幹嘛? - 搶到紅包所得金豆可用於平臺一切金豆行爲,不轉增,不可體現 + 搶到紅包所得金豆可用於平臺一切金豆行爲,不可轉增,不可體現 恭喜搶到紅包 獲得%s 查看幸運觀衆> diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index f205be77f..288c8faa9 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1230,7 +1230,7 @@ 4.未被領取的紅包如何處理? 紅包打開后未被領取,以及主播下播后未打開的紅包,會退回您的賬戶 5.搶到的紅包能幹嘛? - 搶到紅包所得金豆可用於平臺一切金豆行爲,不轉增,不可體現 + 搶到紅包所得金豆可用於平臺一切金豆行爲,不可轉增,不可體現 恭喜搶到紅包 獲得%s 查看幸運觀衆> 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 49071acc6..701d796b2 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -69,7 +69,6 @@ import com.yunbao.common.utils.LogUtil; import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.LiveNewWishListPopup; import com.yunbao.common.views.LiveRobotSettingCustomPopup; import com.yunbao.faceunity.FaceManager; @@ -801,7 +800,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveAnchorViewHolder.startAnchorLiveTime(); } mLiveBottomViewHolder = mLiveAnchorViewHolder; - mSocketRyClient = new SocketRyClient(mLiveUid, this,mContext); + mSocketRyClient = new SocketRyClient(mLiveUid, this, mContext); mSocketRyClient.setLivePushRyViewHolder(mLivePushViewHolder); CommonAppContext.Ingroup = 1; @@ -863,7 +862,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl * 关闭直播 */ public void closeLive() { - DialogUitl.showSimpleDialog(mContext,mContext.getString(R.string.live_end_live), new DialogUitl.SimpleCallback() { + DialogUitl.showSimpleDialog(mContext, mContext.getString(R.string.live_end_live), new DialogUitl.SimpleCallback() { @Override public void onConfirmClick(Dialog dialog, String content) { PKing = false; @@ -992,7 +991,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl @Override public Dialog createLoadingDialog() { - return DialogUitl.loadingDialog(mContext,mContext.getString(R.string.live_end_ing)); + return DialogUitl.loadingDialog(mContext, mContext.getString(R.string.live_end_ing)); } }); } @@ -1124,7 +1123,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl @Override public void onSuperCloseLive() { endLive(); - DialogUitl.showSimpleTipDialog(mContext,mContext.getString(R.string.live_illegal)); + DialogUitl.showSimpleTipDialog(mContext, mContext.getString(R.string.live_illegal)); } @Subscribe(threadMode = ThreadMode.MAIN) @@ -1495,7 +1494,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveRoomViewHolder.showGiftMessage(bean, false); mLiveRoomViewHolder.updataWishList(bean.getGiftId(), bean.getGiftCount()); } - }else { + } else { //购买守护 if (bean.ismTypeBuyGuard()) { if (mLiveRoomViewHolder != null) { @@ -1649,6 +1648,12 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveRoomViewHolder.redPacketManage(event.getRedPacketModel()); } break; + case BLIND_BOX: + if (mLiveRoomViewHolder != null) { + if (event.getAllServerNotifyEvent().isRedPacket()) + mLiveRoomViewHolder.blindBoxAllServerNotify(event.getAllServerNotifyEvent()); + } + break; } }