From 701040913d8a63d61113da1dd46f34e316e2eb73 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Tue, 17 Jan 2023 11:29:20 +0800
Subject: [PATCH] =?UTF-8?q?[BugFix]=E5=A3=B0=E9=9F=B3=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yizhuan/erban/audio/SoundSignatureActivity.kt     | 8 +++++---
 .../com/yizhuan/erban/audio/helper/AudioPlayerHelper.java | 4 +---
 .../com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt   | 5 -----
 3 files changed, 6 insertions(+), 11 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 052b95633..910ff66e1 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
@@ -29,6 +29,7 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
 import com.yizhuan.xchat_android_core.statistic.StatisticManager
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
 import com.yizhuan.xchat_android_core.user.bean.UserInfo.SoundBean
+import com.yizhuan.xchat_android_core.utils.Logger
 import com.yizhuan.xchat_android_library.utils.ResUtil
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil
 import io.reactivex.SingleObserver
@@ -417,15 +418,15 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
         timer?.schedule(object : TimerTask() {
             override fun run() {
                 runOnUiThread {
-                    progress += 10
+                    progress += 16
                     if (progress <= MAX_RECORD_VOICE_DURATION * 1000) {
-                        if(mCountDownTime != 60) {
+                        if(mCountDownTime != 60 && soundViewModel.audioState == 1) {
                             binding.roundProgress.setProgress(progress)
                         }
                     }
                 }
             }
-        }, 0, 10)   //间隔时间（单位为毫秒）
+        }, 0, 16)   //间隔时间（单位为毫秒）
     }
 
     /**
@@ -444,6 +445,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
         binding.roundProgress.setProgress(0)
         binding.roundProgress.setTotalProgress(mCountDownTime * 1000)
         MAX_RECORD_VOICE_DURATION = mCountDownTime
+        soundViewModel.audioState = SoundViewModel.STATE_RECORD_SUCCESS
     }
 
     /**
diff --git a/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java b/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java
index 7bdb31ca5..d0f049c26 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java
@@ -12,14 +12,12 @@ import com.yizhuan.xchat_android_library.utils.ResUtil;
 
 import java.io.IOException;
 
-import lombok.Getter;
-
 /**
  * create by lvzebiao @2019/6/14
  */
 public class AudioPlayerHelper {
 
-    private final static long mIntervalTime = 10L;
+    private final static long mIntervalTime = 16L;
 
     public interface WHAT_STATUS {
         int ERROR = 1;
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 54fc5e794..fd3b41775 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
@@ -302,11 +302,6 @@ class SoundViewModel : BaseViewModel() {
                     "duration = $currDuration"
                 )
                 _showCountDownLiveData.value = currDuration.toInt()
-//                if (60000L - currDuration <= 500) {
-//                    _showCountDownLiveData.value = (currDuration / 1000).toInt() + 1
-//                } else {
-//                    _showCountDownLiveData.value = (currDuration / 1000).toInt()
-//                }
             }
 
             override fun onCompletion() {