From 59ffc351e0a55d6a16ff86c69d7a2664841b0b7d Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Mon, 27 Feb 2023 20:39:38 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E9=A6=96=E5=85=85=E5=BD=88=E7=AA=97?=
 =?UTF-8?q?=E9=82=8F=E8=BC=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yizhuan/erban/avroom/activity/AVRoomActivity.java    | 9 ++++++++-
 .../yizhuan/erban/avroom/presenter/AvRoomPresenter.java  | 1 -
 app/src/main/res/layout/activity_edit_user_label.xml     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
index d3cc9802f..c5b673253 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -68,10 +68,12 @@ import com.yizhuan.erban.common.widget.CircleImageView;
 import com.yizhuan.erban.common.widget.CustomImageSpan;
 import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.home.dialog.HelloMessageDialog;
+import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity;
 import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
 import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
+import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
 import com.yizhuan.erban.ui.widget.NobleOpenNoticeView;
 import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftDialog;
 import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelOneDialog;
@@ -79,6 +81,7 @@ import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelThreeDialog;
 import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelTwoDialog;
 import com.yizhuan.erban.ui.widget.dialog.MonsterDialog;
 import com.yizhuan.erban.utils.UserUtils;
+import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
 import com.yizhuan.xchat_android_core.Constants;
 import com.yizhuan.xchat_android_core.DemoCache;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -1302,7 +1305,11 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         Single.timer(firstChargeInfo.getShowAfterSecond() * 1000L, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
                 .compose(bindUntilEvent(ActivityEvent.DESTROY))
                 .doOnSuccess(aLong -> {
-                    if (!DemoCache.readBoolean("FirstCharge", false) && UIUtils.isTopActivity(AVRoomActivity.this)) {
+                    if (!DemoCache.readBoolean("FirstCharge", false) &&
+                            (UIUtils.isTopActivity(AVRoomActivity.this)
+                                    || UIUtils.isTopActivity(this, TreasureBoxActivity.class.getName())
+                                    || UIUtils.isTopActivity(this, DialogWebViewActivity.class.getName())
+                                    || UIUtils.isTopActivity(this, RoomMsgActivity.class.getName()))) {
                         FirstChargeDialog.start(this);
                     }
                 })
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
index ebac5e142..05025605b 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
@@ -454,7 +454,6 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
      */
     @SuppressLint("CheckResult")
     public void checkFirstCharge() {
-        if (AvRoomDataManager.get().isRoomOwner()) return;
         AvRoomModel.get().getFirstCharge()
                 .compose(bindToLifecycle())
                 .subscribe(firstChargeInfo -> {
diff --git a/app/src/main/res/layout/activity_edit_user_label.xml b/app/src/main/res/layout/activity_edit_user_label.xml
index 67184865f..598346100 100644
--- a/app/src/main/res/layout/activity_edit_user_label.xml
+++ b/app/src/main/res/layout/activity_edit_user_label.xml
@@ -65,7 +65,7 @@
         android:id="@+id/magic_indicator"
         android:layout_marginTop="@dimen/dp_14"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_22"
+        android:layout_height="@dimen/dp_26"
         app:layout_constraintTop_toBottomOf="@+id/view_bg"/>
 
     <androidx.viewpager2.widget.ViewPager2