yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全服礼物UI修改

Browse Source
This commit is contained in:
huangjian
2021-11-01 15:47:34 +08:00
parent 15f0560933
commit af1018df3d
37 changed files with 369 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,14 @@ import android.view.Window;
import android.view.WindowManager;
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_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import java.util.concurrent.TimeUnit;
@@ -49,8 +55,7 @@ public class AllServiceGiftLevelOneDialog extends AllServiceGiftDialog {
//MATCH_PARENT会挡住键盘，
// wrap_parent在小米8又会截掉一点，在华为测试关闭按钮点击不到
//暂时找不到原因，
windowParams.height = getContext().getResources()
.getDimensionPixelOffset(R.dimen.all_service_one_dialog_height);
windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
windowParams.dimAmount = 0.0f;
windowParams.gravity = Gravity.TOP;
windowParams.x = 0;
@@ -60,6 +65,15 @@ public class AllServiceGiftLevelOneDialog extends AllServiceGiftDialog {
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.Event.FULL_GIFT_WATCHING, "全服礼物-前往围观计数");
});
Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
.subscribe(aLong -> {
dismiss();

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

@@ -1,7 +1,9 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.drawable.ColorDrawable;
@@ -57,8 +59,7 @@ public class AllServiceGiftLevelThreeDialog extends AllServiceGiftDialog {
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
WindowManager.LayoutParams windowParams = window.getAttributes();
windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
windowParams.height = getContext().getResources()
.getDimensionPixelOffset(R.dimen.all_service_three_dialog_height);
windowParams.height =WindowManager.LayoutParams.WRAP_CONTENT;
windowParams.dimAmount = 0.0f;
windowParams.gravity = Gravity.TOP;
windowParams.x = 0;
@@ -73,7 +74,7 @@ public class AllServiceGiftLevelThreeDialog extends AllServiceGiftDialog {
binding.giftClose.setOnClickListener(v -> {
dismiss();
});
binding.tvRoomId.setOnClickListener(v -> {
binding.getRoot().setOnClickListener(v -> {
if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
} else {
@@ -88,21 +89,7 @@ public class AllServiceGiftLevelThreeDialog extends AllServiceGiftDialog {
dismiss();
});
binding.setGiftBean(dataBean);
binding.tvRoomId.setVisibility(dataBean.getRoomUid() == 0
|| (AvRoomDataManager.get().mCurrentRoomInfo != null && dataBean.getRoomUid() == AvRoomDataManager.get().mCurrentRoomInfo.getUid())
? View.GONE : View.VISIBLE);
setOnShowListener(dialog -> {
if (dataBean.isSendMsg() && !Objects.equals(dataBean.getMsg(), "")) {
binding.giftMessage.setX(screenWidth);
binding.giftMessage.animate()
.translationXBy(-(screenWidth + binding.giftMessage.getWidth()))
.setDuration((long) dataBean.getNotifyStaySecond() * 1000)
.setInterpolator(new LinearInterpolator())
.start();
} else {
binding.giftMessage.setVisibility(View.GONE);
}
});
binding.tvRoomId.setVisibility(dataBean.getRoomUid() == 0 ? View.GONE : View.VISIBLE);
}
}
}

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

@@ -57,8 +57,7 @@ public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog {
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
WindowManager.LayoutParams windowParams = window.getAttributes();
windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
windowParams.height = getContext().getResources()
.getDimensionPixelOffset(R.dimen.all_service_two_dialog_height);
windowParams.height =WindowManager.LayoutParams.WRAP_CONTENT;
windowParams.dimAmount = 0.0f;
windowParams.gravity = Gravity.TOP;
windowParams.x = 0;
@@ -70,7 +69,7 @@ public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog {
screenWidth = point.x;
}
if (dataBean != null) {
binding.tvRoomId.setOnClickListener(v -> {
binding.getRoot().setOnClickListener(v -> {
if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
} else {
@@ -83,21 +82,6 @@ public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog {
Observable.timer((long) (dataBean.getNotifyStaySecond()), TimeUnit.SECONDS)
.subscribe(aLong -> dismiss());
binding.setGiftBean(dataBean);
binding.tvRoomId.setVisibility(dataBean.getRoomUid() == 0
|| (AvRoomDataManager.get().mCurrentRoomInfo != null && dataBean.getRoomUid() == AvRoomDataManager.get().mCurrentRoomInfo.getUid())
? View.GONE : View.VISIBLE);
setOnShowListener(dialog -> {
if (dataBean.isSendMsg() && !Objects.equals(dataBean.getMsg(), "")) {
binding.tvGiftMessage.setX(screenWidth);
binding.tvGiftMessage.animate()
.translationXBy(-(screenWidth + binding.tvGiftMessage.getWidth()))
.setDuration((long) (dataBean.getNotifyStaySecond() * 1000))
.setInterpolator(new LinearInterpolator())
.start();
} else {
binding.tvGiftMessage.setVisibility(View.GONE);
}
});
}
binding.ivCloseDialogTwo.setOnClickListener(v -> dismiss());

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_avatar_level_one_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_avatar_level_one_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_give_level_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_give_level_1.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_level_one_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 123 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_level_one_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_level_three_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_level_three_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_level_two_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 137 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_level_two_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_nick_one_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xhdpi/all_service_gift_nick_two_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_close_all_server_one.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_close_all_server_one.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_close_all_server_two.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_avatar_level_one_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_avatar_level_three_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_avatar_level_two_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_give_level_1.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_give_level_2.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_give_level_3.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_level_one_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 54 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_level_three_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 72 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_level_three_close.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_level_three_go_to.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_level_two_background.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_level_two_go_to.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_message_background.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
app/src/main/res/drawable-xxhdpi/all_service_gift_message_level_three_background.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_close_all_server_one.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_close_all_server_two.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.9 KiB

97
app/src/main/res/layout/dialog_gift_all_service_level_one.xml
View File

@@ -9,14 +9,17 @@
type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
</data>
<RelativeLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/all_service_one_dialog_height"
android:paddingTop="@dimen/dp_36">
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
tools:background="@color/black">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="148dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/all_service_gift_level_one_background">
<RelativeLayout
@@ -24,8 +27,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="41dp"
android:layout_marginTop="56dp">
android:layout_marginStart="13dp"
android:layout_marginTop="37dp">
<RelativeLayout
android:id="@+id/benefactor_avatar_layout"
@@ -35,48 +38,50 @@
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/benefactor_avatar_background"
android:layout_width="41dp"
android:layout_height="41dp"
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="31dp"
android:layout_height="31dp"
android:layout_centerHorizontal="true"
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="60dp"
android:layout_height="wrap_content"
android:layout_width="66.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="2dp"
android:layout_marginTop="-8dp"
android:background="@drawable/all_service_gift_nick_one_background"
android:ellipsize="end"
android:gravity="center"
android:maxEms="5"
android:maxLength="6"
android:maxLines="1"
android:singleLine="true"
android:text="@{giftBean.sendUserNick}"
android:textColor="@color/white"
android:textSize="11dp"
android:textColor="#FF2F0060"
android:textSize="10dp"
tools:ignore="SpUsage"
tools:text="宫泽艾里斯-宫泽艾里斯-宫泽艾里斯" />
tools:text="宫泽艾里斯宫泽艾里斯-宫泽艾里斯" />
</RelativeLayout>
<ImageView
android:id="@+id/give_text"
android:layout_width="31dp"
android:layout_height="21dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="66dp"
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" />
@@ -85,7 +90,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="56dp"
android:layout_marginTop="37dp"
android:layout_toEndOf="@id/give_text">
<RelativeLayout
@@ -96,37 +101,38 @@
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/receiver_avatar_background"
android:layout_width="41dp"
android:layout_height="41dp"
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="31dp"
android:layout_height="31dp"
android:layout_centerHorizontal="true"
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="60dp"
android:layout_height="wrap_content"
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="2dp"
android:layout_marginTop="-8dp"
android:background="@drawable/all_service_gift_nick_one_background"
android:ellipsize="end"
android:gravity="center"
android:maxEms="5"
android:maxLength="6"
android:maxLines="1"
android:singleLine="true"
android:text="@{giftBean.recvUserNick}"
android:textColor="@color/white"
android:textSize="11dp"
android:textColor="#FF2F0060"
android:textSize="10dp"
tools:text="梅利奥达斯-梅利奥达斯-梅利奥达斯" />
</RelativeLayout>
@@ -137,23 +143,22 @@
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="54dp"
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_centerHorizontal="true"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginTop="70dp"
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="@color/color_FFB606"
android:textSize="21dp"
android:textStyle="bold"
android:textColor="#FFFEF563"
android:textSize="20dp"
tools:ignore="SpUsage"
tools:text="x1314" />
</RelativeLayout>
@@ -162,11 +167,11 @@
android:id="@+id/iv_close_dialog_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginTop="135dp"
android:layout_gravity="end"
android:layout_marginTop="13dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_close_all_server_one" />
</RelativeLayout>
</FrameLayout>
</layout>

324
app/src/main/res/layout/dialog_gift_all_service_level_three.xml
View File

@@ -9,200 +9,184 @@
type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
</data>
<LinearLayout
android:paddingTop="30dp"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/all_service_three_dialog_height"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
tools:background="@color/black">
<FrameLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="172dp">
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:layout_width="match_parent"
android:layout_height="172dp"
android:background="@drawable/all_service_gift_level_three_background">
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_container"
android:id="@+id/benefactor_avatar_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="56dp"
android:layout_marginTop="50dp">
android:layout_centerHorizontal="true">
<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_background"
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_centerInParent="true"
android:src="@drawable/all_service_gift_avatar_level_three_background" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/benefactor_avatar"
avatarUrl="@{giftBean.sendUserAvatar}"
android:layout_width="31dp"
android:layout_height="31dp"
android:layout_centerHorizontal="true"
android:layout_centerInParent="true"
tools:src="@drawable/default_avatar" />
</RelativeLayout>
<TextView
android:id="@+id/benefactor_nick"
android:layout_width="53dp"
android:layout_height="wrap_content"
android:layout_below="@id/benefactor_avatar_layout"
<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"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:gravity="center"
android:maxEms="5"
android:maxLines="1"
android:singleLine="true"
android:text="@{giftBean.sendUserNick}"
android:textColor="@color/white"
android:textSize="11dp"
tools:ignore="SpUsage"
tools:text="宫泽艾里斯-宫泽艾里斯-宫泽艾里斯" />
tools:src="@drawable/default_avatar" />
</RelativeLayout>
<ImageView
android:id="@+id/give_text"
android:layout_width="31dp"
android:layout_height="21dp"
android:layout_gravity="center"
android:layout_marginTop="62dp"
android:layout_toEndOf="@id/benefactor_container"
android:src="@drawable/all_service_gift_give_level_3" />
<RelativeLayout
android:id="@+id/receiver_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="50dp"
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="41dp"
android:layout_height="41dp"
android:layout_centerInParent="true"
android:src="@drawable/all_service_gift_avatar_level_three_background" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/receiver_avatar"
avatarUrl="@{giftBean.recvUserAvatar}"
android:layout_width="31dp"
android:layout_height="31dp"
android:layout_centerHorizontal="true"
android:layout_centerInParent="true"
tools:src="@drawable/default_avatar" />
</RelativeLayout>
<TextView
android:id="@+id/receiver_nick"
android:layout_width="53dp"
android:layout_height="wrap_content"
android:layout_below="@id/receiver_avatar_layout"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:gravity="center"
android:maxEms="5"
android:maxLines="1"
android:singleLine="true"
android:text="@{giftBean.recvUserNick}"
android:textColor="@color/white"
android:textSize="11dp"
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_marginTop="49dp"
android:layout_toEndOf="@+id/receiver_container" />
<TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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_marginStart="@dimen/dp_5"
android:layout_marginTop="64dp"
android:layout_toEndOf="@+id/gift_img"
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:text="@{@string/x + giftBean.giftNum}"
android:textColor="@color/color_FFB606"
android:textSize="21dp"
android:textStyle="bold"
tools:ignore="SpUsage"
tools:text="x1314" />
<TextView
android:id="@+id/tv_room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/all_service_gift_level_three_go_to"
android:gravity="center"
android:text="@{@string/click_go + giftBean.roomErbanNo}"
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="ID:1234567" />
<ImageView
android:id="@+id/gift_close"
android:src="@drawable/all_service_gift_level_three_close"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
tools:text="宫泽艾里斯宫泽艾里斯-宫泽艾里斯" />
</RelativeLayout>
</FrameLayout>
<TextView
android:id="@+id/gift_message"
<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.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="梅利奥达斯梅利奥达斯-梅利奥达斯" />
</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="center"
android:background="@drawable/all_service_gift_message_background"
android:ellipsize="end"
android:gravity="center"
android:maxEms="17"
android:singleLine="true"
android:text="@{giftBean.msg}"
android:textColor="@color/white"
android:textSize="@dimen/dp_14"
tools:ignore="SpUsage"
tools:text="我轻轻地尝一口你说的爱我，还在" />
android:layout_gravity="end"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginTop="34dp"
android:src="@drawable/ic_close_all_server_one" />
</FrameLayout>
</LinearLayout>
</layout>

310
app/src/main/res/layout/dialog_gift_all_service_level_two.xml
View File

@@ -9,198 +9,170 @@
type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
</data>
<LinearLayout
android:paddingTop="30dp"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/all_service_two_dialog_height"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
tools:background="@color/black">
<FrameLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="160dp">
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/all_service_gift_level_two_background">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="160dp"
android:background="@drawable/all_service_gift_level_two_background">
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_container"
android:id="@+id/benefactor_avatar_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="56dp"
android:layout_marginTop="46dp">
android:layout_centerHorizontal="true">
<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_background"
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_centerInParent="true"
android:src="@drawable/all_service_gift_avatar_level_two_background" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/benefactor_avatar"
avatarUrl="@{giftBean.sendUserAvatar}"
android:layout_width="31dp"
android:layout_height="31dp"
android:layout_centerHorizontal="true"
android:layout_centerInParent="true"
tools:src="@drawable/default_avatar" />
</RelativeLayout>
<TextView
android:id="@+id/benefactor_nick"
android:layout_width="53dp"
android:layout_height="wrap_content"
android:layout_below="@id/benefactor_avatar_layout"
<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"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:gravity="center"
android:maxEms="5"
android:maxLines="1"
android:singleLine="true"
android:text="@{giftBean.sendUserNick}"
android:textColor="@color/white"
android:textSize="11dp"
tools:ignore="SpUsage"
tools:text="宫泽艾里斯-宫泽艾里斯-宫泽艾里斯" />
tools:src="@drawable/default_avatar" />
</RelativeLayout>
<ImageView
android:id="@+id/give_text"
android:layout_width="31dp"
android:layout_height="21dp"
android:layout_gravity="center"
android:layout_marginTop="58dp"
android:layout_toEndOf="@id/benefactor_container"
android:src="@drawable/all_service_gift_give_level_2" />
<RelativeLayout
android:id="@+id/receiver_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="46dp"
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="41dp"
android:layout_height="41dp"
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="31dp"
android:layout_height="31dp"
android:layout_centerHorizontal="true"
android:layout_centerInParent="true"
tools:src="@drawable/default_avatar" />
</RelativeLayout>
<TextView
android:id="@+id/receiver_nick"
android:layout_width="53dp"
android:layout_height="wrap_content"
android:layout_below="@id/receiver_avatar_layout"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:gravity="center"
android:maxEms="5"
android:maxLines="1"
android:singleLine="true"
android:text="@{giftBean.recvUserNick}"
android:textColor="@color/white"
android:textSize="11dp"
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_marginTop="45dp"
android:layout_toEndOf="@+id/receiver_container" />
<TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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_marginStart="@dimen/dp_5"
android:layout_marginTop="60dp"
android:layout_toEndOf="@+id/gift_img"
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:text="@{@string/x + giftBean.giftNum}"
android:textColor="@color/color_FFB606"
android:textSize="21dp"
android:textStyle="bold"
tools:ignore="SpUsage"
tools:text="x1314" />
<TextView
android:id="@+id/tv_room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/all_service_gift_level_two_go_to"
android:gravity="center"
android:text="@{@string/click_go + giftBean.roomErbanNo}"
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="ID:1234567" />
<ImageView
android:id="@+id/ivCloseDialogTwo"
android:src="@drawable/ic_close_all_server_two"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_22"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
tools:text="宫泽艾里斯宫泽艾里斯-宫泽艾里斯" />
</RelativeLayout>
</FrameLayout>
<TextView
android:id="@+id/tv_gift_message"
<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="梅利奥达斯梅利奥达斯-梅利奥达斯" />
</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="center"
android:background="@drawable/all_service_gift_message_background"
android:ellipsize="end"
android:gravity="center"
android:maxEms="17"
android:singleLine="true"
android:text="@{giftBean.msg}"
android:textColor="@color/white"
android:textSize="@dimen/dp_14"
tools:ignore="SpUsage"
tools:text="我轻轻地尝一口你说的爱我，还在" />
</LinearLayout>
android:layout_gravity="end"
android:layout_marginTop="10dp"
android:layout_marginEnd="11dp"
android:src="@drawable/ic_close_all_server_one" />
</FrameLayout>
</layout>