feat:新增渠道：fir

feat:移除AVRoomActivity中的全服礼物飘屏逻辑到BaseActivity
feat：同步peko完成礼物飘窗UI优化（同步peko：去掉普通礼物飘窗）
2024-03-18 18:42:58 +08:00 · 2024-03-18 14:05:29 +08:00 · 2024-03-18 09:53:59 +08:00 · 2024-03-14 14:31:12 +08:00 · 2024-03-13 17:39:25 +08:00
36 changed files with 744 additions and 1163 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -185,6 +185,11 @@ android {
                abiFilters 'armeabi-v7a', 'arm64-v8a'
            }
        }
+        fir {
+            ndk {
+                abiFilters 'armeabi-v7a', 'arm64-v8a'
+            }
+        }
        mlq {
            ndk {
                abiFilters 'x86'
--- a/app/src/main/java/com/nnbc123/app/MainActivity.java
+++ b/app/src/main/java/com/nnbc123/app/MainActivity.java
@@ -501,7 +501,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
        getMvpPresenter().exitRoom();
        QuickPassLoginAct.start(MainActivity.this);
        PmDialogShowMrg.get().onLogout();
-        CustomerServerHelper.logout();
+//        CustomerServerHelper.logout();
    }

    public void onNeedLogin() {
@@ -657,7 +657,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>

        onTabClick(mCurrentTabType);

-        CustomerServerHelper.onLoginInfoUpdate(UserUtils.getUserInfo());
+//        CustomerServerHelper.onLoginInfoUpdate(UserUtils.getUserInfo());
    }


--- a/app/src/main/java/com/nnbc123/app/application/XChatApplication.java
+++ b/app/src/main/java/com/nnbc123/app/application/XChatApplication.java
@@ -307,7 +307,7 @@ public class XChatApplication extends BaseApp {
            // 集成测试
            UMConfigure.setLogEnabled(BuildConfig.DEBUG);
        } else {
-            CustomerServerHelper.init(instance, null);
+//            CustomerServerHelper.init(instance, null);
        }

        LogUtils.d("init time = " + (System.currentTimeMillis() - startTime) + "ms");
--- a/app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java
@@ -2,15 +2,12 @@ package com.nnbc123.app.avroom.activity;


 import static android.view.View.VISIBLE;
-import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
-import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;

 import android.annotation.SuppressLint;
-import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -65,10 +62,6 @@ import com.nnbc123.app.ui.user.UserInfoActivity;
 import com.nnbc123.app.ui.utils.ImageLoadUtils;
 import com.nnbc123.app.ui.webview.CommonWebViewActivity;
 import com.nnbc123.app.ui.widget.NobleOpenNoticeView;
-import com.nnbc123.app.ui.widget.dialog.AllServiceGiftDialog;
-import com.nnbc123.app.ui.widget.dialog.AllServiceGiftLevelOneDialog;
-import com.nnbc123.app.ui.widget.dialog.AllServiceGiftLevelThreeDialog;
-import com.nnbc123.app.ui.widget.dialog.AllServiceGiftLevelTwoDialog;
 import com.nnbc123.app.ui.widget.dialog.MonsterDialog;
 import com.nnbc123.app.ui.widget.marqueeview.Utils;
 import com.nnbc123.app.utils.UserUtils;
@@ -92,7 +85,6 @@ import com.nnbc123.core.monsterhunting.bean.MonsterHuntingResult;
 import com.nnbc123.core.monsterhunting.bean.MonsterInfo;
 import com.nnbc123.core.monsterhunting.bean.MonsterProtocol;
 import com.nnbc123.core.monsterhunting.manager.MonsterDataManager;
-import com.nnbc123.core.noble.AllServiceGiftProtocol;
 import com.nnbc123.core.noble.NobleInfo;
 import com.nnbc123.core.noble.NobleResourceType;
 import com.nnbc123.core.noble.NobleUtil;
@@ -119,7 +111,6 @@ import com.nnbc123.core.utils.LogUtils;
 import com.nnbc123.core.utils.StringUtils;
 import com.nnbc123.library.base.factory.CreatePresenter;
 import com.nnbc123.library.rxbus.RxBus;
-import com.nnbc123.library.utils.JavaUtil;
 import com.nnbc123.library.utils.SingleToastUtil;
 import com.nnbc123.library.utils.UIUtils;
 import com.opensource.svgaplayer.SVGADrawable;
@@ -137,7 +128,6 @@ import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

@@ -197,8 +187,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
    /*********************************显示全服礼物***************************************/

    private GiftBroadcastObserver giftObserver;
-    private Dialog giftDialog;
-    private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
    private boolean isResume = true;
    @Nullable
    private SingleRoomTipDialog singleRoomTipDialog;
@@ -501,9 +489,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        super.onResume();
        AvRoomDataManager.get().roomNoDestory = true;
        registerGiftBroadcastMessage(true);
-        if (giftList != null) {
-            giftList.clear();
-        }
        isResume = true;
    }

@@ -904,12 +889,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                monsterDialog.dismiss();
                monsterDialog = null;
            }
-            if (giftDialog != null && giftDialog.isShowing()) {
-                giftDialog.setOnDismissListener(null);
-                giftDialog.dismiss();
-                giftDialog = null;
-            }
-
            if (limitEnterRoomHelper != null) {
                limitEnterRoomHelper.release();
            }
@@ -1190,30 +1169,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        if (baseProtocol == null) return;

        switch (baseProtocol.getFirst()) {
-            case CUSTOM_MSG_HEADER_TYPE_GIFT:
-                if (!isValid()) return;
-                if (giftList == null) {
-                    giftList = new LinkedList<>();
-                }
-                int second2 = baseProtocol.getSecond();
-                AllServiceGiftProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocol.DataBean.class);
-                if (data == null || data.getGiftUrl() == null || data.isCeremonyGift())
-                    return;
-                giftList.add(data);
-                if (second2 == CUSTOM_MSG_ALL_SERVICE_GIFT) {
-                    if (giftDialog != null && giftDialog.isShowing()) {
-                        // 如果当前以及有礼物弹窗在展示，则需要等到他 dismiss 后再显示下一个
-                        AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
-                        if (dataBean != null) {
-                            return;
-                        } else {
-                            giftDialog.dismiss();
-                        }
-                    } else {
-                        showGiftDialog();
-                    }
-                }
-                break;
            case CUSTOM_MSG_LUCKY_GIFT:
                if (baseProtocol.getSecond() == CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY) {
                    RoomReceivedLuckyGiftAttachment attachment = new RoomReceivedLuckyGiftAttachment(CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY);
@@ -1236,39 +1191,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        }
    }

-    private void showGiftDialog() {
-        if (giftList.size() == 0) return;
-        giftDialog = generateAllServiceGiftDialog(this, giftList.peekFirst());
-        giftDialog.setOnDismissListener(dialog -> {
-            giftList.pollFirst();
-            AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
-            if (dataBean != null) {
-                if (isValid()) {
-                    showGiftDialog();
-                } else {
-                    giftList.clear();
-                }
-            }
-        });
-        giftDialog.show();
-    }
-
-    private AllServiceGiftDialog generateAllServiceGiftDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        switch (JavaUtil.str2int(dataBean.getLevelNum())) {
-            default:
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_1:
-                return new AllServiceGiftLevelOneDialog(context, dataBean);
-
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_2:
-
-                return new AllServiceGiftLevelTwoDialog(context, dataBean);
-
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_3:
-                return new AllServiceGiftLevelThreeDialog(context, dataBean);
-        }
-    }
-
-
    @Override
    protected void onPause() {
        super.onPause();
--- a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
@@ -125,59 +125,6 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
            giftInfo = giftEffectInfo.getGift();
        }
        if (giftInfo != null) {
-            int totalCoin = giftInfo.getGoldPrice() * giftEffectInfo.getGiftNum() * giftEffectInfo.getTargetUsers().size();
-            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());
-                giftNumber.setText("X" + giftEffectInfo.getGiftNum());
-                giftName.setText(giftInfo.getGiftName());
-                container.setVisibility(VISIBLE);
-                if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_SINGLE) {
-                    GiftReceiver giftReceiver = giftEffectInfo.getTargetUsers().get(0);
-                    ImageLoadUtils.loadAvatar(receiverAvatar.getContext(), giftReceiver.getAvatar(), receiverAvatar);
-                    receiverNick.setText(giftReceiver.getNick());
-                } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_ALL) {
-                    receiverAvatar.setImageResource(R.mipmap.app_logo);
-                    receiverNick.setText("全麦");
-                } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI) {
-                    receiverAvatar.setImageResource(R.mipmap.app_logo);
-                    StringBuilder sb = new StringBuilder();
-                    for (GiftReceiver targetUser : giftEffectInfo.getTargetUsers()) {
-                        RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByAccount(targetUser.getUid() + "");
-                        if (roomQueueInfo == null) continue;
-                        sb.append(roomQueueInfo.mRoomMicInfo.getPosition() + 1).append("麦").append(",");
-                    }
-                    if (sb.length() > 0) {
-                        sb.replace(sb.lastIndexOf(","), sb.length(), "");
-                    }
-                    receiverNick.setText(sb.toString());
-                }
-
-                Animation operatingAnim = AnimationUtils.loadAnimation(getContext(), R.anim.light_bg_rotate_anim);
-                LinearInterpolator lin = new LinearInterpolator();
-                operatingAnim.setInterpolator(lin);
-                giftLightBg.setAnimation(operatingAnim);
-
-                final Point center = new Point();
-                center.x = ResolutionUtils.getScreenWidth(getContext()) / 2;
-                ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(container, "translationX", -UIUtil.dip2px(getContext(), 400), center.x - container.getWidth() / 2).setDuration(500);
-                objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
-                objectAnimator.start();
-
-                ObjectAnimator objectAnimator1 = ObjectAnimator.ofFloat(container, "alpha", 0.0F, 1.0F).setDuration(500);
-                objectAnimator1.setInterpolator(new AccelerateDecelerateInterpolator());
-                objectAnimator1.start();
-                if (totalCoin < 4999) {
-                    imgBg.setImageResource(R.drawable.icon_gift_effect_bg_1);
-                } else if (totalCoin < 9999) {
-                    imgBg.setImageResource(R.drawable.icon_gift_effect_bg_2);
-                } else {
-                    imgBg.setImageResource(R.drawable.icon_gift_effect_bg_3);
-                }
-            }
            effectHandler.sendEmptyMessageDelayed(0, 6000);
            if (giftInfo.getOtherViewType() == 1 && !TextUtils.isEmpty(giftInfo.getViewUrl())) {
                drawVAPEffect(giftInfo.getViewUrl());
--- a/app/src/main/java/com/nnbc123/app/base/BaseActivity.java
+++ b/app/src/main/java/com/nnbc123/app/base/BaseActivity.java
@@ -4,6 +4,7 @@ import static com.nnbc123.core.Constants.DEBUG_MAX_UID;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE;
+import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE;
 import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND;
@@ -13,6 +14,7 @@ import static com.nnbc123.library.utils.UIUtils.getActivityByContext;

 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
+import android.app.Dialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -69,7 +71,7 @@ import com.nnbc123.app.ui.login.LoginPhoneActivity;
 import com.nnbc123.app.ui.pay.ChargeActivity;
 import com.nnbc123.app.ui.setting.ResetPasswordActivity;
 import com.nnbc123.app.ui.widget.DefaultToolBar;
-import com.nnbc123.app.ui.widget.dialog.AllServiceGiftLevelCeremonyDialog;
+import com.nnbc123.app.ui.widget.dialog.AllServiceGiftLevelDialog;
 import com.nnbc123.app.ui.widget.dialog.AllServiceVipLevelUPDialog;
 import com.nnbc123.app.ui.widget.dialog.GameInviteDialog;
 import com.nnbc123.app.ui.widget.dialog.OpenNobleGlobalNoticeDialog;
@@ -114,6 +116,7 @@ import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;

 import io.reactivex.Observable;
@@ -145,6 +148,8 @@ public abstract class BaseActivity extends RxAppCompatActivity
    private OpenNobleGlobalNoticeDialog mNoticeDialog;
    private boolean isShowingChargeDialog;

+    private Dialog giftDialog;
+    private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -340,7 +345,14 @@ public abstract class BaseActivity extends RxAppCompatActivity
            mNoticeDialog.dismiss();
            mNoticeDialog = null;
        }
-
+        if (giftDialog != null && giftDialog.isShowing()) {
+            giftDialog.setOnDismissListener(null);
+            giftDialog.dismiss();
+            giftDialog = null;
+        }
+        if (giftList != null) {
+            giftList.clear();
+        }
        super.onDestroy();
        LogUtil.i(this.getClass().getName(), "onDestroy");
        /* ImageLoadUtils.clearMemory(this);*/
@@ -508,7 +520,6 @@ public abstract class BaseActivity extends RxAppCompatActivity
                .compose(bindUntilEvent(ActivityEvent.PAUSE))
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(this::onRoomEventReceived);
-
    }

    @Override
@@ -930,15 +941,53 @@ public abstract class BaseActivity extends RxAppCompatActivity
                        UserUtils.getUserInfo() == null)
                    return;
                AllServiceGiftProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocol.DataBean.class);
-                if (data == null || data.getGiftUrl() == null || !data.isCeremonyGift())
+                if (data == null || data.getGiftUrl() == null)
                    return;
-                new AllServiceGiftLevelCeremonyDialog(context, data).show();
+                if (giftList == null) {
+                    giftList = new LinkedList<>();
+                }
+                int second2 = baseProtocol.getSecond();
+                if (second2 == CUSTOM_MSG_ALL_SERVICE_GIFT) {
+                    giftList.add(data);
+                    if (giftDialog != null && giftDialog.isShowing()) {
+                        // 如果当前以及有礼物弹窗在展示，则需要等到他 dismiss 后再显示下一个
+                        AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
+                        if (dataBean != null) {
+                            return;
+                        } else {
+                            giftDialog.dismiss();
+                        }
+                    } else {
+                        showGiftDialog();
+                    }
+                }
                break;
            default:
                break;
        }
    }

+    private void showGiftDialog() {
+        if (giftList.size() == 0) return;
+        giftDialog = generateAllServiceGiftDialog(this, giftList.peekFirst());
+        giftDialog.setOnDismissListener(dialog -> {
+            giftList.pollFirst();
+            AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
+            if (dataBean != null) {
+                if (isValid()) {
+                    showGiftDialog();
+                } else {
+                    giftList.clear();
+                }
+            }
+        });
+        giftDialog.show();
+    }
+
+    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
+        return new AllServiceGiftLevelDialog(context, dataBean);
+    }
+
    public void onGrabApprenticesEvent(GrabApprenticesEvent event) {
        if (!isTopActivity()) return;
        if (dialog != null && dialog.isAdded()) {
--- a/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
@@ -30,10 +30,10 @@ import com.nnbc123.app.home.activity.VisitorListActivity
 import com.nnbc123.app.home.adapter.MeCenterAdapter
 import com.nnbc123.app.home.helper.BannerHelper
 import com.nnbc123.app.home.helper.OpenRoomHelper
-import com.nnbc123.app.qiyukefu.CustomerServerHelper
 import com.nnbc123.app.skill.activity.SkillHomeActivity
 import com.nnbc123.app.skill.activity.SkillHomeActivity.Companion.start
 import com.nnbc123.app.support.LevelIconHelper
+import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity
 import com.nnbc123.app.ui.patriarch.PatriarchModeActivity
 import com.nnbc123.app.ui.pay.ChargeActivity
 import com.nnbc123.app.ui.relation.AttentionListActivity
@@ -439,7 +439,8 @@ class MeFragment : BaseFragment(), View.OnClickListener {
                UriProvider.getTutuRealNamePage()
            )
            R.id.tv_me_service -> {
-                CustomerServerHelper.contactCustomerServer(mContext)
+                NimP2PMessageActivity.start(requireContext(), "200014")
+//                CustomerServerHelper.contactCustomerServer(mContext)
            }
            R.id.tv_user_id -> {
                mUserInfo?.let {
--- a/app/src/main/java/com/nnbc123/app/home/fragment/home/HomeFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/home/fragment/home/HomeFragment.kt
@@ -106,7 +106,7 @@ class HomeFragment : BaseBindingFragment<HomeFragmentBinding>() {
        })
        InitialModel.get().cacheInitInfo?.defaultTab?.let {
            val tab = it - 1
-            if (it >= 0 && it < tagList.size) {
+            if (tab >= 0 && tab < tagList.size) {
                mBinding.viewPager.currentItem = tab
            }
        }
--- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt
@@ -0,0 +1,105 @@
+package com.nnbc123.app.ui.widget.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.Window
+import android.view.WindowManager
+import androidx.databinding.DataBindingUtil
+import com.chuhai.utils.ktx.singleClick
+import com.nnbc123.app.R
+import com.nnbc123.app.avroom.activity.AVRoomActivity
+import com.nnbc123.app.databinding.AllServiceGiftGoRoomTipsDialogBinding
+import com.nnbc123.app.public_chat_hall.activity.PublicChatHallHomeActivity
+import com.nnbc123.core.initial.InitialModel
+import com.nnbc123.library.common.util.SPUtils
+import com.nnbc123.library.utils.JavaUtil
+
+/**
+ * Created by Max on 2023/10/30 10:29
+ * Desc:跳转房间提示
+ **/
+class AllServiceGiftGoRoomTipsDialog(
+    context: Context,
+    private val roomName: String,
+    private val roomId: Long
+) :
+    BaseDialog(context, R.style.dialog) {
+
+    private var binding: AllServiceGiftGoRoomTipsDialogBinding? = null
+
+    companion object {
+        /**
+         * 是否需要提示前往房间
+         */
+        fun isNeedTips(): Boolean {
+            return !SPUtils.getBoolean("all_service_gift_go_room_no_tips", false)
+        }
+
+        /**
+         * 忽略提示/不在提示
+         */
+        private fun ignoreTips() {
+            SPUtils.putBoolean("all_service_gift_go_room_no_tips", true)
+        }
+    }
+
+    private var isCheck: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setCancelable(false)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        val inflate =
+            LayoutInflater.from(context)
+                .inflate(R.layout.all_service_gift_go_room_tips_dialog, null)
+        setContentView(inflate.rootView)
+        binding = DataBindingUtil.bind(inflate)
+
+        binding?.tvRoomName?.text = roomName
+        binding?.ivCheckbox?.setOnClickListener {
+            updateCheckbox(!isCheck)
+        }
+        binding?.tvTips?.setOnClickListener {
+            updateCheckbox(!isCheck)
+        }
+        binding?.tvGo?.singleClick {
+            if (isCheck) {
+                ignoreTips()
+            }
+            if (roomId == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) {
+                PublicChatHallHomeActivity.openPublicChatHallPage(context)
+            } else {
+                AVRoomActivity.start(context, roomId)
+            }
+            dismiss()
+        }
+        binding?.tvCancel?.singleClick {
+            if (isCheck) {
+                ignoreTips()
+            }
+            dismiss()
+        }
+        updateCheckbox(false)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        this.window?.attributes?.let {
+            it.width = WindowManager.LayoutParams.MATCH_PARENT
+            it.height = WindowManager.LayoutParams.WRAP_CONTENT
+            it.gravity = Gravity.CENTER
+            window?.attributes = it
+        }
+    }
+
+    private fun updateCheckbox(isCheck: Boolean) {
+        this.isCheck = isCheck
+        if (isCheck) {
+            binding?.ivCheckbox?.setImageResource(R.drawable.base_ic_checkbox_selected)
+        } else {
+            binding?.ivCheckbox?.setImageResource(R.drawable.base_ic_checkbox_unselected)
+        }
+    }
+}
--- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelCeremonyDialog.java
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelCeremonyDialog.java
@@ -1,77 +0,0 @@
-package com.nnbc123.app.ui.widget.dialog;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-
-import com.nnbc123.core.manager.AvRoomDataManager;
-import com.nnbc123.core.noble.AllServiceGiftProtocol;
-import com.nnbc123.app.R;
-import com.nnbc123.app.avroom.activity.AVRoomActivity;
-import com.nnbc123.app.databinding.DialogGiftAllServiceCeremonyBinding;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelCeremonyDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceCeremonyBinding binding;
-
-    public AllServiceGiftLevelCeremonyDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_ceremony, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        Point point = new Point();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_fade);
-            window.getWindowManager().getDefaultDisplay().getSize(point);
-        }
-        if (dataBean != null) {
-            // 设置定时器
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-            binding.tvGoRoom.setVisibility(dataBean.getRoomUid() == 0
-                    || (AvRoomDataManager.get().mCurrentRoomInfo != null && dataBean.getRoomUid() == AvRoomDataManager.get().mCurrentRoomInfo.getUid())
-                    ? View.GONE : View.VISIBLE);
-            binding.tvGoRoom.setOnClickListener(view -> AVRoomActivity.start(getContext(), dataBean.getRoomUid()));
-        }
-    }
-}
--- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt
@@ -0,0 +1,191 @@
+package com.nnbc123.app.ui.widget.dialog
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewConfiguration
+import android.view.Window
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.core.view.isVisible
+import androidx.databinding.DataBindingUtil
+import com.chuhai.utils.ktx.getColorById
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.spannable.SpannableTextBuilder
+import com.nnbc123.app.R
+import com.nnbc123.app.avroom.activity.AVRoomActivity
+import com.nnbc123.app.databinding.DialogGiftAllServiceLevelBinding
+import com.nnbc123.app.public_chat_hall.activity.PublicChatHallHomeActivity
+import com.nnbc123.core.initial.InitialModel
+import com.nnbc123.core.noble.AllServiceGiftProtocol
+import com.nnbc123.library.utils.JavaUtil
+import io.reactivex.Observable
+import io.reactivex.disposables.Disposable
+import java.util.concurrent.TimeUnit
+
+/**
+ * Created by Max on 2023/10/27 18:42
+ * Desc:全服礼物弹窗
+ **/
+class AllServiceGiftLevelDialog : BaseDialog {
+
+    private var data: AllServiceGiftProtocol.DataBean? = null
+    private var binding: DialogGiftAllServiceLevelBinding? = null
+
+    private var disposable: Disposable? = null
+
+    companion object {
+        private var marqueeError = false
+    }
+
+    constructor(context: Context?, data: AllServiceGiftProtocol.DataBean) : super(
+        context, R.style.FullScreenDialog
+    ) {
+        this.data = data
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        val inflate =
+            LayoutInflater.from(context).inflate(R.layout.dialog_gift_all_service_level, null)
+        setContentView(inflate.rootView)
+        setCancelable(true)
+        setCanceledOnTouchOutside(true)
+        binding = DataBindingUtil.bind(inflate)
+        val window = window
+        if (window != null) {
+            window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            val windowParams = window.attributes
+            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT
+            //MATCH_PARENT会挡住键盘，
+            // wrap_parent在小米8又会截掉一点，在华为测试关闭按钮点击不到
+            //暂时找不到原因，
+            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT
+            windowParams.dimAmount = 0.0f
+            windowParams.gravity = Gravity.TOP
+            windowParams.x = 0
+            windowParams.y = 0
+            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)
+            window.attributes = windowParams
+            window.setWindowAnimations(R.style.anim_left)
+        }
+        val data = this.data
+        val binding = this.binding
+        if (data != null && binding != null) {
+            init(data, binding)
+        } else {
+            dismiss()
+        }
+    }
+
+    private fun init(
+        data: AllServiceGiftProtocol.DataBean,
+        binding: DialogGiftAllServiceLevelBinding
+    ) {
+        binding.ivAvatar.singleClick {
+            goRoom(data)
+        }
+        binding.tvRoomGo.singleClick {
+            goRoom(data)
+        }
+        binding.giftBean = data
+        if ((data.giftNum) <= 1) {
+            binding.tvCount.text = ""
+        } else {
+            binding.tvCount.text = "X${data.giftNum}"
+        }
+        SpannableTextBuilder(binding.tvMessage)
+            .appendText(
+                data.sendUserNick,
+                binding.tvMessage.context.getColorById(R.color.color_FFE468)
+            )
+            .appendText(
+                " 送给 ",
+                binding.tvMessage.context.getColorById(R.color.white)
+            )
+            .appendText(
+                data.recvUserNick + " ",
+                binding.tvMessage.context.getColorById(R.color.color_FFE468)
+            )
+            .appendText(
+                data.giftName,
+                binding.tvMessage.context.getColorById(R.color.white)
+            ).apply()
+        when (data.levelNum.toIntOrNull()) {
+            2 -> {
+                binding.ivAvatarBg.setImageResource(R.drawable.all_service_gift_bg_avatar_2)
+                binding.layoutRoot.setBackgroundResource(R.drawable.all_service_gift_bg_2)
+                binding.tvRoomGo.setBackgroundResource(R.drawable.all_service_gift_bg_room_go2)
+            }
+
+            3 -> {
+                binding.ivAvatarBg.setImageResource(R.drawable.all_service_gift_bg_avatar_3)
+                binding.layoutRoot.setBackgroundResource(R.drawable.all_service_gift_bg_3)
+                binding.tvRoomGo.setBackgroundResource(R.drawable.all_service_gift_bg_room_go3)
+            }
+
+            else -> {
+                binding.ivAvatarBg.setImageDrawable(null)
+                binding.layoutRoot.setBackgroundResource(R.drawable.all_service_gift_bg_1)
+                binding.tvRoomGo.setBackgroundResource(R.drawable.all_service_gift_bg_room_go1)
+            }
+        }
+        setupTextMarquee(binding.tvMessage)
+        disposable = Observable.timer(data.notifyStaySecond.toLong(), TimeUnit.SECONDS)
+            .subscribe { dismiss() }
+        binding.groupRoom.isVisible = data.roomUid != 0L
+    }
+
+    /**
+     * 添加跑马灯
+     * 以及反射一些参数影响跑马灯
+     */
+    private fun setupTextMarquee(view: TextView) {
+        view.isSelected = true
+        if (marqueeError) {
+            return
+        }
+        try {
+            val configuration = ViewConfiguration.get(
+                context
+            )
+            val claz: Class<*> = configuration.javaClass
+            val field = claz.getDeclaredField("mFadingMarqueeEnabled")
+            field.isAccessible = true
+            field[configuration] = true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            marqueeError = true
+        }
+    }
+
+    private fun goRoom(
+        data: AllServiceGiftProtocol.DataBean
+    ) {
+        if (data.roomUid <= 0L) {
+            // 非房间场景送的礼物
+            return
+        }
+        if (AllServiceGiftGoRoomTipsDialog.isNeedTips()) {
+            AllServiceGiftGoRoomTipsDialog(context, data.roomTitle ?: "", data.roomUid).show()
+        } else {
+            if (data.roomUid == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) {
+                PublicChatHallHomeActivity.openPublicChatHallPage(context)
+            } else {
+                AVRoomActivity.start(context, data.roomUid)
+            }
+        }
+    }
+
+    override fun dismiss() {
+        super.dismiss()
+        if (disposable?.isDisposed != true) {
+            disposable?.dispose()
+        }
+        disposable = null
+    }
+}
--- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
@@ -1,85 +0,0 @@
-package com.nnbc123.app.ui.widget.dialog;
-
-import android.content.Context;
-import androidx.databinding.DataBindingUtil;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.nnbc123.app.R;
-import com.nnbc123.app.avroom.activity.AVRoomActivity;
-import com.nnbc123.app.databinding.DialogGiftAllServiceLevelOneBinding;
-import com.nnbc123.app.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.nnbc123.core.initial.InitialModel;
-import com.nnbc123.core.noble.AllServiceGiftProtocol;
-import com.nnbc123.core.statistic.StatisticManager;
-import com.nnbc123.core.statistic.protocol.StatisticsProtocol;
-import com.nnbc123.library.utils.JavaUtil;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelOneDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceLevelOneBinding binding;
-
-    public AllServiceGiftLevelOneDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-        giftLevel = ALL_SERVICE_GIFT_LEVEL_1;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_level_one, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            //MATCH_PARENT会挡住键盘，
-            // wrap_parent在小米8又会截掉一点，在华为测试关闭按钮点击不到
-            //暂时找不到原因，
-            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_left);
-        }
-        if (dataBean != null) {
-            binding.getRoot().setOnClickListener(v -> {
-                if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
-                    PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
-                } else {
-                    AVRoomActivity.start(getContext(), dataBean.getRoomUid());
-                }
-
-                StatisticManager.Instance().onEvent(StatisticsProtocol.FULL_GIFT_WATCHING, "全服礼物-前往围观计数");
-            });
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-        }
-        binding.ivCloseDialogOne.setOnClickListener(v -> dismiss());
-    }
-}
--- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
@@ -1,92 +0,0 @@
-package com.nnbc123.app.ui.widget.dialog;
-
-import android.content.Context;
-
-import androidx.databinding.DataBindingUtil;
-
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.nnbc123.app.R;
-import com.nnbc123.app.avroom.activity.AVRoomActivity;
-import com.nnbc123.app.databinding.DialogGiftAllServiceLevelThreeBinding;
-import com.nnbc123.app.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.nnbc123.core.initial.InitialModel;
-import com.nnbc123.core.noble.AllServiceGiftProtocol;
-import com.nnbc123.core.statistic.StatisticManager;
-import com.nnbc123.core.statistic.protocol.StatisticsProtocol;
-import com.nnbc123.library.utils.JavaUtil;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelThreeDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceLevelThreeBinding binding;
-    private float screenWidth;
-
-    public AllServiceGiftLevelThreeDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_level_three, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        Point point = new Point();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            windowParams.height =WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_fade);
-            window.getWindowManager().getDefaultDisplay().getSize(point);
-            screenWidth = point.x;
-        }
-        if (dataBean != null) {
-            binding.giftClose.setOnClickListener(v -> {
-                dismiss();
-            });
-            binding.getRoot().setOnClickListener(v -> {
-                if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
-                    PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
-                } else {
-                    AVRoomActivity.start(getContext(), dataBean.getRoomUid());
-                }
-
-                StatisticManager.Instance().onEvent(StatisticsProtocol.FULL_GIFT_WATCHING, "全服礼物-前往围观计数");
-            });
-            // 设置定时器
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-            binding.tvRoomId.setVisibility(dataBean.getRoomUid() == 0 ? View.GONE : View.VISIBLE);
-        }
-    }
-}
--- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
@@ -1,88 +0,0 @@
-package com.nnbc123.app.ui.widget.dialog;
-
-import android.content.Context;
-import androidx.databinding.DataBindingUtil;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.nnbc123.app.R;
-import com.nnbc123.app.avroom.activity.AVRoomActivity;
-import com.nnbc123.app.databinding.DialogGiftAllServiceLevelTwoBinding;
-import com.nnbc123.app.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.nnbc123.core.initial.InitialModel;
-import com.nnbc123.core.noble.AllServiceGiftProtocol;
-import com.nnbc123.core.statistic.StatisticManager;
-import com.nnbc123.core.statistic.protocol.StatisticsProtocol;
-import com.nnbc123.library.utils.JavaUtil;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceLevelTwoBinding binding;
-    private float screenWidth;
-
-    public AllServiceGiftLevelTwoDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_level_two, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        Point point = new Point();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            windowParams.height =WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_left);
-            window.getWindowManager().getDefaultDisplay().getSize(point);
-            screenWidth = point.x;
-        }
-        if (dataBean != null) {
-            binding.getRoot().setOnClickListener(v -> {
-                if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
-                    PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
-                } else {
-                    AVRoomActivity.start(getContext(), dataBean.getRoomUid());
-                }
-
-                StatisticManager.Instance().onEvent(StatisticsProtocol.FULL_GIFT_WATCHING, "全服礼物-前往围观计数");
-            });
-            // 设置定时器
-            Observable.timer((long) (dataBean.getNotifyStaySecond()), TimeUnit.SECONDS)
-                    .subscribe(aLong -> dismiss());
-            binding.setGiftBean(dataBean);
-        }
-
-        binding.ivCloseDialogTwo.setOnClickListener(v -> dismiss());
-
-    }
-
-}
--- a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_1.webp
+++ b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_1.webp
--- a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_2.webp
+++ b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_2.webp
--- a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_3.webp
+++ b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_3.webp
--- a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_avatar_2.webp
+++ b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_avatar_2.webp
--- a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_avatar_3.webp
+++ b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_avatar_3.webp
--- a/app/src/main/res/drawable/all_service_gift_bg_room_go1.xml
+++ b/app/src/main/res/drawable/all_service_gift_bg_room_go1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FF283889" />
+    <stroke
+        android:width="1dp"
+        android:color="#FF66B5FF" />
+    <corners android:radius="8.5dp" />
+</shape>
--- a/app/src/main/res/drawable/all_service_gift_bg_room_go2.xml
+++ b/app/src/main/res/drawable/all_service_gift_bg_room_go2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FF49157D" />
+    <stroke
+        android:width="1dp"
+        android:color="#FFFE9FFF" />
+    <corners android:radius="8.5dp" />
+</shape>
--- a/app/src/main/res/drawable/all_service_gift_bg_room_go3.xml
+++ b/app/src/main/res/drawable/all_service_gift_bg_room_go3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#87152D" />
+    <stroke
+        android:width="1dp"
+        android:color="#FFED77" />
+    <corners android:radius="8.5dp" />
+</shape>
--- a/app/src/main/res/drawable/all_service_gift_ic_room.xml
+++ b/app/src/main/res/drawable/all_service_gift_ic_room.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M12.528,0.898L18.773,5.98C19.55,6.611 20,7.558 20,8.557L20,16.009C20,18.213 18.209,20 16,20L15,20C14.264,20 13.667,19.403 13.667,18.667L13.667,14.346L13.667,14.346C13.667,13.269 12.811,12.391 11.742,12.352L11.667,12.35L8.333,12.35C7.254,12.35 6.374,13.204 6.335,14.271L6.333,14.346L6.333,18.667C6.333,19.403 5.736,20 5,20L4,20L4,20C1.791,20 0,18.213 0,16.009L0,8.557C0,7.558 0.45,6.611 1.227,5.98L7.472,0.898C8.944,-0.299 11.056,-0.299 12.528,0.898Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/base_ic_checkbox_selected.xml
+++ b/app/src/main/res/drawable/base_ic_checkbox_selected.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M7,7m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:strokeWidth="1"
+      android:fillColor="#141414"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.576,6.612C3.792,6.373 4.161,6.353 4.4,6.569L6.381,8.353L9.867,4.483C10.098,4.226 10.493,4.205 10.75,4.436C11.006,4.667 11.027,5.062 10.796,5.319L6.948,9.592L6.937,9.604C6.932,9.61 6.926,9.617 6.92,9.623C6.705,9.862 6.336,9.882 6.097,9.666L3.619,7.436C3.38,7.22 3.361,6.851 3.576,6.612Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/base_ic_checkbox_unselected.xml
+++ b/app/src/main/res/drawable/base_ic_checkbox_unselected.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M7,7m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#B3B3C3"
+      android:fillType="evenOdd"/>
+</vector>
--- a/app/src/main/res/drawable/shape_e6e6f0_21.xml
+++ b/app/src/main/res/drawable/shape_e6e6f0_21.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="21dp"/>
+    <solid android:color="#FFE6E6F0"/>
+</shape>
--- a/app/src/main/res/drawable/shape_theme_21.xml
+++ b/app/src/main/res/drawable/shape_theme_21.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="21dp"/>
+    <solid android:color="@color/color_theme"/>
+</shape>
--- a/app/src/main/res/layout/all_service_gift_go_room_tips_dialog.xml
+++ b/app/src/main/res/layout/all_service_gift_go_room_tips_dialog.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="28dp"
+            android:background="@drawable/shape_white_20dp_round"
+            android:paddingBottom="24dp">
+
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="@string/all_service_gift_room_go_title"
+                android:textColor="@color/color_1F1B4F"
+                android:textSize="18dp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_go_tips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="@string/all_service_gift_room_go_tips"
+                android:textColor="@color/color_1F1B4F"
+                android:textSize="14dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_title" />
+
+            <TextView
+                android:id="@+id/tv_room_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:gravity="center_horizontal"
+                android:textColor="@color/color_9168FA"
+                android:textSize="14dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_go_tips"
+                tools:text="Name" />
+
+            <ImageView
+                android:id="@+id/iv_checkbox"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginTop="13dp"
+                android:scaleType="center"
+                android:src="@drawable/base_ic_checkbox_unselected"
+                app:layout_constraintEnd_toStartOf="@id/tv_tips"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_room_name" />
+
+            <TextView
+                android:id="@+id/tv_tips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:includeFontPadding="false"
+                android:text="@string/all_service_gift_room_go_ignore"
+                android:textColor="@color/color_B3B3C3"
+                android:textSize="12dp"
+                app:layout_constraintBottom_toBottomOf="@id/iv_checkbox"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/iv_checkbox"
+                app:layout_constraintTop_toTopOf="@id/iv_checkbox" />
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="0dp"
+                android:layout_height="42dp"
+                android:layout_marginStart="28dp"
+                android:layout_marginTop="19dp"
+                android:layout_marginEnd="7.5dp"
+                android:background="@drawable/shape_e6e6f0_21"
+                android:gravity="center"
+                android:text="@string/all_service_gift_room_go_cancel"
+                android:textColor="@color/white"
+                android:textSize="16dp"
+                app:layout_constraintEnd_toStartOf="@id/tv_go"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/iv_checkbox" />
+
+            <TextView
+                android:id="@+id/tv_go"
+                android:layout_width="0dp"
+                android:layout_height="42dp"
+                android:layout_marginStart="7.5dp"
+                android:layout_marginEnd="28dp"
+                android:background="@drawable/shape_theme_21"
+                android:gravity="center"
+                android:text="@string/all_service_gift_room_go_go"
+                android:textColor="@color/color_333333"
+                android:textSize="16dp"
+                app:layout_constraintBottom_toBottomOf="@id/tv_cancel"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tv_cancel"
+                app:layout_constraintTop_toTopOf="@id/tv_cancel" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </FrameLayout>
+</layout>
--- a/app/src/main/res/layout/dialog_gift_all_service_ceremony.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_ceremony.xml
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="giftBean"
-            type="com.nnbc123.core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="30dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/all_service_gift_ceremony_background"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/benefactor_nick"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="35dp"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxEms="5"
-                android:maxLines="1"
-                android:singleLine="true"
-                android:text="@{giftBean.sendUserNick}"
-                android:textColor="#FBC200"
-                android:textSize="12dp"
-                tools:ignore="SpUsage"
-                tools:text="宫泽艾里斯-宫泽艾里斯-宫泽艾里斯" />
-
-            <com.nnbc123.app.common.widget.CircleImageView
-                android:id="@+id/benefactor_avatar"
-                avatarUrl="@{giftBean.sendUserAvatar}"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="2dp"
-                app:cborder_color="#FFEB71"
-                app:cborder_width="1dp"
-                tools:src="@drawable/default_avatar" />
-
-            <TextView
-                android:id="@+id/give_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:text="送给"
-                android:textColor="@color/white"
-                android:textSize="12dp" />
-
-            <TextView
-                android:id="@+id/receiver_nick"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxEms="5"
-                android:maxLines="1"
-                android:singleLine="true"
-                android:text="@{giftBean.recvUserNick}"
-                android:textColor="#FBC200"
-                android:textSize="12dp"
-                tools:text="梅利奥达斯-梅利奥达斯-梅利奥达斯" />
-
-            <com.nnbc123.app.common.widget.CircleImageView
-                android:id="@+id/receiver_avatar"
-                avatarUrl="@{giftBean.recvUserAvatar}"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="2dp"
-                app:cborder_color="#FFEB71"
-                app:cborder_width="1dp"
-                tools:src="@drawable/default_avatar" />
-
-            <TextView
-                android:id="@+id/gift_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:gravity="center"
-                android:text="@{giftBean.giftName}"
-                android:textColor="#80F9FF"
-                android:textSize="12dp"
-                android:textStyle="bold"
-                tools:ignore="SpUsage"
-                tools:text="神邸荣光" />
-
-            <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="2dp" />
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:gravity="center"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#80F9FF"
-                android:textSize="12dp"
-                android:textStyle="bold"
-                tools:ignore="SpUsage"
-                tools:text="x1" />
-
-            <ImageView
-                android:id="@+id/tv_go_room"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_5"
-                android:src="@drawable/all_service_gift_ceremony_go_to" />
-
-        </LinearLayout>
-
-    </FrameLayout>
-</layout>
--- a/app/src/main/res/layout/dialog_gift_all_service_level.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="giftBean"
+            type="com.nnbc123.core.noble.AllServiceGiftProtocol.DataBean" />
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="20dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_root"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@drawable/all_service_gift_bg_1"
+            app:layout_constraintDimensionRatio="h,375:69"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/iv_avatar_bg"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
+                app:layout_constraintDimensionRatio="w,89:69"
+                app:layout_constraintEnd_toEndOf="@id/iv_avatar"
+                app:layout_constraintStart_toStartOf="@id/iv_avatar"
+                app:layout_constraintTop_toTopOf="@id/iv_avatar"
+                tools:background="@color/black" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/line_content_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.0586" />
+
+            <com.nnbc123.app.common.widget.CircleImageView
+                android:id="@+id/iv_avatar"
+                avatarUrl="@{giftBean.sendUserAvatar}"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="w,1:1"
+                app:layout_constraintHeight_percent="0.6376"
+                app:layout_constraintStart_toStartOf="@id/line_content_start"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@drawable/default_avatar" />
+
+            <TextView
+                android:id="@+id/tv_message"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="13dp"
+                android:layout_marginEnd="4.5dp"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:includeFontPadding="false"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
+                android:textColor="@color/white"
+                android:textSize="14dp"
+                app:layout_constraintBottom_toTopOf="@id/tv_room_name"
+                app:layout_constraintEnd_toStartOf="@id/iv_gift"
+                app:layout_constraintStart_toEndOf="@id/iv_avatar"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed"
+                tools:text="XXX 送给 XXX XXXX" />
+
+            <TextView
+                android:id="@+id/tv_room_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2.5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="4.5dp"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:text="@{giftBean.roomTitle}"
+                android:textColor="@color/white"
+                android:textSize="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_room_go"
+                app:layout_constraintStart_toEndOf="@id/iv_room"
+                app:layout_constraintTop_toBottomOf="@id/tv_message"
+                tools:text="X1111111111111111111" />
+
+            <TextView
+                android:id="@+id/tv_room_go"
+                android:layout_width="wrap_content"
+                android:layout_height="19dp"
+                android:layout_marginEnd="2dp"
+                android:background="@drawable/all_service_gift_bg_room_go1"
+                android:gravity="center"
+                android:paddingHorizontal="7.5dp"
+                android:singleLine="true"
+                android:text="@string/all_service_gift_room_go"
+                android:textColor="@color/white"
+                android:textSize="10dp"
+                app:layout_constraintBottom_toBottomOf="@id/tv_room_name"
+                app:layout_constraintEnd_toStartOf="@id/iv_gift"
+                app:layout_constraintTop_toTopOf="@id/tv_room_name" />
+
+            <ImageView
+                android:id="@+id/iv_room"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:src="@drawable/all_service_gift_ic_room"
+                app:layout_constraintBottom_toBottomOf="@id/tv_room_name"
+                app:layout_constraintStart_toStartOf="@id/tv_message"
+                app:layout_constraintTop_toTopOf="@id/tv_room_name" />
+
+            <ImageView
+                android:id="@+id/iv_gift"
+                nomalUrl="@{giftBean.giftUrl}"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginEnd="2dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="w,1:1"
+                app:layout_constraintEnd_toStartOf="@id/tv_count"
+                app:layout_constraintHeight_percent="0.9275"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:background="@color/black" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/line_content_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.9413" />
+
+            <TextView
+                android:id="@+id/tv_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxWidth="180dp"
+                android:singleLine="true"
+                android:textColor="@color/color_FFE468"
+                android:textSize="16dp"
+                android:textStyle="italic|bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="@id/line_content_end"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="X10000" />
+
+            <androidx.constraintlayout.widget.Group
+                android:id="@+id/group_room"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                app:constraint_referenced_ids="tv_room_name,tv_room_go,iv_room"
+                tools:visibility="visible" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</layout>
--- a/app/src/main/res/layout/dialog_gift_all_service_level_one.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_one.xml
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="giftBean"
-            type="com.nnbc123.core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        tools:background="@color/black">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:background="@drawable/all_service_gift_level_one_background">
-
-            <RelativeLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="37dp">
-
-                <RelativeLayout
-                    android:id="@+id/benefactor_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar"
-                        avatarUrl="@{giftBean.sendUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="66.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/benefactor_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_one_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.sendUserNick}"
-                    android:textColor="#FF2F0060"
-                    android:textSize="10dp"
-                    tools:ignore="SpUsage"
-                    tools:text="宫泽艾里斯宫泽艾里斯-宫泽艾里斯" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/give_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="56dp"
-                android:layout_marginEnd="13dp"
-                android:layout_toEndOf="@id/benefactor_container"
-                android:src="@drawable/all_service_gift_give_level_1" />
-
-            <RelativeLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="37dp"
-                android:layout_toEndOf="@id/give_text">
-
-                <RelativeLayout
-                    android:id="@+id/receiver_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar"
-                        avatarUrl="@{giftBean.recvUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="66.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/receiver_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_one_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="#FF2F0060"
-                    android:textSize="10dp"
-                    tools:text="梅利奥达斯-梅利奥达斯-梅利奥达斯" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="@dimen/dp_15"
-                android:layout_marginTop="37dp"
-                android:layout_toEndOf="@+id/receiver_container" />
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_6"
-                android:layout_marginTop="53dp"
-                android:layout_toEndOf="@+id/gift_img"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFFEF563"
-                android:textSize="20dp"
-                tools:ignore="SpUsage"
-                tools:text="x1314" />
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/iv_close_dialog_one"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="13dp"
-            android:layout_marginEnd="10dp"
-            android:src="@drawable/ic_close_all_server_one" />
-
-    </FrameLayout>
-
-</layout>
--- a/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="giftBean"
-            type="com.nnbc123.core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        tools:background="@color/black">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:background="@drawable/all_service_gift_level_three_background">
-
-            <TextView
-                android:id="@+id/tv_room_id"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="8dp"
-                android:gravity="center"
-                android:text="@{@string/click_go + giftBean.roomErbanNo}"
-                android:textColor="@color/white"
-                android:textSize="10dp"
-                tools:ignore="SpUsage"
-                tools:text="ID:1234567" />
-
-            <RelativeLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="17dp"
-                android:layout_marginTop="56dp">
-
-                <RelativeLayout
-                    android:id="@+id/benefactor_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar"
-                        avatarUrl="@{giftBean.sendUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/benefactor_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.sendUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
-                    tools:ignore="SpUsage"
-                    tools:text="宫泽艾里斯宫泽艾里斯-宫泽艾里斯" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/give_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="56dp"
-                android:layout_marginEnd="13dp"
-                android:layout_toEndOf="@id/benefactor_container"
-                android:src="@drawable/all_service_gift_give_level_1" />
-
-            <RelativeLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="56dp"
-                android:layout_toEndOf="@id/give_text">
-
-                <RelativeLayout
-                    android:id="@+id/receiver_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar"
-                        avatarUrl="@{giftBean.recvUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/receiver_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
-                    tools:text="梅利奥达斯梅利奥达斯-梅利奥达斯" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="56dp"
-                android:layout_toEndOf="@+id/receiver_container" />
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_6"
-                android:layout_marginTop="75dp"
-                android:layout_toEndOf="@+id/gift_img"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFFEF563"
-                android:textSize="20dp"
-                tools:ignore="SpUsage"
-                tools:text="x1314" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/gift_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:layout_marginTop="34dp"
-            android:src="@drawable/ic_close_all_server_one" />
-
-    </FrameLayout>
-
-</layout>
--- a/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="giftBean"
-            type="com.nnbc123.core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        tools:background="@color/black">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/all_service_gift_level_two_background">
-
-            <RelativeLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="17dp"
-                android:layout_marginTop="34dp">
-
-                <RelativeLayout
-                    android:id="@+id/benefactor_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar"
-                        avatarUrl="@{giftBean.sendUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/benefactor_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.sendUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
-                    tools:ignore="SpUsage"
-                    tools:text="宫泽艾里斯宫泽艾里斯-宫泽艾里斯" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/give_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="53dp"
-                android:layout_marginEnd="13dp"
-                android:layout_toEndOf="@id/benefactor_container"
-                android:src="@drawable/all_service_gift_give_level_1" />
-
-            <RelativeLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="34dp"
-                android:layout_toEndOf="@id/give_text">
-
-                <RelativeLayout
-                    android:id="@+id/receiver_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_two_background" />
-
-                    <com.nnbc123.app.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar"
-                        avatarUrl="@{giftBean.recvUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/receiver_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
-                    tools:text="梅利奥达斯梅利奥达斯-梅利奥达斯" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="34dp"
-                android:layout_toEndOf="@+id/receiver_container" />
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_6"
-                android:layout_marginTop="53dp"
-                android:layout_toEndOf="@+id/gift_img"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFFEF563"
-                android:textSize="20dp"
-                tools:ignore="SpUsage"
-                tools:text="x1314" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/ivCloseDialogTwo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="11dp"
-            android:src="@drawable/ic_close_all_server_one" />
-
-    </FrameLayout>
-</layout>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@

    <color name="color_male">@color/color_529EF2</color>
    <color name="color_female">@color/color_FC588F</color>
+    <color name="color_theme">#FFDA24</color>

    <color name="transparent">#00000000</color>
    <!-- 透明度参考表
@@ -631,4 +632,7 @@
    <color name="color_FFF265">#FFFFF265</color>
    <color name="color_5CEFFF">#FF5CEFFF</color>
    <color name="color_7F8494">#7F8494</color>
+    <color name="color_FFE468">#FFFFE468</color>
+    <color name="color_1F1B4F">#1F1B4F</color>
+    <color name="color_9168FA">#9168FA</color>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -992,4 +992,11 @@
    <string name="permission_denied_tips_mic">为了实现连麦及语音输入等功能，请您允许应用向您获取“麦克风”权限</string>
    <string name="permission_denied_tips_image">访问你的本地内容，以能正常使用图片上传、视频发送等应用功能</string>
    <string name="permission_denied_tips_camera">用于拍摄更新个人头像、发布动态、与客服反馈问题时进行照片和视频的拍摄录制</string>
+    <string name="all_service_gift_room_go">去围观</string>
+
+    <string name="all_service_gift_room_go_title">前往围观</string>
+    <string name="all_service_gift_room_go_tips">是否离开当前房间前往</string>
+    <string name="all_service_gift_room_go_ignore">下次不再出现此提示</string>
+    <string name="all_service_gift_room_go_cancel">留在这</string>
+    <string name="all_service_gift_room_go_go">立即前往</string>
 </resources>
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,5 +28,5 @@ COMPILE_SDK_VERSION=32
 MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=32

-version_name=2.0.0
-version_code=2000
+version_name=2.1.1
+version_code=2101
Author	SHA1	Message	Date
Max	c0bbabaa1c	feat:新增渠道：fir	2024-03-18 18:42:58 +08:00
Max	c97b521d4c	feat:移除AVRoomActivity中的全服礼物飘屏逻辑到BaseActivity	2024-03-18 14:05:29 +08:00
Max	469ee07eeb	feat：同步peko完成礼物飘窗UI优化（同步peko：去掉普通礼物飘窗）	2024-03-18 09:53:59 +08:00
Max	60d274c79a	feat:客服中心改为私聊	2024-03-14 14:31:12 +08:00
Max	a48440209a	fix：修复首页默认选中Tab-bug	2024-03-13 17:39:25 +08:00