From 9c3be225d61442fd71261f8664902323927f16fc Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Fri, 13 Jan 2023 06:20:44 +0800
Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=A4=8D=E5=A3=B0=E9=9F=B3?=
 =?UTF-8?q?=E5=8D=A1=E5=BD=95=E9=9F=B3=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BD=95=E9=9F=B3=E6=B2=A1=E6=9C=89=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/audio/SoundSignatureActivity.kt     | 14 +++++---
 .../erban/audio/viewmodel/SoundViewModel.kt   |  1 +
 .../erban/ui/user/UserInfoModifyActivity.kt   | 32 ++++++++++++-------
 3 files changed, 31 insertions(+), 16 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 dfafcd3d0..bcd534195 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
@@ -44,8 +44,8 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
 
     companion object {
         const val AUDIO_BEAN = "audio_bean"
-        const val AUDIO_FILE = "AUDIO_FILE"
-        const val AUDIO_DURA = "AUDIO_DURA"
+        const val AUDIO_FILE = "audio_file"
+        const val AUDIO_DURA = "audio_dura"
         const val MIN_RECORD_VOICE_DURATION = 1 // 最少1秒
         const val MAX_RECORD_VOICE_DURATION = 60 //最多60s
     }
@@ -81,7 +81,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
                     MAX_RECORD_VOICE_DURATION
                 )
                 binding.tvSoundTime.text = showStr
-                soundViewModel.audioState = SoundViewModel.STATE_RECORD_SUCCESS
+                soundViewModel.audioState = SoundViewModel.STATE_RECORD_SAVE_SUCCESS
                 soundViewModel.audioUrl = audioCard.audioUrl ?: ""
                 refreshButtonView(SoundViewModel.STATE_RECORD_SAVE_SUCCESS)
             }
@@ -93,7 +93,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
                     MAX_RECORD_VOICE_DURATION
                 )
                 binding.tvSoundTime.text = showStr
-                soundViewModel.audioState = SoundViewModel.STATE_RECORD_SUCCESS
+                soundViewModel.audioState = SoundViewModel.STATE_RECORD_AUDIT_SUCCESS
                 soundViewModel.audioUrl = audioCard.audioUrl ?: ""
                 refreshButtonView(SoundViewModel.STATE_RECORD_AUDIT_SUCCESS)
             }
@@ -157,7 +157,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
             val intent = Intent()
             intent.putExtra(AUDIO_FILE, soundViewModel.audioUrl)
             intent.putExtra(AUDIO_DURA, soundViewModel.audioDur)
-            setResult(RESULT_OK, intent)// 上传声音成功之后退出页面
+            setResult(RESULT_OK, intent)// 上传声音成功之后给上个页面传递信息
         }
 
         soundViewModel.hideLoadLiveData.observe(this) {
@@ -170,6 +170,10 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
         }
 
         soundViewModel.deleteRecordLiveData.observe(this) {
+            val intent = Intent()
+            intent.putExtra(AUDIO_FILE, "")
+            intent.putExtra(AUDIO_DURA, 0)
+            setResult(RESULT_OK, intent)// 上传声音成功之后给上个页面传递信息
             soundViewModel.showNormalState()
         }
 
diff --git a/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt b/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt
index ad3edeb19..67a62e788 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt
@@ -96,6 +96,7 @@ class SoundViewModel : BaseViewModel() {
             STATE_RECORD_RECORDING -> stopRecord() // 录制中状态，点击了中间按钮：停止录音
             STATE_RECORD_SUCCESS -> clickAudition() // 试听状态，点击了中间按钮：试听声音
             STATE_RECORD_SAVE_SUCCESS -> clickAudition() //保存成功，点击了中间按钮：试听声音
+            STATE_RECORD_AUDIT_SUCCESS -> clickAudition() //审核成功，点击了中间按钮，试听声音
         }
     }
 
diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt
index f7fdf7615..4d70b5687 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt
@@ -63,7 +63,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
     private var datePickerDialog: DatePickerDialog? = null
     private var mUserInfo: UserInfo? = null
     private var userId: Long = 0
-    private var audioFileUrl: String? = null
     private var showAvatarAuditing = false
 
     private var mUri: Uri? = null
@@ -106,7 +105,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
 
     private fun initData(userInfo: UserInfo?) {
         if (null != userInfo) {
-            audioFileUrl = userInfo.userVoice
             ImageLoadUtils.loadAvatar(
                 this,
                 if (!TextUtils.isEmpty(userInfo.newAvatar)) userInfo.newAvatar else userInfo.avatar,
@@ -133,7 +131,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
                 binding.tvSoundTip.visibility = View.GONE
                 binding.llAudio.visibility = View.VISIBLE
                 binding.tvAudio.text = userInfo.audioCard.second.toString()
-            }else{
+            } else {
                 binding.tvSoundTip.visibility = View.VISIBLE
                 binding.llAudio.visibility = View.GONE
             }
@@ -217,13 +215,13 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
             R.id.tv_birth -> {
                 if (mUserInfo != null) {
                     val year = TimeUtils.getYear(
-                        mUserInfo!!.birth
+                        mUserInfo?.birth ?: 0L
                     )
                     val month = TimeUtils.getMonth(
-                        mUserInfo!!.birth
+                        mUserInfo?.birth ?: 0L
                     )
                     val day = TimeUtils.getDayOfMonth(
-                        mUserInfo!!.birth
+                        mUserInfo?.birth ?: 0L
                     )
                     datePickerDialog =
                         DatePickerDialog.newInstance(this, year, month - 1, day, true)
@@ -392,12 +390,24 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
                 Method.AUDIO -> {// 刷新声音资源
                     data?.let {
                         // 获取数据并刷新显示
-                        audioFileUrl = it.getStringExtra(SoundSignatureActivity.AUDIO_FILE)
+                        val audioFileUrl = it.getStringExtra(SoundSignatureActivity.AUDIO_FILE)
                         val audioDuration = it.getIntExtra(SoundSignatureActivity.AUDIO_DURA, 0)
-
-                        binding.tvSoundTip.visibility = View.GONE
-                        binding.llAudio.visibility = View.VISIBLE
-                        binding.tvAudio.text = audioDuration.toString()
+                        if (TextUtils.isEmpty(audioFileUrl)) {
+                            val soundBean = mUserInfo?.audioCard
+                            soundBean?.audioUrl = ""
+                            soundBean?.second = 0
+                            soundBean?.status = 0
+                            binding.tvSoundTip.visibility = View.VISIBLE
+                            binding.llAudio.visibility = View.GONE
+                        } else {
+                            val soundBean = mUserInfo?.audioCard
+                            soundBean?.audioUrl = audioFileUrl
+                            soundBean?.second = audioDuration
+                            soundBean?.status = 1
+                            binding.tvSoundTip.visibility = View.GONE
+                            binding.llAudio.visibility = View.VISIBLE
+                            binding.tvAudio.text = audioDuration.toString()
+                        }
                     }
                 }
                 Method.PHOTO -> {