moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.排麦模式入口显示隐藏优化 2.游戏中去掉总价值>520礼物的横幅

Browse Source
This commit is contained in:
huangjian
2021-12-17 17:59:02 +08:00
parent 91fd3333d0
commit b23d40c0e7
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java
View File

@@ -591,7 +591,7 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false); R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false);
// 排麦模式的开关状态 // 排麦模式的开关状态
boolean isQueuingMicro = AvRoomDataManager.get().isQueuingMicro() || AvRoomDataManager.get().isOpenPKMode(); boolean isQueuingMicro = AvRoomDataManager.get().isQueuingMicro() || AvRoomDataManager.get().isOpenPKMode();
binding.switchQueuingMicroMode.setVisibility(AvRoomDataManager.get().isOpenGame() ? View.GONE : View.VISIBLE); binding.queuingMicroModeLayout.setVisibility(AvRoomDataManager.get().isOpenGame() ? View.GONE : View.VISIBLE);
binding.switchQueuingMicroMode.setSelected(isQueuingMicro); binding.switchQueuingMicroMode.setSelected(isQueuingMicro);
binding.switchQueuingMicroMode.setImageResource(isQueuingMicro ? binding.switchQueuingMicroMode.setImageResource(isQueuingMicro ?
R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false); R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false);

4
app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
View File

@@ -118,7 +118,9 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
} }
if (giftInfo != null) { if (giftInfo != null) {
int totalCoin = giftInfo.getGoldPrice() * giftEffectInfo.getGiftNum() * giftEffectInfo.getTargetUsers().size(); int totalCoin = giftInfo.getGoldPrice() * giftEffectInfo.getGiftNum() * giftEffectInfo.getTargetUsers().size();
if (totalCoin >= 520 && giftEffectInfo.getGiftReceiveType() != GiftEffectInfo.GIFT_RECEIVE_TYPE_LUCKY) {//礼物栏 if (totalCoin >= 520 &&
giftEffectInfo.getGiftReceiveType() != GiftEffectInfo.GIFT_RECEIVE_TYPE_LUCKY
&& !AvRoomDataManager.get().isSelfGamePlaying()) {//礼物栏
ImageLoadUtils.loadImage(benefactorAvatar.getContext(), giftEffectInfo.getAvatar(), benefactorAvatar); ImageLoadUtils.loadImage(benefactorAvatar.getContext(), giftEffectInfo.getAvatar(), benefactorAvatar);
ImageLoadUtils.loadImage(giftImg.getContext(), giftInfo.getGiftUrl(), giftImg); ImageLoadUtils.loadImage(giftImg.getContext(), giftInfo.getGiftUrl(), giftImg);
benefactorNick.setText(giftEffectInfo.getNick()); benefactorNick.setText(giftEffectInfo.getNick());

4
gradle.properties
View File

@@ -16,8 +16,8 @@ android.enableD8=true
android.injected.testOnly=false android.injected.testOnly=false
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
version_name=3.6.4 version_name=4.0.1.0
version_code=364 version_code=400
with_flutter_aar=true with_flutter_aar=true
with_jenkins=false with_jenkins=false