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

Merge branch 'dev_FaceUnity'

Browse Source 
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/res/layout/view_live_room.xml
This commit is contained in:
zlzw
2022-09-22 13:41:13 +08:00
parent ab2991a999 1e98de9931
commit 0b0967f84d
1002 changed files with 77384 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
live/src/main/res/layout/view_new_live_ready.xml
View File

@@ -250,5 +250,17 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/faceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:visibility="gone"
android:textSize="16sp"
android:text="@string/fu_base_is_tracking_text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -149,7 +149,7 @@ PK"
android:layout_height="40dp"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/btn_close"
android:padding="5dp"/>
android:padding="5dp" />
<ImageView
android:id="@+id/btn_pk"