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
2022-10-09 14:18:53 +08:00
parent 81050e89a7
commit 349f6d9d4e
29 changed files with 125 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/com/mango/moshen/avroom/widget/MessageView.java
View File

@@ -265,10 +265,10 @@ public class MessageView extends FrameLayout {
@SuppressLint("ClickableViewAccessibility")
private void init(Context context) {
whiteColor = ContextCompat.getColor(context, R.color.white);
whiteColor = ContextCompat.getColor(context, R.color.white_transparent_70);
greyColor = ContextCompat.getColor(context, R.color.white_transparent_50);
roomTipNickColor = ContextCompat.getColor(context, R.color.color_FEE057);
roomTipColor = ContextCompat.getColor(context, R.color.color_FEE057);
roomTipNickColor = ContextCompat.getColor(context, R.color.color_ffbc51);
roomTipColor = ContextCompat.getColor(context, R.color.color_ffbc51);
paddingWidth = Utils.dip2px(context, 11);
paddingHeight = Utils.dip2px(context, 6);
badgeWidth = Utils.dip2px(context, 15);
@@ -747,7 +747,7 @@ public class MessageView extends FrameLayout {
if ("礼物特效".equals(contentText)) {
setUpdateGiftEffectMsg(tvContent);
} else if (XChatConstants.ROOM_INTRODUCTION.equals(contentText) || contentText.contains(IMNetEaseManager.ROOM_INTRO_TAG)) {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.white));
tvContent.setTextColor(whiteColor);
tvContent.setText(contentText);
} else if (XChatConstants.DATING_TIPS_OPEN.equals(contentText) ||
contentText.contains(XChatConstants.DATING_TIPS_IN) ||
@@ -757,7 +757,7 @@ public class MessageView extends FrameLayout {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_fe5d7f));
tvContent.setText(contentText);
} else {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.appColor));
tvContent.setTextColor(roomTipNickColor);
tvContent.setText(chatRoomMessage.getContent());
}
} else if (chatRoomMessage.getMsgType() == MsgTypeEnum.text) {
@@ -873,8 +873,7 @@ public class MessageView extends FrameLayout {
}
} else if (first == CustomAttachment.CUSTOM_MSG_BOX) {
setBoxMeMsg(chatRoomMessage, tvContent);
}
else if (first == CustomAttachment.CUSTOM_MSG_RADISH) {
} else if (first == CustomAttachment.CUSTOM_MSG_RADISH) {
setRadishMeMsg(chatRoomMessage, tvContent);
} else if (first == CustomAttachment.CUSTOM_MSG_KTV) {
setKtvMsg(chatRoomMessage, tvContent);
@@ -1354,7 +1353,12 @@ public class MessageView extends FrameLayout {
}, new ForegroundColorSpan(roomTipNickColor))
.append("关注房主不迷路哦")
.append(follow ? "已关注" : "关注",
new RadiusBackgroundSpan(follow ? Color.parseColor("#4cFFFFFF") : ContextCompat.getColor(tvContent.getContext(), R.color.appColor), SizeUtils.dp2px(tvContent.getContext(), 8), follow ? Color.parseColor("#D8FFFFFF") : Color.WHITE, (int) (tvContent.getTextSize() - SizeUtils.sp2px(tvContent.getContext(), 2) - .5f), SizeUtils.dp2px(tvContent.getContext(), 8), SizeUtils.dp2px(tvContent.getContext(), 4)),
new RadiusBackgroundSpan(
follow ? Color.parseColor("#4cFFFFFF") : ContextCompat.getColor(tvContent.getContext(), R.color.appColor),
SizeUtils.dp2px(tvContent.getContext(), 8),
follow ? Color.parseColor("#D8FFFFFF") : Color.WHITE,
(int) (tvContent.getTextSize() - SizeUtils.sp2px(tvContent.getContext(), 2) - .5f),
SizeUtils.dp2px(tvContent.getContext(), 8), SizeUtils.dp2px(tvContent.getContext(), 4)),
follow ? null : new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -1378,10 +1382,12 @@ public class MessageView extends FrameLayout {
if (!(chatRoomMessage.getAttachment() instanceof RoomFollowOwnerAttachment2)) {
return;
}
tvContent.setBackground(null);
tvContent.setTextColor(Color.WHITE);
tvContent.setPadding(0, 0, 0, 0);
RoomFollowOwnerAttachment2 roomFollowOwnerAttachment = (RoomFollowOwnerAttachment2) chatRoomMessage.getAttachment();
SpannableBuilder append = new SpannableBuilder(tvContent)
.append(mContext.getResources().getDrawable(R.drawable.bg_follow), ScreenUtil.dip2px(190), ScreenUtil.dip2px(40));
.append(mContext.getResources().getDrawable(R.drawable.bg_follow), ScreenUtil.dip2px(228), ScreenUtil.dip2px(34));
tvContent.setText(append.build());
}
@@ -1904,7 +1910,7 @@ public class MessageView extends FrameLayout {
addCommonTag(chatRoomMessage, text, tvContent);
String nickName = extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick());
text.append(nickName, new ForegroundColorSpan(greyColor))
.append(": " + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(": " + chatRoomMessage.getContent(), new ForegroundColorSpan(whiteColor));
List<String> atUids = ExtensionUtil.getListExtension(chatRoomMessage, UserInfo.AT_UIDS);
List<String> atNames = ExtensionUtil.getListExtension(chatRoomMessage, UserInfo.AT_NAMES);
if (!ListUtils.isListEmpty(atUids) && !ListUtils.isListEmpty(atNames)) {
@@ -2097,9 +2103,9 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 全麦送出 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(" 全麦送出 ", new ForegroundColorSpan(whiteColor))
.append(giftInfo == null ? "" : giftInfo.getGiftUrl(), giftLength, giftLength)
.append("X" + giftAttachment.getMultiGiftReceiveInfo().getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append("X" + giftAttachment.getMultiGiftReceiveInfo().getGiftNum(), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -2133,9 +2139,9 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 全麦送出 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(" 全麦送出 ", new ForegroundColorSpan(whiteColor));
text.append(luckyGiftInfo.getGiftName() + "给", new ForegroundColorSpan(getResources().getColor(R.color.white)))
text.append(luckyGiftInfo.getGiftName() + "给", new ForegroundColorSpan(whiteColor))
.append(luckyGiftInfo.getUser().getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -2149,7 +2155,7 @@ public class MessageView extends FrameLayout {
if (luckyGiftList.getGiftInfo() == null) continue;
text.append("价值" + luckyGiftList.getGiftInfo().getGoldPrice() + "钻石的")
.append(luckyGiftList.getGiftInfo().getGiftUrl(), giftLength, giftLength)
.append("X" + luckyGiftList.getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append("X" + luckyGiftList.getGiftNum(), new ForegroundColorSpan(whiteColor))
.append("、");
}
Editable msg = text.builder;
@@ -2188,9 +2194,9 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 送出 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(" 送出 ", new ForegroundColorSpan(whiteColor));
text.append(luckyGiftInfo.getGiftName() + "给", new ForegroundColorSpan(getResources().getColor(R.color.white)))
text.append(luckyGiftInfo.getGiftName() + "给", new ForegroundColorSpan(whiteColor))
.append(luckyGiftInfo.getUser().getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -2204,7 +2210,7 @@ public class MessageView extends FrameLayout {
if (luckyGiftList.getGiftInfo() == null) continue;
text.append("价值" + luckyGiftList.getGiftInfo().getGoldPrice() + "钻石的礼物")
.append(luckyGiftList.getGiftInfo().getGiftUrl(), giftLength, giftLength)
.append("X" + luckyGiftList.getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append("X" + luckyGiftList.getGiftNum(), new ForegroundColorSpan(whiteColor))
.append("、");
}
@@ -2238,7 +2244,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 送给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(" 送给 ", new ForegroundColorSpan(whiteColor));
for (GiftReceiver targetUser : attachment.getGiftMultiReceiverInfo().getTargetUsers()) {
text.append(targetUser.getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@@ -2255,7 +2261,7 @@ public class MessageView extends FrameLayout {
Editable msg = text.builder;
msg.delete(msg.length() - 1, msg.length());
text.append(giftInfo == null ? "" : giftInfo.getGiftUrl(), giftLength, giftLength)
.append(" X" + attachment.getGiftMultiReceiverInfo().getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(" X" + attachment.getGiftMultiReceiverInfo().getGiftNum(), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -2284,9 +2290,9 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 全麦施魔法 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(" 全麦施魔法 ", new ForegroundColorSpan(whiteColor))
.append(magicInfo == null ? "" : TextUtils.isEmpty(magicInfo.getIcon()) ? "" : magicInfo.getIcon(), giftLength, giftLength)
.append(showEffect ? " 并 " : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(showEffect ? " 并 " : "", new ForegroundColorSpan(whiteColor))
.append(showEffect ? " 触发暴击 " : "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
@@ -2318,7 +2324,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(" 给 ", new ForegroundColorSpan(whiteColor));
for (MagicReceiver targetUser : magicMultiReceiverInfo.getTargetUsers()) {
text.append(targetUser.getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@@ -2335,10 +2341,10 @@ public class MessageView extends FrameLayout {
Editable msg = text.builder;
msg.delete(msg.length() - 1, msg.length());
text.append(" 施魔法 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
text.append(" 施魔法 ", new ForegroundColorSpan(whiteColor))
.append(magicInfo == null ? "" : TextUtils.isEmpty(magicInfo.getIcon()) ? "" : magicInfo.getIcon(), giftLength, giftLength)
.append(" X" + magicMultiReceiverInfo.getNumber(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(showEffect ? " 并 " : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(" X" + magicMultiReceiverInfo.getNumber(), new ForegroundColorSpan(whiteColor))
.append(showEffect ? " 并 " : "", new ForegroundColorSpan(whiteColor))
.append(showEffect ? " 触发暴击 " : "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
@@ -2371,7 +2377,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(" 给 ", new ForegroundColorSpan(whiteColor))
.append(targetNick, new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -2381,9 +2387,9 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 施魔法 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(" 施魔法 ", new ForegroundColorSpan(whiteColor))
.append(magicInfo == null ? "" : TextUtils.isEmpty(magicInfo.getIcon()) ? "" : magicInfo.getIcon(), giftLength, giftLength)
.append(showEffect ? " 并 " : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(showEffect ? " 并 " : "", new ForegroundColorSpan(whiteColor))
.append(showEffect ? " 触发暴击 " : "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
@@ -2414,7 +2420,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 送给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(" 送给 ", new ForegroundColorSpan(whiteColor))
.append(targetNick, new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -2425,7 +2431,7 @@ public class MessageView extends FrameLayout {
}
})
.append(giftReceiveInfo.getGift() == null ? "" : giftReceiveInfo.getGift().getGiftUrl(), giftLength, giftLength)
.append(num, new ForegroundColorSpan(getResources().getColor(R.color.white)));
.append(num, new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());

BIN
app/src/main/res/drawable-xhdpi/bg_follow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_room_pk_order.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_lock_micro.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/icon_room_lock_micro_boss.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/icon_room_send_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_send_gift_first_charge.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_single_lock_micro.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_single_up_micro.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 18 KiB

8
app/src/main/res/drawable/bg_contribute_entrance.xml
View File

@@ -3,8 +3,8 @@
android:shape="rectangle">
<solid android:color="@color/white_transparent_20" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="12dp"
android:topLeftRadius="0dp"
android:topRightRadius="12dp" />
android:bottomLeftRadius="12dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="12dp"
android:topRightRadius="0dp" />
</shape>

8
app/src/main/res/drawable/bg_contribute_entrance_single_room.xml
View File

@@ -3,8 +3,8 @@
android:shape="rectangle">
<solid android:color="@color/white_transparent_20"/>
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="12dp"
android:topLeftRadius="0dp"
android:topRightRadius="12dp" />
android:bottomLeftRadius="12dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="12dp"
android:topRightRadius="0dp" />
</shape>

13
app/src/main/res/drawable/bg_single_room_rank_entrance.xml
View File

@@ -2,12 +2,13 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white_transparent_20" />
<gradient
android:angle="270"
android:endColor="#1709CC"
android:startColor="#2B00CA"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="100dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="100dp"
android:topRightRadius="0dp" />
<corners android:radius="20dp" />
</shape>

2
app/src/main/res/drawable/shape_room_message_bg.xml
View File

@@ -10,6 +10,6 @@
android:right="6dp"
android:top="2dp" />-->
<corners android:radius="14dp" /> <!-- 圆角的程度 -->
<corners android:radius="8dp" /> <!-- 圆角的程度 -->
</shape>

4
app/src/main/res/layout/list_item_micro.xml
View File

@@ -19,8 +19,8 @@
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_halo"
android:layout_width="83dp"
android:layout_height="83dp"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center" />
<com.mango.moshen.common.widget.CircleImageView

8
app/src/main/res/values/dimens.xml
View File

@@ -172,11 +172,11 @@
<!-- 头像和头饰比例是3:4 -->
<!-- 房间普通麦位 -->
<dimen name="dp_room_normal_mic_radius">55dp</dimen>
<dimen name="dp_room_normal_mic_header_wear_radius">73dp</dimen>
<dimen name="dp_room_normal_mic_radius">50dp</dimen>
<dimen name="dp_room_normal_mic_header_wear_radius">65dp</dimen>
<!-- 房间boss麦位 -->
<dimen name="dp_room_boss_mic_radius">58dp</dimen>
<dimen name="dp_room_boss_mic_header_wear_radius">76dp</dimen>
<dimen name="dp_room_boss_mic_radius">50dp</dimen>
<dimen name="dp_room_boss_mic_header_wear_radius">65dp</dimen>
<dimen name="dp_35">35dp</dimen>
<dimen name="sp_9">9sp</dimen>
<dimen name="dp_33">33dp</dimen>

37
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -38,6 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignTop="@id/micro_view"
android:layout_alignParentEnd="true"
android:background="@drawable/bg_contribute_entrance"
android:gravity="center_vertical"
android:onClick="@{click}"
@@ -47,32 +48,37 @@
android:id="@+id/iv_rank_0"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="4dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_1"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-12dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_2"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-12dp"
android:src="@drawable/default_avatar" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:includeFontPadding="false"
android:text="房间榜"
android:textColor="@color/white"
android:textSize="12dp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginEnd="4dp"
android:scaleType="center"
android:src="@drawable/arrow_right_white" />
@@ -80,21 +86,22 @@
<LinearLayout
android:id="@+id/ll_room_pk_order"
android:layout_width="130dp"
android:layout_height="34dp"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_below="@id/contribute_list"
android:layout_alignParentEnd="true"
android:layout_marginTop="5dp"
android:background="@drawable/bg_room_pk_order"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_marginTop="17dp"
android:includeFontPadding="false"
android:text="距离下一场PK开始"
android:text="下一场PK"
android:textColor="@color/white"
android:textSize="10sp" />
@@ -102,7 +109,7 @@
android:id="@+id/tv_room_pk_order_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginTop="2dp"
android:includeFontPadding="false"
android:textColor="#fffff333"
android:textSize="10sp"
@@ -112,23 +119,23 @@
<TextView
android:id="@+id/tv_hour_rank"
android:layout_width="76dp"
android:layout_height="24dp"
android:layout_width="wrap_content"
android:layout_height="22dp"
android:layout_alignTop="@id/contribute_list"
android:layout_alignParentEnd="true"
android:layout_marginStart="15dp"
android:background="@drawable/bg_single_room_rank_entrance"
android:drawableStart="@drawable/ic_single_room_rank"
android:drawablePadding="4dp"
android:drawablePadding="3dp"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:onClick="@{click}"
android:paddingStart="1dp"
android:paddingEnd="6dp"
android:text="小时榜"
android:textColor="@color/white"
android:textSize="12dp"
android:textSize="10dp"
android:visibility="visible" />
<LinearLayout
android:id="@+id/ll_dating_step"
android:layout_width="wrap_content"

74
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -50,38 +50,44 @@
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_rank_0"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="4dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_1"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-12dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_2"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-12dp"
android:src="@drawable/default_avatar" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginStart="4dp"
android:includeFontPadding="false"
android:text="主播榜"
android:textColor="@color/white"
android:textSize="12dp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginEnd="4dp"
android:scaleType="center"
android:src="@drawable/arrow_right_white" />
@@ -143,18 +149,20 @@
<TextView
android:id="@+id/tv_hour_rank"
android:layout_width="76dp"
android:layout_width="wrap_content"
android:layout_height="22dp"
android:layout_marginStart="15dp"
android:layout_marginTop="6dp"
android:background="@drawable/bg_single_room_rank_entrance"
android:drawableStart="@drawable/ic_single_room_rank"
android:drawablePadding="4dp"
android:drawablePadding="3dp"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:paddingEnd="6dp"
android:text="小时榜"
android:textColor="@color/white"
android:textSize="12dp"
app:layout_constraintEnd_toEndOf="parent"
android:textSize="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/contribute_list" />
<FrameLayout
@@ -208,6 +216,31 @@
app:layout_constraintEnd_toEndOf="parent"
tools:contentDescription="首充红包" />
<com.mango.moshen.avroom.widget.MessageView
android:id="@+id/message_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="90dp"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_micro" />
<com.mango.moshen.ui.widget.rollviewpager.RollPagerView
android:id="@+id/activity_img"
android:layout_width="65dp"
android:layout_height="75dp"
android:layout_below="@id/barrier_micro"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_micro"
app:rollviewpager_hint_gravity="center" />
<LinearLayout
android:id="@+id/ll_box"
android:layout_width="wrap_content"
@@ -252,31 +285,6 @@
</LinearLayout>
<com.mango.moshen.avroom.widget.MessageView
android:id="@+id/message_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="90dp"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_micro" />
<com.mango.moshen.ui.widget.rollviewpager.RollPagerView
android:id="@+id/activity_img"
android:layout_width="65dp"
android:layout_height="75dp"
android:layout_below="@id/barrier_micro"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_micro"
app:rollviewpager_hint_gravity="center" />
<RelativeLayout
android:id="@+id/input_layout"

2
gradle.properties
View File

@@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=4096m
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m
org.gradle.daemon=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit