From 2da6d8d4b85153ec30f989230c184cce26ff91e6 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Fri, 13 Jan 2023 06:48:51 +0800
Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=A4=8D=E5=BD=95=E9=9F=B3svg?=
 =?UTF-8?q?a=E5=9C=A8stop=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9C=80?=
 =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E5=BD=95=E9=9F=B3=E5=9B=BE=E6=A0=87=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/audio/SoundSignatureActivity.kt      | 18 +++++++++++-------
 .../erban/ui/user/UserInfoActivity.java        |  4 ++--
 .../res/layout/activity_sound_signature.xml    | 11 ++++++++++-
 3 files changed, 23 insertions(+), 10 deletions(-)

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 bcd534195..f59f4a055 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
@@ -309,7 +309,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
                 binding.groupSaveSound.visibility = View.INVISIBLE
                 binding.groupDeleteSound.visibility = View.INVISIBLE
                 binding.tvUnderReview.visibility = View.INVISIBLE
-                binding.svgRecorder.stopAnimation()
+                stopSvga()
                 binding.roundProgress.setProgress(0)
             }
             SoundViewModel.STATE_RECORD_RECORDING -> {
@@ -328,7 +328,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
                 binding.groupSaveSound.visibility = View.VISIBLE
                 binding.groupDeleteSound.visibility = View.INVISIBLE
                 binding.tvUnderReview.visibility = View.INVISIBLE
-                binding.svgRecorder.stopAnimation()
+                stopSvga()
             }
             SoundViewModel.STATE_RECORD_SAVE_SUCCESS -> {
                 binding.ivSoundStatus.post { binding.ivSoundStatus.setImageResource(R.drawable.ic_pause_record) }
@@ -337,7 +337,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
                 binding.groupSaveSound.visibility = View.INVISIBLE
                 binding.groupDeleteSound.visibility = View.VISIBLE
                 binding.tvUnderReview.visibility = View.VISIBLE
-                binding.svgRecorder.stopAnimation()
+                stopSvga()
             }
             SoundViewModel.STATE_RECORD_AUDIT_SUCCESS -> {
                 binding.ivSoundStatus.post { binding.ivSoundStatus.setImageResource(R.drawable.ic_pause_record) }
@@ -346,7 +346,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
                 binding.groupSaveSound.visibility = View.INVISIBLE
                 binding.groupDeleteSound.visibility = View.VISIBLE
                 binding.tvUnderReview.visibility = View.GONE
-                binding.svgRecorder.stopAnimation()
+                stopSvga()
             }
         }
     }
@@ -404,11 +404,16 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
             if (isPlaying) {
                 playSvgaBg(binding.svgRecorder, "svga/sound_record.svga")
             } else {
-                binding.svgRecorder.stopAnimation()
+                stopSvga()
             }
         }
     }
 
+    private fun stopSvga(){
+        binding.svgRecorder.stopAnimation()
+        binding.svgRecorder.clear()
+    }
+
     private fun showCountDown(duration: Int) {
         val showStr = String.format(
             Locale.getDefault(),
@@ -443,8 +448,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
     override fun onDestroy() {
         super.onDestroy()
         soundViewModel.releaseResource()
-        binding.svgRecorder.stopAnimation()
-        binding.svgRecorder.clear()
+        stopSvga()
     }
 
     override fun needSteepStateBar(): Boolean {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
index fad2e5ca5..1a6604f9d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
@@ -618,9 +618,9 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
     public void initVoiceShow(UserInfo.SoundBean audioCard) {
         if (audioCard != null && !TextUtils.isEmpty(audioCard.getAudioUrl())) {
             if (AuthModel.get().getCurrentUid() == userId) {//主态
-                if (audioCard.getStatus() == 1) {
+                if (audioCard.getStatus() == 2) {
                     showSoundCard(audioCard);
-                } else if (audioCard.getStatus() == 0 || audioCard.getStatus() == 2) {
+                } else if (audioCard.getStatus() == 0 || audioCard.getStatus() == 1) {
                     mBinding.llAudio.setVisibility(View.GONE);
                     mBinding.llAudioTip.setVisibility(View.VISIBLE);
                 }
diff --git a/app/src/main/res/layout/activity_sound_signature.xml b/app/src/main/res/layout/activity_sound_signature.xml
index a91eb5efc..9cb08dfd8 100644
--- a/app/src/main/res/layout/activity_sound_signature.xml
+++ b/app/src/main/res/layout/activity_sound_signature.xml
@@ -213,12 +213,21 @@
         android:visibility="gone"
         app:constraint_referenced_ids="frDeleteBg,tvDeleteSound" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="110dp"
+        android:layout_height="110dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_sound_record"
+        app:layout_constraintBottom_toBottomOf="@+id/ivSoundTranscribe"
+        app:layout_constraintEnd_toEndOf="@+id/ivSoundTranscribe"
+        app:layout_constraintStart_toStartOf="@+id/ivSoundTranscribe"
+        app:layout_constraintTop_toTopOf="@+id/ivSoundTranscribe" />
+
     <com.opensource.svgaplayer.SVGAImageView
         android:id="@+id/svgRecorder"
         android:layout_width="110dp"
         android:layout_height="110dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_sound_record"
         app:autoPlay="true"
         app:layout_constraintBottom_toBottomOf="@+id/ivSoundTranscribe"
         app:layout_constraintEnd_toEndOf="@+id/ivSoundTranscribe"