UI对稿

app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java

@@ -758,6 +758,7 @@ public class MessageView extends FrameLayout {
                 } else if (chatRoomMessage.getMsgType() == MsgTypeEnum.notification) {
                     // 加上勋章
                     setMsgNotification(chatRoomMessage, tvContent, baseViewHolder.getAdapterPosition());
+                    setVIPMessageBackground(chatRoomMessage, tvContent);
                 } else if (chatRoomMessage.getMsgType() == MsgTypeEnum.custom) {
                     CustomAttachment attachment = (CustomAttachment) chatRoomMessage.getAttachment();
                     int first = attachment.getFirst();
@@ -924,6 +925,7 @@ public class MessageView extends FrameLayout {
                                 break;
                             case CustomAttachment.CUSTOM_MSG_ROOM_FOLLOW:
                                 setRoomFollowOwner(baseViewHolder.getAdapterPosition(), chatRoomMessage, tvContent);
+                                setVIPMessageBackground(chatRoomMessage, tvContent);
                                 break;
                             case CustomAttachment.CUSTOM_MSG_ROOM_FOLLOW_2:
                                 setRoomFollowOwner2(baseViewHolder.getAdapterPosition(), chatRoomMessage, tvContent);
@@ -942,6 +944,7 @@ public class MessageView extends FrameLayout {
                         if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_FOLLOW_ROOM_SUCCESS) {
                             //收藏了房间
                             setFollowRoomTip(tvContent, (RoomTipAttachment) attachment, chatRoomMessage);
+                            setVIPMessageBackground(chatRoomMessage, tvContent);
                         }
                     } else if (first == CUSTOM_MSG_RED_PACKAGE) {
                         if (second == CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG) {

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

@@ -75,7 +75,7 @@ public class AllServiceVipLevelUPDialog extends BaseDialog {
     private void showVipNotifyBySVGA() {
         SpannableBuilder text = new SpannableBuilder()
                 .append("引爆全场！恭喜", new ForegroundColorSpan(Color.WHITE))
-                .append("-", new CircleImageSpan(new ColorDrawable(Color.TRANSPARENT), vipMessageInfo.getAvatar(), ScreenUtil.dip2px(25), ScreenUtil.dip2px(25)))
+                .append("-", new CircleImageSpan(new ColorDrawable(Color.TRANSPARENT), vipMessageInfo.getAvatar(), 50, 50))
                 .append(" " + StringExtensionKt.sub(vipMessageInfo.getNick(), 6) + " ", new ForegroundColorSpan(getContext().getResources().getColor(R.color.notice_nick)))
                 .append("贵族身份升级为" + vipMessageInfo.getCurrVipName(), new ForegroundColorSpan(Color.WHITE)+"!");
 

app/src/main/res/drawable/bg_contribute_entrance.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:angle="180"
-        android:endColor="#80ffb300"
-        android:startColor="#00ffca45"
-        android:type="linear"
-        android:useLevel="true" />
+    <solid android:color="@color/white_transparent_20"/>
     <corners
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="12dp"

app/src/main/res/drawable/bg_contribute_entrance_single_room.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:angle="180"
-        android:endColor="#9C4D00C7"
-        android:startColor="#00AF7CFF"
-        android:type="linear"
-        android:useLevel="true" />
+   <solid android:color="@color/white_transparent_20"/>
     <corners
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="12dp"

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

@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
-            tools:background="@color/red_font">
+            tools:background="@color/blue">
 
             <View
                 android:layout_width="@dimen/dp_15"

app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java

@@ -32,6 +32,7 @@ import com.yizhuan.xchat_android_core.music.model.IPlayerModel;
 import com.yizhuan.xchat_android_core.music.model.PlayerModel;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -234,9 +235,11 @@ public class MusicPlayerView extends FrameLayout implements View.OnClickListener
                 if (DemoCache.readBgmSingleCycle()) {
                     DemoCache.saveBgmSingleCycle(false);
                     musicPlayCycle.setImageResource(R.drawable.icon_music_all_cycle);
+                    SingleToastUtil.showToast("列表循环");
                 } else {
                     DemoCache.saveBgmSingleCycle(true);
                     musicPlayCycle.setImageResource(R.drawable.icon_music_single_cycle);
+                    SingleToastUtil.showToast("单曲循环");
                 }
             default:
                 break;

app/src/module_music/res/drawable/bg_room_music_player.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:angle="180"
-        android:endColor="#8000c0c7"
-        android:startColor="#1affffff"
-        android:type="linear"
-        android:useLevel="true" />
+    <solid android:color="@color/white_transparent_20" />
     <corners
         android:bottomLeftRadius="100dp"
         android:bottomRightRadius="0dp"

app/src/module_music/res/layout/layout_music_player_view.xml

@@ -82,12 +82,12 @@
                     android:id="@+id/voice_seek"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:layout_marginStart="-5dp"
+                    android:layout_marginEnd="-5dp"
                     android:layout_weight="1.0"
                     android:focusable="true"
                     android:maxHeight="3dip"
                     android:minHeight="3dip"
-                    android:layout_marginStart="-5dp"
-                    android:layout_marginEnd="-5dp"
                     android:progressDrawable="@drawable/layer_list_room_music_bar"
                     android:thumb="@drawable/icon_room_voice_point"
                     android:thumbOffset="0dp" />

core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java

@@ -113,7 +113,7 @@ public class XChatConstants {
     /**
      * 公屏第一条提示消息
      */
-    public static final String MESSAGE_VIEW_FIRST_MSG = "封面、背景及内容含低俗、引导、暴露等都会被屏蔽处理，泄露用户隐私、导流第三方平台、欺诈用户等将被封号处理。请珍惜自己的房间哦！";
+    public static final String MESSAGE_VIEW_FIRST_MSG = "平台严禁未成年人直播或打赏，倡导绿色互动，禁止宣传及发布政治、低俗、暴力、色情等违规违法内容，严禁违规交易和诱导欺诈用户，如有违规将对账号进行封禁，发现请及时举报。";
 
     /**
      * 龙珠表情 ID