diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 07b48d443..a38fda842 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1063,11 +1063,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis return; } btn_event2.setVisibility(View.VISIBLE); - if (btn_event3.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) btn_event3.getLayoutParams(); - layoutParams.bottomMargin = DpUtil.dp2px(150); - btn_event3.setLayoutParams(layoutParams); - } + if (mBannerList2.size() == 1) { mBanner2.setAutoPlay(false) .setPages(mBannerList2, new CustomViewHolder()) @@ -2891,11 +2887,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (mBannerList3 == null || mBannerList3.size() == 0 || mBanner3 == null || bean1 == null) { return; } - if (btn_event2.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) btn_event3.getLayoutParams(); - layoutParams.bottomMargin = DpUtil.dp2px(150); - btn_event3.setLayoutParams(layoutParams); - } + mBanner3.setAutoPlay(true) .setPages(mBannerList3, new Banner3CustomViewHolder()) .setDelayTime(3000) diff --git a/live/src/main/res/layout/dialog_live_chat_input.xml b/live/src/main/res/layout/dialog_live_chat_input.xml index b99e0c3b7..a59c7bed7 100644 --- a/live/src/main/res/layout/dialog_live_chat_input.xml +++ b/live/src/main/res/layout/dialog_live_chat_input.xml @@ -99,7 +99,7 @@ android:layout_weight="1" android:background="@drawable/bg_live_input" android:gravity="center_vertical" - android:hint="@string/live_say_something_a" + android:hint="@string/live_say_something" android:imeActionLabel="@string/send" android:imeOptions="actionSend" android:maxLength="50" diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 7a65a0988..1573027ca 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -9,85 +9,6 @@ android:paddingTop="15dp"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + android:gravity="center_horizontal" + android:orientation="vertical" + android:visibility="visible"> - + - + - - + android:visibility="visible" + android:layout_height="30dp"> \ No newline at end of file