[Modify]首充彈窗邏輯修改

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);
                     }
                 })

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 -> {

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