feat:完善礼物飘窗文本样式

app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java

@@ -83,10 +83,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
 import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
 import com.yizhuan.erban.ui.widget.NobleOpenNoticeView;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelOneDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelThreeDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelTwoDialog;
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelDialog;
 import com.yizhuan.erban.ui.widget.dialog.MonsterDialog;
 import com.yizhuan.erban.utils.UserUtils;
 import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
@@ -151,7 +148,6 @@ import com.yizhuan.xchat_android_core.utils.LogUtils;
 import com.yizhuan.xchat_android_core.utils.StringUtils;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
 import com.yizhuan.xchat_android_library.rxbus.RxBus;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 import com.yizhuan.xchat_android_library.utils.UIUtils;
@@ -1305,7 +1301,9 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
 
     private void showGiftDialog() {
         if (giftList.size() == 0) return;
-        giftDialog = generateAllServiceGiftDialog(this, giftList.peekFirst());
+        AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
+        if (data == null) return;
+        giftDialog = generateAllServiceGiftDialog(this, data);
         giftDialog.setOnDismissListener(dialog -> {
             giftList.pollFirst();
             AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
@@ -1320,22 +1318,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         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);
-        }
+    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
+        return new AllServiceGiftLevelDialog(context, dataBean);
     }
 
-
     @Override
     protected void onPause() {
         super.onPause();

app/src/main/java/com/yizhuan/erban/base/BaseActivity.java

@@ -45,6 +45,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
@@ -90,10 +91,7 @@ import com.yizhuan.erban.ui.setting.ResetPasswordActivity;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
 import com.yizhuan.erban.ui.widget.DefaultToolBar;
 import com.yizhuan.erban.ui.widget.dialog.AllPlayEffectDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelOneDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelThreeDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelTwoDialog;
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelDialog;
 import com.yizhuan.erban.ui.widget.dialog.AllServiceVipLevelUPDialog;
 import com.yizhuan.erban.ui.widget.dialog.OpenNobleGlobalNoticeDialog;
 import com.yizhuan.erban.utils.UserUtils;
@@ -130,7 +128,6 @@ import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
 import com.yizhuan.xchat_android_library.common.util.DeviceUtil;
 import com.yizhuan.xchat_android_library.rxbus.RxBus;
 import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
 import com.yizhuan.xchat_android_library.utils.NetworkUtils;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -1202,8 +1199,14 @@ public abstract class BaseActivity extends RxAppCompatActivity
 
     private void showGiftDialog() {
         if (giftList.size() == 0) return;
-        if (giftList.peekFirst() != null && !giftList.peekFirst().isHomeShow()) return;
-        giftDialog = generateAllServiceGiftDialog(this, giftList.peekFirst());
+        AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
+        if (data == null) {
+            return;
+        }
+        if (!data.isHomeShow()) {
+            return;
+        }
+        giftDialog = generateAllServiceGiftDialog(this, data);
         giftDialog.setOnDismissListener(dialog -> {
             giftList.pollFirst();
             AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
@@ -1222,19 +1225,8 @@ public abstract class BaseActivity extends RxAppCompatActivity
         }
     }
 
-    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);
-        }
+    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
+        return new AllServiceGiftLevelDialog(context, dataBean);
     }
 
     public void onGrabApprenticesEvent(GrabApprenticesEvent event) {

app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt

@@ -217,5 +217,7 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
 
     private fun debug() {
 //        RedPackageOpenDialog2().show(this)
+        val json = "{\"first\":3,\"second\":32,\"data\":{\"recvUserUid\":2735,\"recvUserAvatar\":\"https://img.pekolive.com/default_avatar.png\",\"recvUserNick\":\"66丢丢丢丢丢多多多的hhhh\",\"sendUserNick\":\"11的ass\",\"sendUserAvatar\":\"http://beta.img.pekolive.com/Fk7aur-1RBqKXC-qqBwMTjivZ3lV?imageslim\",\"sendUserUid\":2737,\"giftUrl\":\"http://beta.img.pekolive.com/Fn6h_gPFD5MwA-Ql_kcWqNpKp0JM?imageslim\",\"giftName\":\"幽靈糖果\",\"giftId\":2075,\"giftNum\":10239,\"giftGolds\":33440,\"notifyStaySecond\":5,\"isHomeShow\":true,\"isSkipRoom\":true,\"isFullScreen\":false,\"isSendMsg\":false,\"roomUid\":2737,\"roomErbanNo\":11,\"roomTitle\":\"11的工会经费吃不吃女家具v家\",\"levelNum\":2}}"
+        onReceivedNimBroadcastMessage(json)
     }
 }

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java

@@ -1,78 +0,0 @@
-package com.yizhuan.erban.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.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceBinding;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
-
-/**
- * Created by huangmeng1 on 2018/3/29.
- */
-
-public class AllServiceGiftDialog extends BaseDialog {
-
-    public static final int ALL_SERVICE_GIFT_LEVEL_1 = 1;
-    public static final int ALL_SERVICE_GIFT_LEVEL_2 = 2;
-    public static final int ALL_SERVICE_GIFT_LEVEL_3 = 3;
-
-    protected int giftLevel = 1;
-    protected AllServiceGiftProtocol.DataBean dataBean;
-    private DialogGiftAllServiceBinding binding;
-
-    public AllServiceGiftDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        this(context, 0);
-        this.dataBean = dataBean;
-    }
-
-    public AllServiceGiftDialog(Context context, int theme, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, theme);
-        this.dataBean = dataBean;
-    }
-
-    public AllServiceGiftDialog(Context context, int theme) {
-        super(context, theme);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service, 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;
-            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = SizeUtils.dp2px(getContext(), 62);
-            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.tvRoomId.setOnClickListener(v -> AVRoomActivity.start(getContext(), dataBean.getRoomErbanNo()));
-            binding.setGiftBean(dataBean);
-        }
-    }
-
-}

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt

@@ -0,0 +1,168 @@
+package com.yizhuan.erban.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.databinding.DataBindingUtil
+import com.chuhai.utils.ktx.getColorById
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.ktx.toStringRes
+import com.chuhai.utils.spannable.SpannableTextBuilder
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.activity.AVRoomActivity
+import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelBinding
+import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity
+import com.yizhuan.xchat_android_core.initial.InitialModel
+import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol
+import com.yizhuan.xchat_android_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.tvRoomGo.singleClick {
+            if (data.roomUid == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) {
+                PublicChatHallHomeActivity.openPublicChatHallPage(context)
+            } else {
+                AVRoomActivity.start(context, data.roomUid)
+            }
+        }
+        binding.giftBean = data
+        SpannableTextBuilder(binding.tvMessage)
+            .appendText(
+                data.sendUserNick,
+                binding.tvMessage.context.getColorById(R.color.color_FFE468)
+            )
+            .appendText(
+                R.string.avroom_widget_messageview_0137.toStringRes(),
+                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() }
+    }
+
+    /**
+     * 添加跑马灯
+     * 以及反射一些参数影响跑马灯
+     */
+    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
+        }
+    }
+
+    override fun dismiss() {
+        super.dismiss()
+        if (disposable?.isDisposed != true) {
+            disposable?.dispose()
+        }
+        disposable = null
+    }
+}

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java

@@ -1,82 +0,0 @@
-package com.yizhuan.erban.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.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelOneBinding;
-import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_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());
-                }
-            });
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-        }
-        binding.ivCloseDialogOne.setOnClickListener(v -> dismiss());
-    }
-}

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java

@@ -1,86 +0,0 @@
-package com.yizhuan.erban.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.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelThreeBinding;
-import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_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());
-                }
-            });
-            // 设置定时器
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-        }
-    }
-}

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java

@@ -1,85 +0,0 @@
-package com.yizhuan.erban.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.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelTwoBinding;
-import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_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());
-                }
-            });
-            // 设置定时器
-            Observable.timer((long) (dataBean.getNotifyStaySecond()), TimeUnit.SECONDS)
-                    .subscribe(aLong -> dismiss());
-            binding.setGiftBean(dataBean);
-        }
-
-        binding.ivCloseDialogTwo.setOnClickListener(v -> dismiss());
-
-    }
-
-}

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>

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="#FF87152D" />
+    <stroke
+        android:width="1dp"
+        android:color="#FFFFED77" />
+    <corners android:radius="8.5dp" />
+</shape>

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="#FF49157D" />
+    <stroke
+        android:width="1dp"
+        android:color="#FFFE9FFF" />
+    <corners android:radius="8.5dp" />
+</shape>

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>

app/src/main/res/layout/dialog_gift_all_service.xml

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-
-        <variable
-            name="giftBean"
-            type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="128dp"
-            android:background="@drawable/img_bg_all_service_gift">
-
-            <TextView
-                android:id="@+id/tv_room_id"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="35dp"
-                android:layout_marginTop="28dp"
-                android:textSize="12dp"
-                android:textColor="@color/white"
-                android:gravity="center"
-                android:visibility="gone"
-                android:text="@{@string/click_go + giftBean.roomErbanNo + @string/circusee}"
-                android:background="@drawable/img_bg_circusee" />
-
-            <LinearLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="50dp"
-                android:layout_marginTop="@dimen/dp_40"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <com.yizhuan.erban.common.widget.CircleImageView
-                    android:id="@+id/benefactor_avatar"
-                    avatarUrl="@{giftBean.sendUserAvatar}"
-                    android:layout_width="31dp"
-                    android:layout_height="31dp" />
-
-                <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="wrap_content"
-                    android:maxWidth="50dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/benefactor_avatar"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="2dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@{giftBean.sendUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/give_text"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginHorizontal="10dp"
-                android:layout_toRightOf="@id/benefactor_container"
-                android:gravity="center_vertical"
-                android:paddingTop="30dp"
-                android:text="@string/layout_dialog_gift_all_service_01"
-                android:textColor="#FEFEFE"
-                android:textSize="12dp" />
-
-            <LinearLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/dp_40"
-                android:layout_toRightOf="@id/give_text"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <com.yizhuan.erban.common.widget.CircleImageView
-                    android:id="@+id/receiver_avatar"
-                    avatarUrl="@{giftBean.recvUserAvatar}"
-                    android:layout_width="31dp"
-                    android:layout_height="31dp" />
-
-                <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="wrap_content"
-                    android:maxWidth="50dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/receiver_avatar"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="2dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="45dp"
-                android:gravity="center_vertical"
-                android:paddingTop="30dp"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFF600"
-                android:textSize="18dp"
-                android:textStyle="bold" />
-
-            <FrameLayout
-                android:id="@+id/gift_light_container"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginRight="@dimen/dp_10"
-                android:layout_toLeftOf="@id/gift_number"
-                android:paddingTop="30dp">
-
-                <ImageView
-                    android:id="@+id/gift_img"
-                    nomalUrl="@{giftBean.giftUrl}"
-                    android:layout_width="65dp"
-                    android:layout_height="63dp"
-                    android:layout_gravity="center" />
-            </FrameLayout>
-        </RelativeLayout>
-    </FrameLayout>
-</layout>

app/src/main/res/layout/dialog_gift_all_service_level.xml

@@ -0,0 +1,137 @@
+<?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.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_root"
+        android:layout_width="match_parent"
+        android:layout_height="69dp"
+        android:background="@drawable/all_service_gift_bg_1">
+
+        <com.yizhuan.erban.common.widget.CircleImageView
+            android:id="@+id/iv_avatar_bg"
+            android:layout_width="88dp"
+            android:layout_height="69dp"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
+            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" />
+
+        <com.yizhuan.erban.common.widget.CircleImageView
+            android:id="@+id/iv_avatar"
+            avatarUrl="@{giftBean.sendUserAvatar}"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:layout_marginStart="22.5dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            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:layout_marginBottom="5dp"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:gravity="center_vertical"
+            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_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="XXXXXXXX" />
+
+        <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="64dp"
+            android:layout_height="64dp"
+            android:layout_marginEnd="2dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tv_count"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:background="@color/black" />
+
+        <TextView
+            android:id="@+id/tv_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:ellipsize="end"
+            android:fontFamily="sans-serif-medium"
+            android:maxWidth="120dp"
+            android:singleLine="true"
+            android:text="@{`X` + giftBean.giftNum}"
+            android:textColor="@color/color_FFE468"
+            android:textSize="16dp"
+            android:textStyle="italic|bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="X100000000000000" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

app/src/main/res/layout/dialog_gift_all_service_level_one.xml

@@ -1,183 +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.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="80dp"
-            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.yizhuan.erban.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.yizhuan.erban.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="@string/layout_dialog_gift_all_service_level_one_01" />
-
-                </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.yizhuan.erban.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.yizhuan.erban.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="@string/layout_dialog_gift_all_service_level_one_02" />
-
-                </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_10"
-                    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>
-
-    </FrameLayout>
-
-</layout>

app/src/main/res/layout/dialog_gift_all_service_level_three.xml

@@ -1,185 +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.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="80dp"
-            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">
-
-                <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.yizhuan.erban.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.yizhuan.erban.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="@string/layout_dialog_gift_all_service_level_three_01" />
-
-                </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="75dp"
-                    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.yizhuan.erban.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.yizhuan.erban.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="@string/layout_dialog_gift_all_service_level_three_02" />
-
-                </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>
-
-    </FrameLayout>
-
-</layout>

app/src/main/res/layout/dialog_gift_all_service_level_two.xml

@@ -1,185 +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.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="80dp"
-            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.yizhuan.erban.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.yizhuan.erban.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="@string/layout_dialog_gift_all_service_level_two_01" />
-
-                </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.yizhuan.erban.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.yizhuan.erban.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="@string/layout_dialog_gift_all_service_level_two_02" />
-
-                </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>
-
-    </FrameLayout>
-
-</layout>

app/src/main/res/values/colors.xml

@@ -710,4 +710,6 @@
     <color name="color_BF461F">#FFBF461F</color>
     <color name="color_FFF87A">#FFFFF87A</color>
     <color name="color_ffffff_30">#4CFFFFFF</color>
+    <color name="color_FFE468">#FFFFE468</color>
+
 </resources>

app/src/main/res/values/strings.xml

@@ -5142,6 +5142,7 @@
     <string name="unlock_gift">解鎖禮物</string>
     <string name="room_album_type_no_need_unlocked_gift_tips">當前無需選擇解鎖禮物</string>
     <string name="room_album_type_choose_unlocked_gift_tips">選擇解鎖禮物</string>
+    <string name="all_service_gift_room_go">去圍觀</string>
 
     <string name="red_package_type_unlimited_name">無門檻紅包</string>
     <string name="red_package_type_unlimited_tips">所有人均可參與</string>