diff --git a/common/src/main/res/layout/view_live_system_message.xml b/common/src/main/res/layout/view_live_system_message.xml index 968f41186..f2e2924b1 100644 --- a/common/src/main/res/layout/view_live_system_message.xml +++ b/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" diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7906aafe9..027a49417 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1085,6 +1085,7 @@ 註冊PD LIVE 註冊並登錄 開通貴族,尊享超多特權! + 說點什麽吧... diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index 0b149102a..aecc2ae8a 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/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_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_cheat : R.mipmap.live_icon_cheat_en, mCheat); +// 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_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); voiceButton.setOnTouchListener((v, event) -> { if (event.getAction() == MotionEvent.ACTION_DOWN) { diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 1d64bce45..5d1c3e7b7 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/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); } diff --git a/live/src/main/res/drawable/background_ff5075.xml b/live/src/main/res/drawable/background_ff5075.xml index 80250238c..7f7840437 100644 --- a/live/src/main/res/drawable/background_ff5075.xml +++ b/live/src/main/res/drawable/background_ff5075.xml @@ -3,7 +3,7 @@ - + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_gift_item.xml b/live/src/main/res/drawable/bg_live_gift_item.xml index a2b443d6f..ad1941bd5 100644 --- a/live/src/main/res/drawable/bg_live_gift_item.xml +++ b/live/src/main/res/drawable/bg_live_gift_item.xml @@ -2,9 +2,8 @@ - + - diff --git a/live/src/main/res/drawable/bg_live_gift_items.xml b/live/src/main/res/drawable/bg_live_gift_items.xml index ab8df02fd..e4f8f778c 100644 --- a/live/src/main/res/drawable/bg_live_gift_items.xml +++ b/live/src/main/res/drawable/bg_live_gift_items.xml @@ -3,5 +3,5 @@ + android:color="#10ffffff" /> \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_gift_send.xml b/live/src/main/res/drawable/bg_live_gift_send.xml index c70485a41..25d5bc13b 100644 --- a/live/src/main/res/drawable/bg_live_gift_send.xml +++ b/live/src/main/res/drawable/bg_live_gift_send.xml @@ -3,7 +3,7 @@ - + diff --git a/live/src/main/res/layout/dialog_live_gift_wrap.xml b/live/src/main/res/layout/dialog_live_gift_wrap.xml index bfb498451..f6d02085a 100644 --- a/live/src/main/res/layout/dialog_live_gift_wrap.xml +++ b/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"> + @@ -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" /> + android:src="@mipmap/icon_more_live_menu" /> diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index f8ca03e26..11fd54115 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -241,8 +241,8 @@ @@ -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 @@ + android:src="@mipmap/icon_message" /> @@ -342,27 +340,22 @@ android:layout_height="1dp" android:layout_weight="1" /> - - + + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_marginEnd="8dp" + android:src="@mipmap/icon_prank" /> + android:layout_marginEnd="8dp" + android:src="@mipmap/live_icon_play" + android:visibility="gone" /> + android:src="@mipmap/icon_gift" /> + + + android:src="@mipmap/icon_more_live_menu" /> diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_gift.png b/live/src/main/res/mipmap-xxxhdpi/icon_gift.png new file mode 100644 index 000000000..a044a3abe Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/icon_gift.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_message.png b/live/src/main/res/mipmap-xxxhdpi/icon_message.png new file mode 100644 index 000000000..c31c92d78 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/icon_message.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_more_live_menu.png b/live/src/main/res/mipmap-xxxhdpi/icon_more_live_menu.png new file mode 100644 index 000000000..d0fbbde58 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/icon_more_live_menu.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_prank.png b/live/src/main/res/mipmap-xxxhdpi/icon_prank.png new file mode 100644 index 000000000..186c1bcf4 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/icon_prank.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_privilege.png b/live/src/main/res/mipmap-xxxhdpi/icon_privilege.png new file mode 100644 index 000000000..6d78d8cc9 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/icon_privilege.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png b/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png deleted file mode 100644 index 3b02032fb..000000000 Binary files a/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png and /dev/null differ diff --git a/live/src/main/res/mipmap-xxxhdpi/messagesss.png b/live/src/main/res/mipmap-xxxhdpi/messagesss.png deleted file mode 100644 index 1dcde0710..000000000 Binary files a/live/src/main/res/mipmap-xxxhdpi/messagesss.png and /dev/null differ