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

Merge branch 'dev_share'

Browse Source 
# Conflicts:
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
This commit is contained in:
zlzw
2023-04-01 11:15:18 +08:00
parent 43e7713f6b 97ad5c2d92
commit e301e7bfce
66 changed files with 1887 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
android:id="@+id/anchor_say"
layout="@layout/sim_live_room_anchor_say"
android:layout_width="77dp"
android:layout_height="88dp"
android:layout_height="110dp"
android:layout_marginStart="16dp"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"

6
live/src/main/res/layout/item_anchor_say.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="106dp"
android:layout_height="128dp"
android:layout_marginStart="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_anchor_say"
android:layout_marginTop="10dp">
@@ -11,8 +11,8 @@
<include
layout="@layout/sim_live_room_anchor_say"
android:layout_width="67dp"
android:layout_height="88dp"
android:layout_width="83dp"
android:layout_height="110dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

11
live/src/main/res/layout/sim_live_room_anchor_say.xml
View File

@@ -2,20 +2,21 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="67dp"
android:layout_height="88dp">
android:layout_width="77dp"
android:layout_height="110dp">
<ImageView
android:id="@+id/anchor_say_icon"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:scaleType="fitXY"
android:src="@color/main_color_79CDF9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@color/main_color_79CDF9" />
tools:srcCompat="@mipmap/tmp" />
<TextView
android:id="@+id/anchor_say_text"
@@ -28,14 +29,14 @@
android:gravity="center"
android:inputType="textMultiLine"
android:maxEms="6"
android:text="中文测试\n中文测试\n中文测试\n中文测试"
android:text="已输入的内容\n已输入的内容\n已输入的"
android:textColor="#333333"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/anchor_say_icon"
tools:text="中文测试\n中文测试\n中文测试\n中文测试" />
tools:text="已输入的内容\n已输入的内容\n已输入的" />
<ImageView
android:id="@+id/anchor_say_hide"

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

@@ -1295,7 +1295,7 @@
android:id="@+id/anchor_say_layout"
layout="@layout/sim_live_room_anchor_say"
android:layout_width="77dp"
android:layout_height="88dp"
android:layout_height="110dp"
android:layout_alignBottom="@+id/live_video"
android:layout_marginStart="14dp"
android:visibility="invisible"