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

Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

Browse Source
This commit is contained in:
18142669586
2023-10-19 15:15:30 +08:00
parent f22ad82d84 4ff1089549
commit 38471cedc8
16 changed files with 839 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
OneToOne/src/main/res/layout/activity_call_audio.xml Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<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="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/vague"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="fitXY"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
<ImageView
android:id="@+id/close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="46dp"
android:layout_marginEnd="17dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_call_close" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginTop="233dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_corner_radius="10dp" />
<ImageView
android:id="@+id/follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-10dp"
app:layout_constraintEnd_toEndOf="@+id/avatar"
app:layout_constraintStart_toStartOf="@+id/avatar"
app:layout_constraintTop_toBottomOf="@+id/avatar"
app:srcCompat="@mipmap/ic_call_follow" />
<TextView
android:id="@+id/user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="TextView"
android:textColor="#333333"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="@+id/avatar"
app:layout_constraintStart_toStartOf="@+id/avatar"
app:layout_constraintTop_toBottomOf="@+id/avatar" />
<TextView
android:id="@+id/user_info"
android:layout_marginTop="9dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/user_name" />
<ImageView
android:id="@+id/gift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="45dp"
android:layout_marginBottom="39dp"
app:layout_constraintBottom_toTopOf="@+id/call_msg"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@mipmap/ic_call_gift" />
<ImageView
android:id="@+id/money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="43dp"
android:layout_marginBottom="39dp"
app:layout_constraintBottom_toTopOf="@+id/call_stop"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@mipmap/ic_call_money" />
<ImageView
android:id="@+id/call_stop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="89dp"
android:layout_marginBottom="53dp"
android:src="@mipmap/ic_call_stop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:id="@+id/call_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="89dp"
android:layout_marginBottom="53dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@mipmap/ic_call_audio_msg" />
<TextView
android:id="@+id/call_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="29dp"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/call_stop"
app:layout_constraintEnd_toStartOf="@+id/call_msg"
app:layout_constraintStart_toEndOf="@+id/call_stop" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
OneToOne/src/main/res/layout/dialog_bottom_list.xml
View File

@@ -34,6 +34,6 @@
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/recyclerView"
tools:text="取消" />
android:text="取消" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
OneToOne/src/main/res/layout/view_call_video_item.xml
View File

@@ -48,6 +48,17 @@
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@mipmap/ic_call_video_select" />
<TextView
android:id="@+id/call_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/camera_close_switch"
app:layout_constraintStart_toStartOf="@+id/camera_close_switch"
app:layout_constraintTop_toBottomOf="@+id/camera_close_switch" />
<ImageView
android:id="@+id/camera_switch"
android:layout_width="wrap_content"
@@ -117,6 +128,7 @@
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:visibility="gone"
android:layout_marginTop="4dp"
tools:text="未关注"
app:layout_constraintEnd_toEndOf="@+id/avatar"

65
OneToOne/src/main/res/layout/view_call_video_wait.xml Normal file
View File

@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<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:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/call_stop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="41dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@mipmap/ic_call_stop" />
<ImageView
android:id="@+id/camera_close_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:translationZ="2dp"
android:layout_marginBottom="44dp"
app:layout_constraintBottom_toTopOf="@+id/call_stop"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@mipmap/ic_call_video_select" />
<ImageView
android:id="@+id/camera_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/camera_close_switch"
app:layout_constraintEnd_toStartOf="@+id/camera_close_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/camera_close_switch"
app:srcCompat="@mipmap/ic_call_camera" />
<ImageView
android:id="@+id/mic_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/camera_close_switch"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/camera_close_switch"
app:layout_constraintTop_toTopOf="@+id/camera_close_switch"
app:srcCompat="@mipmap/ic_call_audio_select" />
<ImageView
android:id="@+id/close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="18dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_call_close" />
</androidx.constraintlayout.widget.ConstraintLayout>