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

fix:修复新人任务与整蛊无法点击的问题

Browse Source 
fix:修复新人任务与整蛊被遮挡问题
update:将view_live_audience.xml的banner转移至view_live_room.lxml
This commit is contained in:
zlzw
2022-09-06 14:14:15 +08:00
parent cc92c3b04e
commit ff6fb98a8e
7 changed files with 517 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
live/src/main/res/layout/view_live_audience.xml
View File

@@ -36,54 +36,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/lt_trickery"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="18dp"
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_event3"
android:layout_width="67dp"
android:layout_height="90dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="88dp"
android:background="@mipmap/live_mission_box"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<com.ms.banner.Banner
android:id="@+id/banner3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout

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

@@ -12,20 +12,71 @@
<LinearLayout
android:id="@+id/bannerLayout"
android:layout_width="wrap_content"
android:layout_height="216dp"
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_event3"
android:layout_width="67dp"
android:layout_height="90dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:background="@mipmap/live_mission_box"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<com.ms.banner.Banner
android:id="@+id/banner3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</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="18dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<com.ms.banner.Banner
android:id="@+id/banner1"
@@ -44,9 +95,10 @@
android:layout_height="80dp"
android:layout_gravity="right"
android:layout_marginRight="15dp"
android:layout_marginBottom="45dp"
android:layout_marginBottom="25dp"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<com.ms.banner.Banner
android:id="@+id/banner2"
@@ -745,9 +797,9 @@
android:id="@+id/room_msg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:gravity="center"
android:orientation="vertical"
android:layout_marginStart="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -765,8 +817,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_marginTop="2dp"
android:gravity="right"
android:text="@string/room_msg"
android:textColor="#99ffffff"
android:textSize="12sp" />
@@ -775,6 +827,7 @@
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:id="@+id/chat_view"
android:layout_width="match_parent"