diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 7284498c88..fa54298d3f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -96,7 +96,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList private lateinit var viewAudioBg: ImageView private lateinit var viewAudioButton: ImageView - private lateinit var tvAudioCountDown: TextView + private lateinit var viewAudioStart: ImageView + private lateinit var tvAudioResult: TextView private lateinit var tvInitiativeReport: TextView private lateinit var tvInitiativeCancel: TextView @@ -162,7 +163,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList viewAudioBg = mFloatLayout.findViewById(R.id.viewAudioBg) viewAudioButton = mFloatLayout.findViewById(R.id.viewAudioButton) - tvAudioCountDown = mFloatLayout.findViewById(R.id.tvAudioCountDown) + viewAudioStart = mFloatLayout.findViewById(R.id.viewAudioStart) + tvAudioResult = mFloatLayout.findViewById(R.id.tvAudioResult) tvInitiativeReport = mFloatLayout.findViewById(R.id.tvInitiativeReport) tvInitiativeCancel = mFloatLayout.findViewById(R.id.tvInitiativeCancel) @@ -223,11 +225,10 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList }else{ //停止语音听写 mIat?.stopListening() - //结束倒计时 - countDownTimer?.cancel() - countDownTimer?.onFinish() - //将倒计时置空 - countDownTimer = null + //结束录音 + RecordManager.getInstance().stop() + //结束动画 + viewAudioStart.clearAnimation() uploadAudio() } } @@ -318,10 +319,11 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList } Log.i(TAG, "语音内容=$resultBuffer") reasonDetail = resultBuffer.toString() + if(!reasonDetail.isNullOrEmpty()){ + tvAudioResult.text = reasonDetail + } } - var countDownTimer: CountDownTimer?=null - private fun setAudio(status: Boolean){ if(status){ //开始录音 @@ -344,35 +346,17 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList ) scaleAnimation.duration = 1000 scaleAnimation.repeatCount = -1 - viewAudioButton.startAnimation(scaleAnimation) - - tvAudioCountDown.visibility = View.VISIBLE - //开始倒计时 - if(countDownTimer==null){ - countDownTimer = object : CountDownTimer(60000, 1000) { - - override fun onTick(millisUntilFinished: Long) { - tvAudioCountDown.text = "${millisUntilFinished/1000}S" - } - - override fun onFinish() { - tvAudioCountDown.visibility = View.GONE - //结束录音 - RecordManager.getInstance().stop() - //结束动画 - viewAudioButton.clearAnimation() - } - } - countDownTimer?.start() - } + viewAudioButton.visibility = View.GONE + viewAudioStart.visibility = View.VISIBLE + viewAudioStart.startAnimation(scaleAnimation) + tvAudioResult.text = "..." }else{ //停止语音听写 mIat?.stopListening() - //结束倒计时 - countDownTimer?.cancel() - countDownTimer?.onFinish() - //将倒计时置空 - countDownTimer = null + //结束录音 + RecordManager.getInstance().stop() + //结束动画 + viewAudioStart.clearAnimation() } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 7a4b520e4e..0e04f6f245 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -3,23 +3,18 @@ package com.zhjt.mogo_core_function_devatools.badcase.biz import android.annotation.SuppressLint import android.app.Activity import android.graphics.Bitmap -import android.graphics.Color import android.graphics.PixelFormat import android.os.Bundle -import android.os.CountDownTimer import android.os.Handler import android.util.DisplayMetrics import android.util.Log import android.view.* import android.view.animation.Animation import android.view.animation.ScaleAnimation -import android.widget.CheckBox -import android.widget.CompoundButton import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.flexbox.FlexboxLayout import com.iflytek.cloud.ErrorCode import com.iflytek.cloud.InitListener import com.iflytek.cloud.RecognizerListener @@ -61,13 +56,11 @@ import com.zhjt.mogo_core_function_devatools.badcase.BadCaseAnalyticsManager import com.zhjt.mogo_core_function_devatools.badcase.biz.adapter.BadReasonListAdapter import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.BadCaseNetManager import com.zhjt.mogo_core_function_devatools.badcase.repository.store.BadCaseReasonStore -import me.jessyan.autosize.utils.AutoSizeUtils import org.greenrobot.eventbus.EventBus import org.json.JSONArray import org.json.JSONException import org.json.JSONObject import java.io.File -import java.lang.Exception import java.lang.StringBuilder /** @@ -112,7 +105,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene private var mInScreenY = 0f private var clickListener: ClickListener? = null - var countDownTimer: CountDownTimer?=null private lateinit var tvPassiveNum: TextView private lateinit var tvPassiveTime: TextView @@ -120,7 +112,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene private lateinit var viewAudioBg: ImageView private lateinit var viewAudioButton: ImageView - private lateinit var tvAudioCountDown: TextView + private lateinit var viewAudioStart: ImageView + private lateinit var tvAudioResult: TextView private lateinit var tvPassiveReport: TextView private lateinit var tvPassiveCancel: TextView @@ -160,8 +153,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene tvPassiveTime = mFloatLayout.findViewById(R.id.tvPassiveTime) tvPassiveIdentity = mFloatLayout.findViewById(R.id.tvPassiveIdentity) viewAudioBg = mFloatLayout.findViewById(R.id.viewAudioBg) + tvAudioResult = mFloatLayout.findViewById(R.id.tvAudioResult) viewAudioButton = mFloatLayout.findViewById(R.id.viewAudioButton) - tvAudioCountDown = mFloatLayout.findViewById(R.id.tvAudioCountDown) + viewAudioStart = mFloatLayout.findViewById(R.id.viewAudioStart) tvPassiveReport = mFloatLayout.findViewById(R.id.tvPassiveReport) tvPassiveCancel = mFloatLayout.findViewById(R.id.tvPassiveCancel) rvPassiveList = mFloatLayout.findViewById(R.id.rvPassiveList) @@ -219,11 +213,10 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene }else{ //停止语音听写 mIat?.stopListening() - //结束倒计时 - countDownTimer?.cancel() - countDownTimer?.onFinish() - //将倒计时置空 - countDownTimer = null + //结束录音 + RecordManager.getInstance().stop() + //结束动画 + viewAudioStart.clearAnimation() uploadAudio() } //删除记录 @@ -320,6 +313,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene } Log.i(TAG, "语音内容=$resultBuffer") reasonDetail = resultBuffer.toString() + if(!reasonDetail.isNullOrEmpty()){ + tvAudioResult.text = reasonDetail + } } @@ -345,35 +341,17 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene ) scaleAnimation.duration = 1000 scaleAnimation.repeatCount = -1 - viewAudioButton.startAnimation(scaleAnimation) - - tvAudioCountDown.visibility = View.VISIBLE - //开始倒计时 - if(countDownTimer==null){ - countDownTimer = object : CountDownTimer(60000, 1000) { - - override fun onTick(millisUntilFinished: Long) { - tvAudioCountDown.text = "${millisUntilFinished/1000}S" - } - - override fun onFinish() { - tvAudioCountDown.visibility = View.GONE - //结束录音 - RecordManager.getInstance().stop() - //结束动画 - viewAudioButton.clearAnimation() - } - } - countDownTimer?.start() - } + viewAudioButton.visibility = View.GONE + viewAudioStart.visibility = View.VISIBLE + viewAudioStart.startAnimation(scaleAnimation) + tvAudioResult.text = "..." }else{ //停止语音听写 mIat?.stopListening() - //结束倒计时 - countDownTimer?.cancel() - countDownTimer?.onFinish() - //将倒计时置空 - countDownTimer = null + //结束录音 + RecordManager.getInstance().stop() + //结束动画 + viewAudioStart.clearAnimation() } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml index 96a89f7004..3424a3f421 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml @@ -104,6 +104,23 @@ android:layout_marginBottom="@dimen/dp_40" /> + + - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml index 4178a3b155..72e93d6b9d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml @@ -104,6 +104,23 @@ android:layout_marginBottom="@dimen/dp_40" /> + + - - \ No newline at end of file