From b23d40c0e79e2034eecc20fce6e6bf411f0a1f75 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 17 Dec 2021 17:59:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=BA=A6=E6=A8=A1=E5=BC=8F=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=202.=E6=B8=B8=E6=88=8F=E4=B8=AD=E5=8E=BB=E6=8E=89=E6=80=BB?=
 =?UTF-8?q?=E4=BB=B7=E5=80=BC>520=E7=A4=BC=E7=89=A9=E7=9A=84=E6=A8=AA?=
 =?UTF-8?q?=E5=B9=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yizhuan/erban/avroom/activity/RoomSettingActivity.java    | 2 +-
 .../java/com/yizhuan/erban/avroom/widget/GiftEffectView.java  | 4 +++-
 gradle.properties                                             | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java
index 48f52a848..28e0cc612 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java
@@ -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);
         // 排麦模式的开关状态
         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.setImageResource(isQueuingMicro ?
                 R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
index 9451440b2..9e419982f 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
@@ -118,7 +118,9 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
         }
         if (giftInfo != null) {
             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(giftImg.getContext(), giftInfo.getGiftUrl(), giftImg);
                 benefactorNick.setText(giftEffectInfo.getNick());
diff --git a/gradle.properties b/gradle.properties
index a54149913..0a0efc59d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,8 +16,8 @@ android.enableD8=true
 android.injected.testOnly=false
 android.useAndroidX=true
 android.enableJetifier=true
-version_name=3.6.4
-version_code=364
+version_name=4.0.1.0
+version_code=400
 
 with_flutter_aar=true
 with_jenkins=false