yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-10-13 16:08:05 +08:00
commit e352db3ced
3 changed files with 126 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1063,11 +1063,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
return; return;
} }
btn_event2.setVisibility(View.VISIBLE); 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) { if (mBannerList2.size() == 1) {
mBanner2.setAutoPlay(false) mBanner2.setAutoPlay(false)
.setPages(mBannerList2, new CustomViewHolder()) .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) { if (mBannerList3 == null || mBannerList3.size() == 0 || mBanner3 == null || bean1 == null) {
return; 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) mBanner3.setAutoPlay(true)
.setPages(mBannerList3, new Banner3CustomViewHolder()) .setPages(mBannerList3, new Banner3CustomViewHolder())
.setDelayTime(3000) .setDelayTime(3000)

2
live/src/main/res/layout/dialog_live_chat_input.xml
View File

@ -99,7 +99,7 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_live_input" android:background="@drawable/bg_live_input"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="@string/live_say_something_a" android:hint="@string/live_say_something"
android:imeActionLabel="@string/send" android:imeActionLabel="@string/send"
android:imeOptions="actionSend" android:imeOptions="actionSend"
android:maxLength="50" android:maxLength="50"

193
live/src/main/res/layout/view_live_room.xml
View File

@ -9,85 +9,6 @@
android:paddingTop="15dp"> android:paddingTop="15dp">
<LinearLayout
android:id="@+id/bannerLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:gravity="bottom"
android:orientation="vertical">
<LinearLayout
android:id="@+id/lt_trickery"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="right"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:background="@mipmap/img_buoy"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/tv_trickery_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="9dp"
android:text="60"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<com.ms.banner.Banner
android:id="@+id/banner1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/img_event"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/live_turntable" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"></LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/lin" android:id="@+id/lin"
@ -2074,27 +1995,37 @@
android:layout_below="@id/live_wks_layout" android:layout_below="@id/live_wks_layout"
android:layout_marginTop="10dp" /> android:layout_marginTop="10dp" />
<LinearLayout <LinearLayout
android:id="@+id/btn_event2" android:id="@+id/bannerLayout"
android:layout_width="70dp" android:layout_width="wrap_content"
android:layout_height="93dp" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:gravity="bottom"
android:orientation="vertical">
<LinearLayout
android:id="@+id/lt_trickery"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginEnd="15dp" android:layout_marginRight="5dp"
android:layout_marginBottom="35dp" android:layout_marginBottom="5dp"
android:gravity="center_horizontal" android:background="@mipmap/img_buoy"
android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<com.ms.banner.Banner <TextView
android:id="@+id/banner2" android:id="@+id/tv_trickery_time"
android:layout_width="70dp" android:layout_width="wrap_content"
android:layout_height="93dp" android:layout_height="wrap_content"
android:layout_marginBottom="5dp" android:layout_marginBottom="9dp"
app:delay_time="5000" android:text="60"
app:indicator_height="8dp" android:textColor="@color/white"
app:indicator_width="8dp" /> android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
@ -2105,7 +2036,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginRight="10dp" android:layout_marginRight="5dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:background="@mipmap/live_mission_box" android:background="@mipmap/live_mission_box"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@ -2124,4 +2055,76 @@
app:indicator_width="8dp" /> app:indicator_width="8dp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/btn_event1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<com.ms.banner.Banner
android:id="@+id/banner1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/img_event"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/live_turntable" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event2"
android:layout_width="70dp"
android:layout_height="93dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_gravity="right"
android:layout_marginEnd="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="visible">
<com.ms.banner.Banner
android:id="@+id/banner2"
android:layout_width="70dp"
android:layout_height="93dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:visibility="visible"
android:layout_height="30dp"></LinearLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>