diff --git a/app/build.gradle b/app/build.gradle index 5f46c2a33..6e776b5ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -265,9 +265,6 @@ dependencies { implementation 'com.github.yalantis:ucrop:2.2.7' - implementation 'com.github.SheTieJun.Mp3Recorder:recorder-mix:1.7.1' - implementation 'com.github.SheTieJun.Mp3Recorder:recorder-core:1.7.1' - } channel { diff --git a/app/src/main/assets/svga/sound_record.svga b/app/src/main/assets/svga/sound_record.svga new file mode 100644 index 000000000..85119bf32 Binary files /dev/null and b/app/src/main/assets/svga/sound_record.svga differ diff --git a/app/src/main/assets/svga/user_in_live.svga b/app/src/main/assets/svga/user_in_live.svga new file mode 100644 index 000000000..95ca195d1 Binary files /dev/null and b/app/src/main/assets/svga/user_in_live.svga differ diff --git a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt index 23154b7ef..0bafaa9ad 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt @@ -13,6 +13,10 @@ import android.widget.Chronometer.OnChronometerTickListener import androidx.activity.viewModels import androidx.core.content.ContextCompat import com.netease.nim.uikit.StatusBarUtil +import com.opensource.svgaplayer.SVGADrawable +import com.opensource.svgaplayer.SVGAImageView +import com.opensource.svgaplayer.SVGAParser +import com.opensource.svgaplayer.SVGAVideoEntity import com.yizhuan.erban.R import com.yizhuan.erban.audio.helper.AudioPlayerHelper import com.yizhuan.erban.audio.presenter.RecordingVoicePresenter @@ -238,6 +242,7 @@ class SoundSignatureActivity : BaseViewBindingActivity { binding.ivSoundStatus.post { binding.ivSoundStatus.setImageResource(R.drawable.ic_start_record) } @@ -246,6 +251,7 @@ class SoundSignatureActivity : BaseViewBindingActivity { binding.ivSoundStatus.post { binding.ivSoundStatus.setImageResource(R.drawable.ic_pause_record) } @@ -254,6 +260,7 @@ class SoundSignatureActivity : BaseViewBindingActivity { binding.ivSoundStatus.post { binding.ivSoundStatus.setImageResource(R.drawable.ic_pause_record) } @@ -262,10 +269,26 @@ class SoundSignatureActivity : BaseViewBindingActivity @@ -300,6 +323,11 @@ class SoundSignatureActivity : BaseViewBindingActivity + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/frRestartBg" /> - - + app:layout_constraintTop_toBottomOf="@+id/frPlayBg" /> - - - - - - + app:layout_constraintTop_toBottomOf="@+id/ivSaveRecord" /> + app:layout_constraintStart_toStartOf="@+id/frDeleteBg" + app:layout_constraintTop_toBottomOf="@+id/frDeleteBg" /> + + - + + + android:layout_marginTop="@dimen/dp_30" + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 13cd125f6..501e66dd0 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -112,16 +112,29 @@ app:layout_constraintEnd_toEndOf="@+id/iv_user_head" app:layout_constraintStart_toStartOf="@+id/iv_user_head" /> + + + app:constraint_referenced_ids="viewLive,tvLive,svgLive" />