礼物界面，直播间下部按钮布局样式的更改

common/src/main/res/layout/view_live_system_message.xml

@@ -83,7 +83,7 @@
                 android:layout_gravity="end"
                 android:layout_marginEnd="12dp"
                 android:drawablePadding="4dp"
-                android:drawableEnd="@mipmap/icon_more"
+                android:drawableEnd="@mipmap/icon_more_live_menu"
                 android:gravity="center_vertical"
                 android:text="@string/click_to_view"
                 android:textColor="#ff8c8c8c"

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

@@ -1085,6 +1085,7 @@
     <string name="sign_up_for">註冊PD LIVE</string>
     <string name="register_and_log_in">註冊並登錄</string>
     <string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
+    <string name="say_something3">說點什麽吧...</string>
 
 
 

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -289,8 +289,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
 
             }
         });
-        //底部礼物弹窗
+//        //底部礼物弹窗
-        ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
+//        ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
 
         ViewClicksAntiShake.clicksAntiShake(giftImage, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
@@ -302,10 +302,10 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         Locale locale = mContext.getResources().getConfiguration().locale;
         String language = locale.getLanguage();
 
-        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_new_people_cn : R.mipmap.live_icon_newpeople_en, liveNewPeople);
+//        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_new_people_cn : R.mipmap.live_icon_newpeople_en, liveNewPeople);
-        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_role : R.mipmap.live_icon_role_en, mRole);
+//        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_role : R.mipmap.live_icon_role_en, mRole);
-        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_play : R.mipmap.live_icon_play_en, mPlay);
+//        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_play : R.mipmap.live_icon_play_en, mPlay);
-        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_cheat : R.mipmap.live_icon_cheat_en, mCheat);
+//        ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_cheat : R.mipmap.live_icon_cheat_en, mCheat);
 
         voiceButton.setOnTouchListener((v, event) -> {
             if (event.getAction() == MotionEvent.ACTION_DOWN) {

live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

@@ -386,7 +386,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                         int anchorClarityType = data.getClarityType() - 1;
                         if (userClarityType != anchorClarityType) {
                             mLivePlayViewHolder.play(mLiveBean.getPull(), userClarityType);
-
                         } else {
                             mLivePlayViewHolder.play(mLiveBean.getPull(), LiveRoomPlayViewHolder.PLAY_MODEL_DEF);
                         }

live/src/main/res/drawable/background_ff5075.xml

@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="50dp" />
-            <solid android:color="#ff5075" />
+            <solid android:color="#FF5533" />
         </shape>
     </item>
 </selector

live/src/main/res/drawable/bg_live_gift_choose2.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:bottomLeftRadius="15dp"
+        android:topLeftRadius="15dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#ED6B41" />
+</shape>

live/src/main/res/drawable/bg_live_gift_item.xml

@@ -2,9 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape>
-            <stroke android:color="@color/yellow5" android:width="0.5dp"/>
+            <stroke android:color="#FFBE41" android:width="0.5dp"/>
             <solid android:color="#4d000000"/>
-            <corners android:radius="10dp"/>
         </shape>
     </item>
     <item android:state_checked="false">

live/src/main/res/drawable/bg_live_gift_items.xml

@@ -3,5 +3,5 @@
 
     <stroke
         android:width="0.3dp"
-        android:color="#1F245C" />
+        android:color="#10ffffff" />
 </shape>

live/src/main/res/drawable/bg_live_gift_send.xml

@@ -3,7 +3,7 @@
     <item android:state_enabled="true">
         <shape>
             <corners android:bottomRightRadius="15dp" android:topRightRadius="15dp"/>
-            <solid android:color="@color/yellow5"/>
+            <solid android:color="#ED6B41"/>
         </shape>
     </item>
     <item android:state_enabled="false">

live/src/main/res/layout/dialog_live_gift_wrap.xml

@@ -155,24 +155,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="66dp"
                 android:layout_weight="0">
+
                 <RadioGroup
                     android:id="@+id/radio_group"
                     android:layout_width="wrap_content"
                     android:layout_height="6dp"
-                    android:layout_gravity="end"
+                    android:layout_gravity="center_horizontal"
                     android:layout_marginTop="3.5dp"
-                    android:layout_marginEnd="20dp"
                     android:gravity="end"
                     android:orientation="horizontal" />
 
                 <RadioGroup
                     android:id="@+id/radio_group_wrap"
                     android:layout_width="wrap_content"
-                    android:layout_marginEnd="20dp"
                     android:layout_height="6dp"
                     android:layout_gravity="end"
                     android:layout_marginTop="3.5dp"
-                    android:gravity="end"
+                    android:gravity="center_horizontal"
                     android:orientation="horizontal"
                     android:visibility="visible" />
 
@@ -206,12 +205,13 @@
                         android:layout_alignParentBottom="true"
                         android:layout_marginBottom="10dp"
                         android:layout_toLeftOf="@id/btn_send"
-                        android:background="@drawable/bg_live_gift_choose"
+                        android:background="@drawable/bg_live_gift_choose2"
                         android:gravity="center"
                         android:paddingRight="13dp"
                         android:text="1"
-                        android:textColor="@color/global"
+                        android:textColor="@color/white"
                         android:textSize="14sp"
+                        android:textStyle="bold"
                         android:visibility="invisible" />
 
                     <ImageView
@@ -232,9 +232,9 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginStart="20dp"
                     android:layout_marginBottom="5dp"
                     android:gravity="bottom"
-                    android:layout_marginStart="20dp"
                     android:orientation="horizontal">
 
                     <LinearLayout

live/src/main/res/layout/item_sys_msg.xml

@@ -88,7 +88,7 @@
                 android:layout_width="17dp"
                 android:layout_height="16dp"
                 android:layout_marginLeft="3dp"
-                android:src="@mipmap/icon_more" />
+                android:src="@mipmap/icon_more_live_menu" />
 
         </LinearLayout>
     </RelativeLayout>

live/src/main/res/layout/view_live_audience.xml

@@ -241,8 +241,8 @@
             <!--聊天-->
             <LinearLayout
                 android:id="@+id/message_layout"
-                android:layout_width="84dp"
+                android:layout_width="126dp"
-                android:layout_height="34dp"
+                android:layout_height="35dp"
                 android:layout_marginStart="10dp"
                 android:clickable="false"
                 android:orientation="horizontal">
@@ -252,11 +252,11 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:layout_weight="7"
+                    android:layout_weight="9"
                     android:alpha="0.5"
                     android:background="@drawable/bc_sound_recording_left"
                     android:gravity="center"
-                    android:hint="@string/chat_chat"
+                    android:hint="@string/say_something3"
                     android:singleLine="true"
                     android:textColor="#D9D9D9"
                     android:textColorHint="@color/gray3"
@@ -264,9 +264,8 @@
 
                 <LinearLayout
                     android:id="@+id/voice_button"
-                    android:layout_width="0dp"
+                    android:layout_width="36dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="36dp"
-                    android:layout_weight="4"
                     android:background="@drawable/bc_sound_recording_right"
                     android:clickable="true"
                     android:focusable="true"
@@ -300,16 +299,15 @@
 
                     <ImageView
                         android:id="@+id/btn_msg"
-                        android:layout_width="40dp"
+                        android:layout_width="35dp"
-                        android:layout_height="40dp"
+                        android:layout_height="35dp"
                         android:layout_centerInParent="true"
-                        android:padding="5dp"
+                        android:src="@mipmap/icon_message" />
-                        android:src="@mipmap/messagesss" />
 
                     <View
                         android:id="@+id/v_msg_redpoint"
-                        android:layout_width="12dp"
+                        android:layout_width="6dp"
-                        android:layout_height="12dp"
+                        android:layout_height="6dp"
                         android:layout_marginTop="6dp"
                         android:background="@drawable/background_ff5075"
                         android:visibility="gone" />
@@ -342,27 +340,22 @@
                 android:layout_height="1dp"
                 android:layout_weight="1" />
 
-            <!--特权-->
+
-            <ImageView
-                android:id="@+id/live_privilege"
-                android:layout_width="27.2dp"
-                android:layout_height="27.2dp"
-                android:layout_marginEnd="10dp"
-                android:src="@mipmap/live_icon_role" />
             <!--整蛊-->
             <ImageView
                 android:id="@+id/live_cheat"
-                android:layout_width="27.2dp"
+                android:layout_width="35dp"
-                android:layout_height="27.2dp"
+                android:layout_height="35dp"
-                android:layout_marginEnd="10dp"
+                android:layout_marginEnd="8dp"
-                android:src="@mipmap/live_icon_cheat" />
+                android:src="@mipmap/icon_prank" />
             <!--玩-->
             <ImageView
                 android:id="@+id/live_play"
                 android:layout_width="27.2dp"
                 android:layout_height="27.2dp"
-                android:layout_marginEnd="10dp"
+                android:layout_marginEnd="8dp"
-                android:src="@mipmap/live_icon_play" />
+                android:src="@mipmap/live_icon_play"
+                android:visibility="gone" />
             <!--新人特惠-->
             <RelativeLayout
                 android:layout_width="40dp"
@@ -392,17 +385,24 @@
             <!--礼物-->
             <ImageView
                 android:id="@+id/gift_image"
-                android:layout_width="38dp"
+                android:layout_width="35dp"
-                android:layout_height="38dp"
+                android:layout_height="35dp"
                 android:layout_marginEnd="8dp"
-                android:src="@mipmap/live_lw" />
+                android:src="@mipmap/icon_gift" />
+            <!--特权-->
+            <ImageView
+                android:id="@+id/live_privilege"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginEnd="8dp"
+                android:src="@mipmap/icon_privilege" />
             <!--普通工具合集-->
             <ImageView
                 android:id="@+id/total_image"
-                android:layout_width="34dp"
+                android:layout_width="35dp"
-                android:layout_height="34dp"
+                android:layout_height="35dp"
                 android:layout_marginEnd="8dp"
-                android:src="@mipmap/live_icon_more" />
+                android:src="@mipmap/icon_more_live_menu" />
 
         </LinearLayout>