From 90b8e20e828b11edfe7f8208ecf96ba2aa1a944b Mon Sep 17 00:00:00 2001
From: itgaojian <itgaojian@163.com>
Date: Fri, 12 May 2023 15:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=95=E9=9F=B3=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E6=89=93=E4=B8=8D=E5=BC=80?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                  |   4 +
 baselib/build.gradle                          |   2 +-
 .../core/widget/base/BaseActivity.java        |  34 +-
 .../core/widget/videorecord/AudioManager.java |   0
 .../widget/videorecord/AudioRecordButton.java |   0
 .../widget/videorecord/DialogManager.java     |   0
 .../core/widget/videorecord/MediaManager.java |   0
 .../core/widget/voicebutton/VoiceButton.kt    | 297 ++++++++++
 .../interfaces/MediaRecorderStateListener.kt  |  30 +
 .../voicebutton/utils/RecordDialogManager.kt  | 124 +++++
 .../widget/voicebutton/utils/RecordManager.kt | 131 +++++
 .../main/res/drawable-xhdpi/ic_recorder.png   | Bin 0 -> 1839 bytes
 .../main/res/drawable-xhdpi/record_cancel.png | Bin 0 -> 1858 bytes
 .../res/drawable-xhdpi/voice_to_short.png     | Bin 0 -> 1749 bytes
 .../src/main/res/drawable-xhdpi/volume_0.png  | Bin 0 -> 242 bytes
 .../src/main/res/drawable-xhdpi/volume_1.png  | Bin 0 -> 340 bytes
 .../src/main/res/drawable-xhdpi/volume_2.png  | Bin 0 -> 441 bytes
 .../src/main/res/drawable-xhdpi/volume_3.png  | Bin 0 -> 531 bytes
 .../src/main/res/drawable-xhdpi/volume_4.png  | Bin 0 -> 651 bytes
 .../src/main/res/drawable-xhdpi/volume_5.png  | Bin 0 -> 757 bytes
 .../src/main/res/drawable-xhdpi/volume_6.png  | Bin 0 -> 857 bytes
 .../main/res/drawable/bg_dialog_loading.xml   |   6 +
 .../src/main/res/layout/dialog_recorder.xml   |  44 ++
 baselib/src/main/res/values/colors.xml        |   2 +
 baselib/src/main/res/values/dimens.xml        |  13 +
 baselib/src/main/res/values/strings.xml       |   8 +
 baselib/src/main/res/values/styles.xml        |  16 +
 commonmodule/build.gradle                     |   1 +
 .../cases/IncidentReportActivity.java         | 520 ++++++++----------
 .../TaskConverIncidentReportActivity.java     | 432 ++++++---------
 .../res/layout/activity_incident_report.xml   |   7 +-
 .../activity_task_conver_incident_report.xml  |   2 +-
 32 files changed, 1108 insertions(+), 565 deletions(-)
 mode change 100755 => 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/AudioManager.java
 mode change 100755 => 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/AudioRecordButton.java
 mode change 100755 => 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/DialogManager.java
 mode change 100755 => 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/MediaManager.java
 create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/VoiceButton.kt
 create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/interfaces/MediaRecorderStateListener.kt
 create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordDialogManager.kt
 create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordManager.kt
 create mode 100755 baselib/src/main/res/drawable-xhdpi/ic_recorder.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/record_cancel.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/voice_to_short.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_0.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_1.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_2.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_3.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_4.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_5.png
 create mode 100755 baselib/src/main/res/drawable-xhdpi/volume_6.png
 create mode 100755 baselib/src/main/res/drawable/bg_dialog_loading.xml
 create mode 100755 baselib/src/main/res/layout/dialog_recorder.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7abf1a3..d28f3f4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,6 +7,10 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="WRAP_LONG_LINES" value="true" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
diff --git a/baselib/build.gradle b/baselib/build.gradle
index dde1426..ef0aafb 100755
--- a/baselib/build.gradle
+++ b/baselib/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'kotlin-android'
 android {
     compileSdkVersion rootProject.ext.gCompileSdkVersion
     defaultConfig {
@@ -114,5 +115,4 @@ dependencies {
 
 
 
-
 }
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java
index 5b55aac..5cda271 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java
@@ -597,23 +597,23 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
 
-    /**
-     * 程序字号不随系统设置而改变
-     *
-     * @return
-     */
-    @Override
-    public Resources getResources() {
-        Resources res = super.getResources();
-        if (res != null) {
-            Configuration config = res.getConfiguration();
-            if (config != null && config.fontScale != 1.0f) {
-                config.fontScale = 1.0f;
-                res.updateConfiguration(config, res.getDisplayMetrics());
-            }
-        }
-        return res;
-    }
+//    /**
+//     * 程序字号不随系统设置而改变
+//     *
+//     * @return
+//     */
+//    @Override
+//    public Resources getResources() {
+//        Resources res = super.getResources();
+//        if (res != null) {
+//            Configuration config = res.getConfiguration();
+//            if (config != null && config.fontScale != 1.0f) {
+//                config.fontScale = 1.0f;
+//                res.updateConfiguration(config, res.getDisplayMetrics());
+//            }
+//        }
+//        return res;
+//    }
 
     @Override
     public void onBackPressed() {
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/AudioManager.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/AudioManager.java
old mode 100755
new mode 100644
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/AudioRecordButton.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/AudioRecordButton.java
old mode 100755
new mode 100644
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/DialogManager.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/DialogManager.java
old mode 100755
new mode 100644
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/MediaManager.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/videorecord/MediaManager.java
old mode 100755
new mode 100644
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/VoiceButton.kt b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/VoiceButton.kt
new file mode 100755
index 0000000..2ae2062
--- /dev/null
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/VoiceButton.kt
@@ -0,0 +1,297 @@
+package com.tenlionsoft.baselib.core.widget.voicebutton
+
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioManager
+import android.os.Build
+import android.os.Environment
+import android.os.Handler
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.appcompat.widget.AppCompatButton
+import com.tenlionsoft.baselib.core.widget.voicebutton.interfaces.MediaRecorderStateListener
+import com.tenlionsoft.baselib.core.widget.voicebutton.utils.RecordDialogManager
+import com.tenlionsoft.baselib.core.widget.voicebutton.utils.RecordManager
+import com.tenlionsoft.baselib.R
+import com.tenlionsoft.baselib.utils.LogUtils
+import java.io.File
+
+
+class VoiceButton @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.buttonStyle
+) :
+    AppCompatButton(context, attrs, defStyleAttr) {
+    //当前状态
+    private var currentState = STATE_NORMAL
+    private lateinit var recordDialogManager: RecordDialogManager
+    private lateinit var recordManager: RecordManager
+    private val recorderStateListener: RecorderStateListener
+    private var audioManager: AudioManager
+    private lateinit var mFocusRequest: AudioFocusRequest
+    private lateinit var mAudioAttributes: AudioAttributes
+    private var audioFocusChangeListener: AudioManager.OnAudioFocusChangeListener
+
+    //录音中标识
+    private var isRecording = false
+
+    //录音时间
+    private var recordTime: Long = 0
+
+    fun setMaxRecordLength(time: Int) {
+        recordManager?.let {
+            it.maxRecordLength = time
+        }
+    }
+
+    //采样间隔时间
+    private val samplingInterval: Long = 200
+
+    //最短录音时长
+    private val minRecordTime: Long = 600
+    private val mHandler = Handler()
+
+    /**
+     * 更新话筒状态
+     */
+    private val mUpdateMicStatusTimer = Runnable {
+        while (isRecording) {
+            try {
+                Thread.sleep(samplingInterval)
+                recordTime += samplingInterval
+                mHandler.post(updateDialogRunable)
+                if (recordManager.maxRecordLength - recordTime < 10 * 1000) {
+                    //剩余录音时间小于10秒时显示剩余录制时间提示
+                    if (currentState != STATE_WANT_TO_CANCEL) {
+                        mHandler.post(updateRemainingTimeRunable)
+                    }
+                }
+            } catch (e: InterruptedException) {
+                e.printStackTrace()
+            }
+        }
+    }
+    private val updateDialogRunable = Runnable { //时时更新音量显示
+        recordDialogManager.updateVoiceLevel(recordManager.getVoiceLevel(6))
+    }
+    private val updateRemainingTimeRunable = Runnable { //时时更新剩余录音时间显示
+        recordDialogManager.updateRemainingTime((recordManager.maxRecordLength - recordTime).toInt() / 1000)
+    }
+    private val dismissDialogRunable = Runnable { recordDialogManager.dimissDialog() }
+
+    /**
+     * 录音完成后的回调接口
+     */
+    interface RecorderListener {
+        //开始录音
+        fun onStart()
+
+        //录音时长和文件保存路径
+        fun onFinish(time: Long, filePath: String?)
+    }
+
+    private var recorderListener: RecorderListener? = null
+    fun setRecorderListener(recorderListener: RecorderListener?) {
+        this.recorderListener = recorderListener
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        //获取手势类型及触摸位置坐标
+        val action = event.action
+        val y = event.y
+        when (action) {
+            MotionEvent.ACTION_DOWN -> setText(R.string.str_recorder_recording)
+            MotionEvent.ACTION_MOVE -> if (isRecording) {
+                //根据x,y的坐标判断是否需要取消
+                if (wantToCancel(y)) {
+                    changeState(STATE_WANT_TO_CANCEL)
+                } else {
+                    changeState(STATE_RECORDING)
+                }
+            }
+            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
+                //如果longclick(录音)操作没触发
+                if (currentState == STATE_NORMAL) {
+                    LogUtils.e("未触发录音或者录音达到最大时长已经结束")
+                    releaseAudioFocus()
+                    setText(R.string.str_recorder_normal)
+                    resetRecordState()
+                    return super.onTouchEvent(event)
+                }
+                //触发了onlongclick(录音)操作，但录音控件没有准备好（即prepare()、start()方法未执行完）或者录音时间过短所以删除文件夹
+                if (currentState == STATE_PREPAREING || recordTime < minRecordTime) {
+                    LogUtils.e("未初始化完成或者录音太短")
+                    releaseAudioFocus()
+                    recordDialogManager.showRocordTooShortDialog()
+                    recordManager.cancel()
+                    mHandler.postDelayed(dismissDialogRunable, 1000)
+                } else if (currentState == STATE_RECORDING) {
+                    LogUtils.e("正常录制结束")
+                    releaseAudioFocus()
+                    //正常录制结束
+                    recordManager.release()
+                    recordDialogManager.dimissDialog()
+                    if (recorderListener != null) {
+                        recorderListener!!.onFinish(
+                            recordTime,
+                            recordManager.recordAbsoluteFileDir
+                        )
+                    }
+                } else if (currentState == STATE_WANT_TO_CANCEL) {
+                    LogUtils.e("滑动取消了录制")
+                    releaseAudioFocus()
+                    //想要取消录制
+                    recordManager.cancel()
+                    recordDialogManager.dimissDialog()
+                }
+                resetRecordState()
+            }
+        }
+        return super.onTouchEvent(event)
+    }
+
+    //判断是否想取消录制
+    private fun wantToCancel(y: Float): Boolean {
+        //如果上下滑出 button  加上我们自定义的距离
+        return y < -DISTANCE_Y_CANCEL
+    }
+
+    //改变状态
+    private fun changeState(state: Int) {
+        if (currentState != state) {
+            currentState = state
+            when (state) {
+                STATE_NORMAL -> setText(R.string.str_recorder_normal)
+                STATE_PREPAREING -> recordDialogManager.showPrepareDialog()
+                STATE_RECORDING -> {
+                    setText(R.string.str_recorder_recording)
+                    if (isRecording) {
+                        recordDialogManager.showRecordingDialog()
+                    }
+                }
+                STATE_WANT_TO_CANCEL -> {
+                    setText(R.string.str_recorder_want_cancel)
+                    recordDialogManager.showCancelRecording()
+                }
+            }
+        }
+    }
+
+    /**
+     * 恢复录音状态、标志位
+     */
+    private fun resetRecordState() {
+        changeState(STATE_NORMAL)
+        isRecording = false
+        recordTime = 0
+    }
+
+    private inner class RecorderStateListener : MediaRecorderStateListener {
+        override fun onError(what: Int, extra: Int) {
+            LogUtils.e("录音出错了=====>what:$what,extra:$extra")
+        }
+
+        override fun wellPrepared() {
+            recorderListener?.run {
+                requestAudioFocus()
+                onStart()
+            }
+            isRecording = true
+            changeState(STATE_RECORDING)
+            //开启线程实时更新音量
+            Thread(mUpdateMicStatusTimer).start()
+        }
+
+        override fun onStop(filePath: String?) {
+            LogUtils.e("录音停止了=====>filePath:$filePath")
+        }
+
+        override fun onReachMaxRecordTime(filePath: String?) {
+            //到达最大录制时间录制结束
+            recordManager.release()
+            recordDialogManager.dimissDialog()
+            if (recorderListener != null) {
+                recorderListener!!.onFinish(recordTime, filePath)
+            }
+            resetRecordState()
+        }
+    }
+
+    companion object {
+        private const val TAG = "VoiceButton"
+
+        //手指滑动指定距离后判定取消录音
+        private const val DISTANCE_Y_CANCEL = 100f
+
+        //录音状态
+        private const val STATE_NORMAL = 1 //默认状态
+        private const val STATE_PREPAREING = 2 //录音控件准备状态
+        private const val STATE_RECORDING = 3 //录制
+        private const val STATE_WANT_TO_CANCEL = 4 //取消录制
+    }
+
+    /**
+     * 构造函数
+     *
+     * @param context
+     */
+    init {
+        recordDialogManager = RecordDialogManager(context)
+        recorderStateListener = RecorderStateListener()
+        audioManager =
+            context.applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        audioFocusChangeListener = AudioManager.OnAudioFocusChangeListener { }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mAudioAttributes = AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_MEDIA)
+                .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                .build();
+            mFocusRequest =
+                AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+                    .setAudioAttributes(mAudioAttributes)
+                    .setOnAudioFocusChangeListener(audioFocusChangeListener)
+                    .build();
+        }
+        var saveFile: File? = null
+        /* 判断sd的外部设置状态是否可以读写 */saveFile =
+            if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
+                File(context.getExternalFilesDir(null), "recorder_audios")
+            } else {
+                File(context.filesDir, "recorder_audios")
+            }
+        if (!saveFile.exists()) {
+            saveFile.mkdirs()
+        }
+        recordManager = RecordManager(saveFile.path)
+        recordManager.setMediaRecorderStateListener(recorderStateListener)
+        //按钮长按准备录音包括start
+        setOnLongClickListener {
+            changeState(STATE_PREPAREING)
+            recordManager.prepareAudio()
+            false
+        }
+        setText(R.string.str_recorder_normal)
+    }
+
+    fun requestAudioFocus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            audioManager.requestAudioFocus(mFocusRequest);
+        } else {
+            audioManager.requestAudioFocus(
+                audioFocusChangeListener,
+                AudioManager.STREAM_MUSIC,
+                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
+            );
+        }
+    }
+
+    fun releaseAudioFocus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            audioManager.abandonAudioFocusRequest(mFocusRequest);
+        } else {
+            audioManager.abandonAudioFocus(audioFocusChangeListener);
+        }
+    }
+}
\ No newline at end of file
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/interfaces/MediaRecorderStateListener.kt b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/interfaces/MediaRecorderStateListener.kt
new file mode 100755
index 0000000..791d3b2
--- /dev/null
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/interfaces/MediaRecorderStateListener.kt
@@ -0,0 +1,30 @@
+package com.tenlionsoft.baselib.core.widget.voicebutton.interfaces
+
+/**
+ * MediaRecorder准备完毕回调接口
+ */
+interface MediaRecorderStateListener {
+    /**
+     * 设备异常
+     */
+    fun onError(what: Int, extra: Int)
+
+    /**
+     * 设备准备好
+     */
+    fun wellPrepared()
+
+    /**
+     * 停止录音
+     *
+     * @param filePath 保存路径
+     */
+    fun onStop(filePath: String?)
+
+    /**
+     * 到达最大录音时长
+     *
+     * @param filePath 保存路径
+     */
+    fun onReachMaxRecordTime(filePath: String?)
+}
\ No newline at end of file
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordDialogManager.kt b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordDialogManager.kt
new file mode 100755
index 0000000..99067b4
--- /dev/null
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordDialogManager.kt
@@ -0,0 +1,124 @@
+package com.tenlionsoft.baselib.core.widget.voicebutton.utils
+
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import com.tenlionsoft.baselib.R
+
+//录音dialog管理类
+class RecordDialogManager(private val mContext: Context) {
+    private var mDialog: AlertDialog? = null
+
+    //录音麦克风标志
+    private var mIcon: ImageView? = null
+
+    //录音音量标志
+    private var mVoice: ImageView? = null
+
+    //录音提示
+    private var mLable: TextView? = null
+
+    //准备录音标志
+    private var mProgressBar: ProgressBar? = null
+
+    //显示准备录音dialog
+    fun showPrepareDialog() {
+        if (mDialog == null) {
+            val builder =
+                AlertDialog.Builder(mContext, R.style.Theme_RecordDialog)
+            val inflater = LayoutInflater.from(mContext)
+            val view = inflater.inflate(R.layout.dialog_recorder, null)
+            mIcon = view.findViewById(R.id.iv_recorder_icon)
+            mVoice = view.findViewById(R.id.iv_recorder_voice)
+            mLable = view.findViewById(R.id.tv_recorder_label)
+            mProgressBar = view.findViewById(R.id.progressBar)
+            mIcon!!.visibility = View.GONE
+            mVoice!!.visibility = View.GONE
+            mLable!!.visibility = View.GONE
+            mProgressBar!!.visibility = View.VISIBLE
+            builder.setView(view)
+            mDialog = builder.create()
+            mDialog!!.setCancelable(false)
+            mDialog!!.setCanceledOnTouchOutside(false)
+            mDialog!!.show()
+        }
+    }
+
+    //显示录音dialog
+    fun showRecordingDialog() {
+        if (mDialog != null && mDialog!!.isShowing) {
+            mIcon!!.setImageResource(R.drawable.ic_recorder)
+            mIcon!!.visibility = View.VISIBLE
+            mVoice!!.visibility = View.VISIBLE
+            mLable!!.visibility = View.VISIBLE
+            mProgressBar!!.visibility = View.INVISIBLE
+            mLable!!.setText(R.string.str_recorder_swip_cancel)
+            mLable!!.setBackgroundColor(Color.TRANSPARENT)
+        }
+    }
+
+    //想要取消
+    fun showCancelRecording() {
+        if (mDialog != null && mDialog!!.isShowing) {
+            mIcon!!.setImageResource(R.drawable.record_cancel)
+            mIcon!!.visibility = View.VISIBLE
+            mVoice!!.visibility = View.GONE
+            mLable!!.setText(R.string.str_recorder_want_cancel)
+            mLable!!.setBackgroundResource(R.color.colorDarkOrange)
+            mLable!!.visibility = View.VISIBLE
+            mProgressBar!!.visibility = View.INVISIBLE
+        }
+    }
+
+    //录音时间太短
+    fun showRocordTooShortDialog() {
+        if (mDialog != null && mDialog!!.isShowing) {
+            mIcon!!.setImageResource(R.drawable.voice_to_short)
+            mLable!!.setText(R.string.str_recorder_too_short)
+            mIcon!!.visibility = View.VISIBLE
+            mVoice!!.visibility = View.GONE
+            mLable!!.visibility = View.VISIBLE
+        }
+    }
+
+    //关闭dialog
+    fun dimissDialog() {
+        if (mDialog != null && mDialog!!.isShowing) {
+            mDialog!!.dismiss()
+            mDialog = null
+        }
+    }
+
+    /**
+     * 通过level更新voice上的图片
+     *
+     * @param level
+     */
+    fun updateVoiceLevel(level: Int) {
+        if (mDialog != null && mDialog!!.isShowing) {
+            val resId = mContext.resources
+                .getIdentifier("volume_$level", "drawable", mContext.packageName)
+            mVoice!!.setImageResource(resId)
+        }
+    }
+
+    /**
+     * 开启倒计时通知
+     *
+     * @param time
+     */
+    fun updateRemainingTime(time: Int) {
+        if (mDialog != null && mDialog!!.isShowing) {
+            mLable!!.visibility = View.VISIBLE
+            mLable!!.text = String.format(
+                mContext.resources.getString(R.string.time_remaining), time + 1
+            )
+        }
+    }
+
+}
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordManager.kt b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordManager.kt
new file mode 100755
index 0000000..d91b9ec
--- /dev/null
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/voicebutton/utils/RecordManager.kt
@@ -0,0 +1,131 @@
+package com.tenlionsoft.baselib.core.widget.voicebutton.utils
+
+import android.media.MediaRecorder
+import com.tenlionsoft.baselib.core.widget.voicebutton.interfaces.MediaRecorderStateListener
+import java.io.File
+import java.io.IOException
+import java.util.*
+import kotlin.math.log10
+
+class RecordManager(
+    //音频文件存储目录
+    private val recordFileDir: String
+) {
+
+    //音频文件绝对存储路径
+    var recordAbsoluteFileDir: String? = null
+        private set
+
+    //通过MediaRecorder实现录音功能
+    private var mediaRecorder: MediaRecorder? = null
+
+    // 最大录音时长,默认1000*60（一分钟）
+    var maxRecordLength = 1000 * 60
+
+    //录音控件初始化状态标志
+    private var isPrepared = false
+
+    //音量分级标准
+    private val volumeBase: Long = 600
+    private var mediaRecorderStateListener: MediaRecorderStateListener? = null
+    fun setMediaRecorderStateListener(mediaRecorderStateListener: MediaRecorderStateListener?) {
+        this.mediaRecorderStateListener = mediaRecorderStateListener
+    }
+
+    /**
+     * 准备录音控件
+     */
+    fun prepareAudio() {
+        try {
+            val dir = File(recordFileDir)
+            if (!dir.exists()) {
+                dir.mkdir()
+            }
+            //生成随机文件名
+            val file =
+                File(dir, UUID.randomUUID().toString() + ".amr")
+            recordAbsoluteFileDir = file.absolutePath
+            // 需要每次使用前重新构造，不然在调用setOutputFile()时会报重用异常
+            mediaRecorder?.let {
+                mediaRecorder!!.release()
+                mediaRecorder = null
+            }
+            mediaRecorder = MediaRecorder()
+            //设置输出文件
+            mediaRecorder!!.setOutputFile(recordAbsoluteFileDir)
+            mediaRecorder!!.setMaxDuration(maxRecordLength)
+            //设置MediaRecorder的音频源为麦克风
+            mediaRecorder!!.setAudioSource(MediaRecorder.AudioSource.MIC)
+            //设置音频格式
+            mediaRecorder!!.setOutputFormat(MediaRecorder.OutputFormat.AMR_NB)
+            //设置音频的格式为amr
+            mediaRecorder!!.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB)
+            mediaRecorder!!.setOnInfoListener { mr, what, extra ->
+                if (what == MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED) {
+                    mediaRecorderStateListener?.run {
+                        //到达最大录音时间
+                        onReachMaxRecordTime(recordAbsoluteFileDir)
+                    }
+                }
+            }
+            mediaRecorder!!.setOnErrorListener { mr, what, extra ->
+                mediaRecorderStateListener?.run {
+                    //录音发生错误
+                    onError(what, extra)
+                }
+            }
+            mediaRecorder!!.prepare()
+            mediaRecorder!!.start()
+            //准备结束,可以开始录音了
+            isPrepared = true
+
+            mediaRecorderStateListener?.run {
+                wellPrepared()
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+
+    //正常录音结束释放资源
+    fun release() {
+        mediaRecorder?.let {
+            try {
+                mediaRecorder!!.stop()
+                mediaRecorder!!.release()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            mediaRecorder = null
+            isPrepared = false
+        }
+    }
+
+    //中途取消录音,删除音频文件
+    fun cancel() {
+        release()
+        recordAbsoluteFileDir?.let {
+            val file = File(it)
+            file.delete()
+            recordAbsoluteFileDir = null
+        }
+    }
+
+    /**
+     * 根据音量分级更新麦克状态
+     */
+    fun getVoiceLevel(maxLevel: Int): Int {
+        if (isPrepared && mediaRecorder != null) {
+            val ratio = mediaRecorder!!.maxAmplitude.toDouble() / volumeBase
+            var db = 0.0 // 分贝
+            if (ratio > 1) {
+                db = 20 * log10(ratio)
+                return if (db / 4 > maxLevel) {
+                    maxLevel
+                } else (db / 4).toInt()
+            }
+        }
+        return 0
+    }
+
+}
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_recorder.png b/baselib/src/main/res/drawable-xhdpi/ic_recorder.png
new file mode 100755
index 0000000000000000000000000000000000000000..e12231f820df016a97eed2eda0cca98f648cc434
GIT binary patch
literal 1839
zcmeH{**6;q6vkr-lGavY9byeNmX^}0T`i5B*q5oc(~7kkRi;%W_J|Qt$}kNh=_#$W
zO$CD%rPdHdL}QD+jjhyDOBr+KW&VaabI<wi_dVT*d(Zu4xw+U2gXO>g06-Xi*~a78
z<BwG%#CP10co{tafM?jv$<y}e|N75u0ITlIbA0B~J030w0PIFV<K)JX&aczDJPz+2
z4LXH#zvrnlj91`W=hc=4`wzO?^|Enuv)Umyi(8wfzE-bmtnCU&C`~}QgJ(yZU7cIX
zW00r^M0eKwnChXV!lM6A&nut(ym><WoBUO|UV4Om<aXP;%d2PDw4|LxeX9!5agq$4
zkkQ506Frk!xc5ecdamXkke?}LPC5BB01`A(c1K0=$th(IO+_hH1pt6Q3T|WN8P8rR
z+4UK+6zfFfQ5^oP@)URdVmI&*Blw54JHH_oSqb!%BqwKL{3G2>@s2=X(~;knaS4fs
zJ<%sXe7k#C+eS}hzx?=UHK9UNQxcqJUG8>72>ems`(^{^b_j*;JMFK_tzw2>CX77q
zM?L0t_bX>>YOrRt&+8Gj%MVNiUro}Mx(NP0oLKBqfU8H?8;0y^x;4QrO}>;9rL7X`
zRpV|RC&9NP{Y!qt>Vi%xJdJR~2&faciyYH}1X>n(DaB5W_KQsF-qu)`ln|Nk9W#po
zJwlPuj^A30sr7!T2op7Q+y*8N&bzh%T+3^laI9Bf3`IgM>OH~n78VySf$MS5KwV%$
zGPLwGaCt!x`j8jKYkdYIjtk~jm1z~S`zM+Jw<{Byx%qsx^a2kEdWwt&%LXq6o+ckw
zdfiB_jv+ss+L&dFj55Ann(&Vhq|-*l{yl(mBoqkh_L|{1XjaegB653`*QKVUG|k$X
z8x_v<wi)L>RkwSR9ZV<Ab$pQOWQR`5pqvaegqN7SoIjJZ^xe(>#Oy^_v>0{iYJx+P
zSCU+Z6)ZYMeJtI0`Xo-is3iwKVZ#@awj#5rG|<IwF8YxT6k0xISQbb^e~rjc>cc03
zI!xkQhfzbkvo|{s#9n+-ngHrseM7e<Ke`vk@$M46l9pUntu-is_O^>|6aXrSaSR9$
zgsLo!j%4||jy_FVx+t9Kw-{wfO5H`i$ag{I+u6`D=R@bD3@!`;)$2mrd!urPtDEDL
z1|e51`bdqi&m#=Aiiq*#@K$LNYD|G*L({!21|uB3wLM7oYKuu8vkz%_mO<SgirIg?
zwR!*CNM|g{)Up{hpRCwO+zzu}lb0B{?>oDhVLkwb3FN#ExqE$wBPMJ<XR4hfSyrIj
z=F5Fh+S8+G@O=3({_UvZy5i8%j{Yy#unT5E*!|%IIPuf8%j%(}X}Pp$$-Bpa=`2Y4
zR=i68RB?1#D9xyJGXtoHG=1GvcGk%U20F2;7J#cH2ApiC4CZZ=f6A8rQ2t1jT-a^K
z$Z3#z73D-PQr^VUK6!OL#e$4VXI|tO_vcWVxNSMZTQiv88v`}zV;vns(oQ&9@yKpj
ze7?@LNqt!35IN5Ex4QhyYnKqQ3-kLMkyYb$^9$n*r|;+3t~HWOG(M~+t~c!{WRcqA
zYNxugItjPfUpDE2;r$uKpQBOU+LTe2eJ{zT<oA*neS4C!(A<Qcs%l~hQyVm$>%p$a
zJ}X*VH&R~Fsmt2cy&J(gNL6tqHX|c^S9(KiDRxsYqxbC~yWC>OnAZIiGpxZL+mAX2
zVL4oE))J|DV>sM|Xa5iu=~K$8TN7@jKH**wW!o~H<1jmKlMsdO?s)1rA<WR~_z4c6
zm<LrvA?(NZv?49u_H>z`z-+jBEeV|ReY-{Q$n49N#$k(P9SYQ_kj9mI-@pU||K`Cl
d7Pjg(C4@j$rkRzwd&h(Xz-?V@DAvK4zW^5Hb?*QG

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/record_cancel.png b/baselib/src/main/res/drawable-xhdpi/record_cancel.png
new file mode 100755
index 0000000000000000000000000000000000000000..3d0d6f3dbcb9cb4e9477b7e8f56aa29fea51f74a
GIT binary patch
literal 1858
zcmeHHc{~#e0AB7RJ+WN%lN`lMJmktzM9j2^@Z36FWgDZlQE7V`jg)Ja7LO^y+()4v
zo^6gP%+W9*+oLqovMemW_uu>b{oD8Zj{m>k_xm!uAZ|(uS_%LFKndjTa(*XQchn>&
zx#J{fZx#R`A?xMo>ni?<pACq`uWk!#ca~9;cpl;dkUJicUO|2L>5Ev#IYT7v^>oc!
z7r$iseA7g~YI|#U<_2i?{-J&_@9H(|A2DYSuPTg=6}Uf&by0dh60bdculYoi!M8!1
zN+DbV%KA-3=X(o%c}msnnXIIhE6wh$yhS1+eE)%qg~Uk5({BW|)tVaFjDaJe!Q|3u
z^Q44bZR%W(+TA|>@BUAU6eq?T>VS(2r|$H29sIoFo6j^}|7sLXso6WHY-oQARYq!N
zMD+szQVt*&C*K>al^LOrsuNIlwOoUKw^UH^P^$}4=LOuGR|<3jW_2PzP4=>rdHdS8
zA7U14ba^>b;K<3=l-DO4VeF{;(<@N(WM>^Y%)ji`F{_W~mj%mbK#gWH<SE|#_<A$y
zMF&tH1!${pMERhfjbbr}FO86|j8MtXw0arz!JLSkd}73IYdhM}xW9`m#^pY@@f~9<
zR1>K6Tn=Xuoc4jcxVEka^ymeu!CzUbZ;%sGT(7|<w=+h(4~tM}Jeb^*2Sf-UYaTQ{
zgu^B2>h=3V*`Asa<|x#&{`8(@t#i5F^y7}~C3bXb=je+YQF;9p<V2ZYU?rYsj4ULL
z|7yI<G{<9+*9$ig-H+E4ZkH?PZ{J(9m5<<zHELGNRyoUahN`qTxno~AIMMfCxBT&z
zhbR-6z*v_!QZ|3{(wy!9`{Vv<8B1o+p1>wA1ib75_bi?ekR3QOec6)Y4dVq=iH8ct
z-%17rRXfVQGd8WOIyOzWQm27Cnn=)>J=ER0Z=JH^CQ#y@d9}{L@l2z-%$Y3KDCl}e
zN?PY!oPgWrGYfk%vUCJYnBj*AERKZ)t$H-fMt+xm)F*K?=_@56_e)mEmV#4)%zS9M
zQ5z=ZKE=;y_>?1U0{+r%qH?UFES4Fq5DK<zht!-owh=Hoy8raeb2eek{pe-8UZp^c
z^?CKE+}M1EZ+=!Frq!zkdZDHv>v=;67;ZltLqu!FP8=aJJYsNYBI%l+CsPC^pos~w
zNtFhLk3>8_(?%R?iK+6~J@KV)XJ)ZsZiPXis63<`O$=TppaU_L+&=jDE{*WiT{8d6
z-p>t&;%K5VgtWD-6cQoLL&&k;>`N&beQ5nrXR64r9=kAGUYp7f5j~KEYjbHi+`0x~
zI?f_M(6+BLW__rFiJXu3-J6oR<@vEKM<^w(ys`+AhJj6P*QGa$ImAt$GsfDGDVbuk
zOU=yW@ux_q+Cu|92yPt8H28R=LkD#Ti0IbFS^?(cQca0X3v(|HjJI2j>DSTQRH#AE
zuha9klLP&GQfoC^Gms8s;ayaFfi)~`mA$7>w&jEdTIXy(j@39xfVM~x6!p3~k;Wa!
zWQG(zSqS1`ts)Eq?8)rX#UwbzpomvcA?$Wgk-=iKaZMZg(dGg6H`l`mZ>rLU!};^C
zP23cFx-Qa64u>f$blve63v7_sjc~q*F{?KFN>vYF%yvu2TQ61~xZ2th&YwGnw;cit
zl%$1Aire3okhrvB65*Tq2L{t1OdyS~mGl{0XSsU_1WG50>}qP={&@`Ba=4|gXV`Uc
k<|J0aNm=SYe6YPKv9cIq5`^vkbLRm8AXkVB#W@`F1LU2TQvd(}

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/voice_to_short.png b/baselib/src/main/res/drawable-xhdpi/voice_to_short.png
new file mode 100755
index 0000000000000000000000000000000000000000..9ed0dc11eeba48e4cce25202ddcf547709615d76
GIT binary patch
literal 1749
zcmeHH{Xf$Q9RKdoGR&RFW^HpRI+sRCr93Ph%R?f}ti@e)s%d$68Ah9Fi&}bcmWMob
zo^F^cY$w%(B=R&JCF>h$lW38e>s~sq`|bXPd)?>tet$l{zaKu?fdSrz`dEDc01PQU
zUO}r@yUHdMY;|8JAAAM?kcmLQL;Jq`KmT0?PBQ;IzUp^rVo*RZU~}X`<D=2n471~R
z+ANIN&tLF;hAEKL=`?7rFr2o2LRBmE54iiica`PTt7E_FgS+Dju9<G$<rPLf=x%Fg
z_{Wo5zg@b>^xL#?4Whf|h9L83B-ss*gS}Lg7N)p3o12U^=Us_E6=;v{@2k%~w{H^O
zQC`ORN_5|NB+6AOspFjq`DU#w=5lgI#K54hycKz%g=npZ8oEu$88>*=6xESf3jlBw
z#mn;$``O&Y=Lmz-rrqza)>jpo&XkxjXIf|T=fkq|A0}PSi`X0#R9@%$yO&Q3`HV!k
zv^(^1-={uIhIYB+(;01QjI3a1Lg9uhHk2ziqVwVE9MO4~3pzP9jBL=l-Eq@Xoh0v<
zCB^d*!`KIf!!A`7sV>o$RnaE}uVP}Nt<0m<M<-Jf77dCPw4KWW=JHP}=-wgo@1$uG
zefqhi{i+zd@rxgv9h@vvxcxp|IF@6-wSyydjtdblC@Sq#H{<d03IjMjmLwTb7n|1V
zcg!xGZg<-PXIHn!*}~Ztgf=v^tq7xnK>}X$uUa?Qr*j%HFW)!~u?86ctJ#F*46sX0
zv~B=PWWq88#-`vGNbs5@XafQm-3hS(xU<)}vr7f<K))1hG1m%EhyoP;02pHn#$??V
zn%|X~O@3??Vd8|qJ2l^xsL<1aHYk=YfewYZJ=7y)0?8q)JJT5`QrGErp<`QO7J42D
zAxvlH^0;YoaEb_;(6tm}?Is7^Hk8hftM(s2K$PKlxn-BHnhh?JKpb9ffuxrW1nwF}
z;N=)3=d#|s5TXRSUAa@0zBrbZvCc`4gFtb9hTTQN@gpZaiv>GCYa;8?%g07g-b^c&
z1MBg1X@0tHWug(wLF@NXbEH|&+?w|Ffsr!oTLJX5cZf>Cv?GaX6+coLtv8^#e4gzg
za1E(3zAi)$Ij=lcW)>TSD1pO*B}P`Xq2}4fa<jw2Jvs;64vNsQUb8=OY%ren85F=?
zw4{HF*LLt`O4jM{CE^E3tx39qx#0IW4_1AE%;?d$(9J`e?y61qAo+)<RU6-Fn!w`F
zYx+kuBKEz)7UY4wnamZJ6^M=e$oaFC8gi)0xJrzt@d&(3LIkgrn^{WZxq7w_)F}o$
z+w*>yPv^a<6u$=XR93|d-To2^UA1<r)}TTBeB%}q`%`eFQql~LK4dI})rTt<_ws8`
zJh|yD6DxW-iytw`+pWdg#e2PJFKCP*C$W0j<DUpqzT5=8N2>=lnvvoYjp4BQHVNsC
zEqj+6Kfz*SsNo){$&oUQw8v7)#*ez1Znt`$C5g(Fc6C%5YaAKWCTwSQWJd0-4>V=P
zhN9?RU{aX+G>+MGR=t$b469D(!z^YNAMky0N*Cw?m~3{jFyALCjig#ApX~NkBL2GP
zA{qCl-FBztD2GWnd9VzPd6zuy+e^fat;}s>ThOp7e2~<62Rfm1>#^y>bS_-Up-Qds
z2d~adhw6y!Ek~W?bU41VXwUJUaN^ti{2PLZ*oKt*TQqAKJz50WzN3V=+S7mG>qK|p
X+UP9CTAE$6`n~|lz5uTVa%AS;sVFFc

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_0.png b/baselib/src/main/res/drawable-xhdpi/volume_0.png
new file mode 100755
index 0000000000000000000000000000000000000000..9ca1a7336c7e97ad347966f1a13c3d2e9e3203ee
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwqAQpN#3A+G;P2TuiFxC6BdmIV0)
zGyIR#{K|ZCW`@OI?i(vAJS1W~SC|4NV?A9QLn>~)y?T<j!9ak;G5Nq9_kS0am>$?V
zt@2tRuYGnJ6HpZjII#M6Nbo~D5xHXlJC^3zEIm}LwWsCKYca0(D;X_=9vX}83wn54
dnwjCpRQB3%#*^E>wXuNod%F6$taD0e0ss<oaOnU5

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_1.png b/baselib/src/main/res/drawable-xhdpi/volume_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..e47ac2c148b6a61a3dd35909243fb53c89acf90f
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwqAQn3L(A+G;v3G8zp90yt?UlQaO
z%<#X)NBY(7?r80AET?8=TSaPqWj;AG!{RUZjTIFh5~jIdbAU?QJzX3_DsH{Kc08Av
zk%!^n=1o&`Jo!%joxYOqORS8+<pXvc6J*$c3Xy=s;{NSwp%qcB>46n-XDb3*r-xRA
zw%RZLP$k^D{pzz@p$}_C{}r8Tm{>dWe&`Q@*8b%he}d2c*v|Do^x=Pvntd)0v$s0r
mh5m?Zl@I;#vWJnO=M?u>cb3jSY7aa>)_A)5xvX<aXaWG6kGr7&

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_2.png b/baselib/src/main/res/drawable-xhdpi/volume_2.png
new file mode 100755
index 0000000000000000000000000000000000000000..b8df544a1f13baf0e1ffa56d4557daa567dbfc39
GIT binary patch
literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwqAQtbggA+G-i2M`MPZU#C@w<O3f
znBo7tJiCAVch}bX$-dd!8(ZTe{c3l2wDvcaQ?s(IA~nA<pPZRt@t6C?iV6>j(^8fB
zAdh*vIEGZ*dV9^?&)HGH!LgZ9T6oThlPr^W{{Lygr2XZ~(pB7hT>E#Wn=k=Y!@!Sv
z>-t-34?Wh}Bi{O*f6<2}RWX;fY9d<GLw{&+$%oH=y@YFi*u$O0Y&>tK?_6={wAP-k
zL$9-r0j2kF#fLmRtx;1d+nT@XY-x1s`&A$I27}c73}`hE{P9tf%Rbz=ZsnodT7RTk
w@84Ve!F{WP-RckFqW{(%vOg!maA3h7CWhS{PLIT9ih`Wu>FVdQ&MBb@0CesI761SM

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_3.png b/baselib/src/main/res/drawable-xhdpi/volume_3.png
new file mode 100755
index 0000000000000000000000000000000000000000..2f341e663dae832b2912a32ebf4070b629ff1ebf
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwqAQX2z&LR|k3H88LHtt-&+)+IrH
z!3_ToOh_>J#ddyvfrG%k_4V`e?EdlJU0drX`(|%%Y>kiftKHqv+TU1C&C0fl)cneP
za%P6bU+x<#Dm)~Z9d>5|jk)IO;uunK>+LmDK4(WBhKmNqKydee!pq>L(zTiQSeM<H
z`ZmC0l8Pq+Es1})-(^L?6t3ed3S_v{Ck0rz{(WU4dM@Chj_5hZhc>20+#x$&cuf}B
zpuO3p^>oM%rq<P_8Zpc5!kf9wR~B@0ZC_Z>J}V|x>(1gswby4ZX^5T4tYx$0kg|r&
zvU?Ryt;<6y+*+RpRBUWHq@7i?cIAgQuKd{4Nlay_?^b+}<C5<S_~Ekm<4msj6(2;o
w?!OE8;mA8dU9>Lnp}FY49mjw!WqQgjF^A{t(nIyffj(sLboFyt=akR{0Da6tX8-^I

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_4.png b/baselib/src/main/res/drawable-xhdpi/volume_4.png
new file mode 100755
index 0000000000000000000000000000000000000000..6f75e9c5aef39df340e73d09fe775b064a954fed
GIT binary patch
literal 651
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwqAQV#=sLR|k3caUlG|18k6-X%eP
z!3_U}A8%?3R{qF%a8i=dZ}y7|4@^if_{Da9eu0C)z4i6;^6dWc-(6elC;Mh^Z)}Z^
z^sC+7(c0fwPR+`;iq!ndd~#-n#b53lD=IuBjQcl-GcYjndAc};RNQ)dE#1$_QN$t9
zfyHrxmY7SG_?iw`SC`cP+(q2~6f9>xsgbs*oLO0%ucG8RNd<y3y%+r#Z$4ywMf~{6
z4|<}00S{F~?s+>tH2Et3KKLPz=sBl{%`zhAf}IyVu$d}yqbhpIAyuuIWrx}Wb`-I+
z_OFbtb!zorSumArzT-owuPO6_AMR524N8bkYvwXvS-{P;-8x{0ckDVj(RaZQ8Aaus
z9twUf>RtJPRdk-kIThAzseUUzsEY1uI&}St<o$q$(ONa`t?2<j>iAmaS4@9Bk;^{t
zVY>UwB?q>h5!d>|)p}nn;Ky96$NXA*mK>TNQ1O+u_4*a&Prj}7D?aFp-m^Fc^i<O)
Z_J9cC_{glFHNXI8@O1TaS?83{1OT@qkp}<(

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_5.png b/baselib/src/main/res/drawable-xhdpi/volume_5.png
new file mode 100755
index 0000000000000000000000000000000000000000..b62cc0e9462f612f4f5f37b120d5fb60391937bb
GIT binary patch
literal 757
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwrLU|<vs@CkAKKMGJopvQQlJTQ!+
zOM?7@8UCl5{o%a2q|{aP$<~$-l}}8<k2f_1D}Q7>I4Q~KH~Ynf2PPyK{9-#lzraD@
z-un7^d3OK!@2;)&lYO(dH@3z{`ql34Xzgz-r)FhaMQVO!J~=bP;xG4&6%`&5?<214
z2F8Jfr;B4q#jUs3UYa!}ia0!MQBp~s=`^!_isH!$0Vk&@9{L;Kk^LciefiqG`41x3
zet$hjxO2u#2-x`b?|Kc^@6I0%D6kw~Vcr+~L4cJ%xPYn2eFdYD*TH0wIZGZCa`^e~
z2sx{>;d7Z#)AAMZHogaqMQpqeW^$Z6<M_emt9{&p2d-RkO%L7}v8)g9PP$r~mDV_S
zyCv7T;15!)>zzLwQ)9^wjQ?uJ`aa-;9_xF@4|b+T+#)p(yo@&=Sa(K=b-Kn6fu{aG
z#UCxdcAOHa@j58VW!L;b%XH^C%^yuo`myP0VmGE%x*jy;+Sm5L>gzFcks9xV<sx?)
z9;9(My<d6q>aqvyTy-T=XGSK3KNDuPcmCkb-W0#myl(M>a;|?358kP>)CV#zaX)xp
n<d5^g{p$>kjg2=i_{HqKPnzxa#(A2+sABMR^>bP0l+XkK^o-<_

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/volume_6.png b/baselib/src/main/res/drawable-xhdpi/volume_6.png
new file mode 100755
index 0000000000000000000000000000000000000000..26c21a8fc4ba4dc4925bfcb2fcb2f720a00a9d5f
GIT binary patch
literal 857
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gBeI>OpwrLU|_Th@CkAKKME)afu)=J9s&b2
zt0c%TnBo769Ub8sUzm^2NH_n(b$xl6TdEo7)g`5_qEEKAgs6OC5`Mg?DOmX<<H1Qu
zM!(rFE<7+H!QdC$`S}G70{7O}&&#v>$A5Qit)J|hy}hwDKGLstcSmb~V>vY|+bUA?
z>&clJ7Js>Ktf=si@R7UJ3XH!5PZ!6Kid%25g$6Mv3NSo;;MmmiU|r*bcXCWBJ9fYR
ztA9XJLvGi<RqwcKwr<^REZjL`=FR$3zpH<W#5f#m6^U^<cvK)psP#e6t8%Ty4~n?f
zH9Uw=WeE@5ylYldwuZ$!H}lO0-o1+A@^dIy!`JkBW%(V4gS{emTn?TUxZ}h-A&e_;
z@q;q1cMT8D=}liXleO$#nR5aE*CTsH?zkWPD>A3$L8BvwU*P|b0<8SOA2?Y0`y4-5
zY*kUavph}gMy0jq!C(;^--E^iHrDJ1KVJ#o>u|7JWRJ_i(*k>(de4M%#T74|8JQ6N
z%!)NX;DZ`V{!+z?*}rxeiR^JcxLafo`@zVpqNf@a^PBi%(t+kpt@JqPE>gpDQ2mOv
z-O>lfTz1PJaC7Y2)AS%atLSdP2VK_tJ5Qa_*`WP-UX#4S4@0hl{#UH)mOT*Xs%w3)
vy`1CU0=5(Cto4B(%vt~MICcgInqG;QNhu#^FRHZ$#xR4YtDnm{r-UW|$z?4V

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable/bg_dialog_loading.xml b/baselib/src/main/res/drawable/bg_dialog_loading.xml
new file mode 100755
index 0000000..1c894a0
--- /dev/null
+++ b/baselib/src/main/res/drawable/bg_dialog_loading.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#888888" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file
diff --git a/baselib/src/main/res/layout/dialog_recorder.xml b/baselib/src/main/res/layout/dialog_recorder.xml
new file mode 100755
index 0000000..de19a06
--- /dev/null
+++ b/baselib/src/main/res/layout/dialog_recorder.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_dialog_loading"
+    android:padding="@dimen/margin_padding">
+
+    <LinearLayout
+        android:id="@+id/ll_record_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/iv_recorder_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_recorder" />
+
+        <ImageView
+            android:id="@+id/iv_recorder_voice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/volume_1" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_recorder_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/ll_record_icon"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/margin_padding_small"
+        android:padding="@dimen/margin_padding_min"
+        android:textColor="#ffffff" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/baselib/src/main/res/values/colors.xml b/baselib/src/main/res/values/colors.xml
index 8cce8d4..1d48a5f 100755
--- a/baselib/src/main/res/values/colors.xml
+++ b/baselib/src/main/res/values/colors.xml
@@ -207,4 +207,6 @@
     <color name="btn_green">#AA37B54A</color>
     <color name="btn_purple">#AA6B6FD2</color>
     <color name="col_main_theme">#216cd8</color>
+
+    <color name="colorDarkOrange">#d84315</color>
 </resources>
\ No newline at end of file
diff --git a/baselib/src/main/res/values/dimens.xml b/baselib/src/main/res/values/dimens.xml
index 262f347..736141a 100755
--- a/baselib/src/main/res/values/dimens.xml
+++ b/baselib/src/main/res/values/dimens.xml
@@ -19,4 +19,17 @@
     <dimen name="material_bottom_navigation_shadow_height">1dp</dimen>
     <dimen name="material_bottom_navigation_text_size">12dp</dimen>
 
+    <dimen name="dia_corner_radius">8dp</dimen>
+    <dimen name="margin_padding">16dp</dimen>
+    <dimen name="margin_padding_big">32dp</dimen>
+    <dimen name="margin_padding_small">8dp</dimen>
+    <dimen name="margin_padding_min">4dp</dimen>
+
+    <dimen name="text_primary">16sp</dimen>
+    <dimen name="text_small">14sp</dimen>
+    <dimen name="text_big">20sp</dimen>
+    <dimen name="text_min">12sp</dimen>
+
+    <dimen name="divider_height">0.5dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/baselib/src/main/res/values/strings.xml b/baselib/src/main/res/values/strings.xml
index c47bb54..28f063f 100755
--- a/baselib/src/main/res/values/strings.xml
+++ b/baselib/src/main/res/values/strings.xml
@@ -50,4 +50,12 @@
 
     <string name="cloudLink_permission_prohibited">权限被禁止，无法选择本地图片</string>
 
+
+    <string name="str_recorder_normal">按住说话</string>
+    <string name="str_recorder_recording">松开结束</string>
+    <string name="str_recorder_want_cancel">松开手指，取消发送</string>
+    <string name="str_recorder_swip_cancel">手指上滑，取消发送</string>
+    <string name="str_recorder_too_short">"录音时间过短"</string>
+    <string name="time_remaining">还可以再录制%d秒</string>
+
 </resources>
diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml
index 31dc07c..7b752df 100755
--- a/baselib/src/main/res/values/styles.xml
+++ b/baselib/src/main/res/values/styles.xml
@@ -648,4 +648,20 @@
         <!--点击 dialog Activity 周围是否关闭弹窗 true 关闭（默认为true） false 为不关闭-->
         <item name="android:windowCloseOnTouchOutside">false</item>
     </style>
+    <!--  录音dialog  -->
+    <style name="Theme_RecordDialog" parent="@android:style/Theme.Dialog">
+        <!--自定义对话框风格-->
+        <item name="android:windowFrame">@null</item>
+        <!--边框-->
+        <item name="android:windowIsFloating">true</item>
+        <!--是否浮现在activity之上-->
+        <item name="android:windowIsTranslucent">false</item>
+        <!--半透明-->
+        <item name="android:windowNoTitle">true</item>
+        <!--无标题-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!--背景透明-->
+        <item name="android:backgroundDimEnabled">false</item>
+        <!--模糊-->
+    </style>
 </resources>
\ No newline at end of file
diff --git a/commonmodule/build.gradle b/commonmodule/build.gradle
index 14e2da4..0d2c428 100644
--- a/commonmodule/build.gradle
+++ b/commonmodule/build.gradle
@@ -6,6 +6,7 @@ if (!IsModuleDev.toBoolean()) {
 apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'android-aspectjx'
 apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'kotlin-android'
 android {
     buildToolsVersion rootProject.ext.gBuildToolsVersion
     compileSdkVersion rootProject.ext.gCompileSdkVersion
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
index 84eade8..18ed828 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
@@ -21,6 +21,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.ZoomControls;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -65,12 +66,11 @@ import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
 import com.tenlionsoft.baselib.core.widget.PhotoActivity;
 import com.tenlionsoft.baselib.core.widget.base.AddPhotoAdapter;
 import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
-import com.tenlionsoft.baselib.core.widget.videorecord.AudioRecordButton;
 import com.tenlionsoft.baselib.core.widget.videorecord.MediaManager;
 import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog;
 import com.tenlionsoft.baselib.core.widget.views.ButtomDialogView;
+import com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
-import com.tenlionsoft.baselib.utils.LogUtils;
 import com.tenlionsoft.baselib.utils.PermissionUtils;
 import com.tenlionsoft.baselib.utils.UIUtil;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
@@ -128,7 +128,7 @@ public class IncidentReportActivity extends BaseActivity {
     @BindView(R2.id.ll_voice)
     LinearLayout mLlVoice;
     @BindView(R2.id.arb_audio)
-    AudioRecordButton mArbAudio;
+    VoiceButton mArbAudio;
     @BindView(R2.id.btn_submit)
     Button mBtnSubmit;
     @BindView(R2.id.et_address)
@@ -187,8 +187,8 @@ public class IncidentReportActivity extends BaseActivity {
         mBind = ButterKnife.bind(this);
         mTvBaseTitle.setText("事件上报");
         refreshView(STATE_LOAD_SUCCESS);
-        initViews();
         initMap();
+        initViews();
     }
 
     private void initViews() {
@@ -220,10 +220,7 @@ public class IncidentReportActivity extends BaseActivity {
             if (TextUtils.isEmpty(mSelAreaCode)) {
                 ToastUtils.show("请先选择所在地区");
             } else {
-                ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_SEL_GRID)
-                        .withString("areaCode", mSelAreaCode)
-                        .navigation(mActivity, 15);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_SEL_GRID).withString("areaCode", mSelAreaCode).navigation(mActivity, 15);
             }
         });
         mIvDelVideo.setVisibility(View.GONE);
@@ -232,9 +229,7 @@ public class IncidentReportActivity extends BaseActivity {
             mVideoId = "";
             mIvPlayVideo.setBackgroundResource(R.drawable.picture_icon_video);
             mIvDelVideo.setVisibility(View.GONE);
-            Glide.with(mActivity)
-                    .load(R.drawable.shp_rectangle_black)
-                    .into(mIvCover);
+            Glide.with(mActivity).load(R.drawable.shp_rectangle_black).into(mIvCover);
         });
         mIvPlayVideo.setBackgroundResource(R.drawable.picture_icon_video);
         mIvPlayVideo.setOnClickListener(v -> {
@@ -243,29 +238,34 @@ public class IncidentReportActivity extends BaseActivity {
                 showSelectVideo();
             } else {
                 //播放视频
-                ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
-                        .withString("url", mVideoPath)
-                        .withString("title", "事件视频")
-                        .navigation();
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO).withString("url", mVideoPath).withString("title", "事件视频").navigation();
             }
         });
-        mTvAddressSel.setOnClickListener(v -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
-                .navigation(mActivity, 16));
+        mTvAddressSel.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_MAP_SEL_POINT).navigation(mActivity, 16));
 
         //录音
-        mArbAudio.setAudioFinishRecorderListener((seconds, filePath) -> uploadVoice(filePath));
+//        mArbAudio.setAudioFinishRecorderListener((seconds, filePath) -> uploadVoice(filePath));
+        mArbAudio.setRecorderListener(new VoiceButton.RecorderListener() {
+            @Override
+            public void onStart() {
+
+            }
+
+            @Override
+            public void onFinish(long time, @Nullable String filePath) {
+                uploadVoice(filePath);
+            }
+        });
         mLlVoice.setOnClickListener(v -> {
             if (!TextUtils.isEmpty(mAudioPath)) {
-                AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground();
+                AnimationDrawable animationDrawable =
+                        (AnimationDrawable) mTvVoiceAnim.getBackground();
                 animationDrawable.start();
-                MediaManager.playSound(mAudioPath,
-                        mp -> {
-                            animationDrawable.selectDrawable(0);//显示动画第一帧
-                            animationDrawable.stop();
-                            MediaManager.destroy();
-                        });
+                MediaManager.playSound(mAudioPath, mp -> {
+                    animationDrawable.selectDrawable(0);//显示动画第一帧
+                    animationDrawable.stop();
+                    MediaManager.destroy();
+                });
             }
         });
         mIvDelAudio.setOnClickListener(v -> {
@@ -281,11 +281,7 @@ public class IncidentReportActivity extends BaseActivity {
                 showSelectVideo();
             } else {
                 //视频播放
-                ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
-                        .withString("url", mVideoPath)
-                        .withString("title", "视频")
-                        .navigation();
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO).withString("url", mVideoPath).withString("title", "视频").navigation();
             }
         });
         //是否自处理
@@ -300,18 +296,14 @@ public class IncidentReportActivity extends BaseActivity {
             if (mSelGridBean == null) {
                 ToastUtils.show("请选择所在网格");
             } else {
-                ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_SEL_COMPONENT)
-                        .withBoolean("isSingle", true)
-                        .withString("id", mSelGridBean.getGridCode())
-                        .navigation(mActivity, 13);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_SEL_COMPONENT).withBoolean("isSingle", true).withString("id", mSelGridBean.getGridCode()).navigation(mActivity, 13);
             }
         });
         mBtnSubmit.setOnClickListener(v -> doSubmit());
         checkAuthority();
         setCurrentLoc();
 //        getMineGridList();
-        Object curGrid =  ((BaseAppContext) getApplicationContext()).getGridBean();
+        Object curGrid = ((BaseAppContext) getApplicationContext()).getGridBean();
         if (curGrid != null && curGrid instanceof AreaGridListBean.RowsBean) {
             mSelGridBean = (AreaGridListBean.RowsBean) curGrid;
             mTvGridId.setText(mSelGridBean.getGridName());
@@ -338,23 +330,22 @@ public class IncidentReportActivity extends BaseActivity {
      * 校验权限
      */
     private void checkAuthority() {
-        PermissionUtils.permission(PermissionConstants.STORAGE,
-                        PermissionConstants.LOCATION,
-                        PermissionConstants.CAMERA,
-                        PermissionConstants.MICROPHONE)
-                .callback(new PermissionUtils.SimpleCallback() {
-                    @Override
-                    public void onGranted() {
-                        mArbAudio.setHasRecordPromission(true);
-                    }
+        PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.LOCATION,
+                PermissionConstants.CAMERA, PermissionConstants.MICROPHONE).callback(new PermissionUtils.SimpleCallback() {
+            @Override
+            public void onGranted() {
+//                        mArbAudio.setHasRecordPromission(true);
+                mArbAudio.setEnabled(true);
+            }
 
-                    @Override
-                    public void onDenied() {
-                        ToastUtils.show("App需要读取SD的权限,和定位的权限,请前往设置里授权.");
-                        mArbAudio.setHasRecordPromission(false);
-                        finish();
-                    }
-                }).request();
+            @Override
+            public void onDenied() {
+                ToastUtils.show("App需要读取SD的权限,和定位的权限,请前往设置里授权.");
+//                        mArbAudio.setHasRecordPromission(false);
+                mArbAudio.setEnabled(false);
+                finish();
+            }
+        }).request();
     }
 
     /**
@@ -365,34 +356,31 @@ public class IncidentReportActivity extends BaseActivity {
             RequestBody body = buildParams();
             ProgressDialog dialog = UIUtil.initDialog(mActivity, "上报中...");
             dialog.show();
-            RetrofitManager.getInstance()
-                    .create(GridApis.class)
-                    .doSaveCase(body, UserLgUtils.getToken())
-                    .compose(RxTransformer.getTransformer())
-                    .subscribe(new Observer<SuccessBean>() {
-                        @Override
-                        public void onSubscribe(@NonNull Disposable d) {
+            RetrofitManager.getInstance().create(GridApis.class).doSaveCase(body,
+                    UserLgUtils.getToken()).compose(RxTransformer.getTransformer()).subscribe(new Observer<SuccessBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                        }
+                }
 
-                        @Override
-                        public void onNext(@NonNull SuccessBean successBean) {
-                            dialog.dismiss();
-                            ToastUtils.show("上报成功");
-                            finish();
-                        }
+                @Override
+                public void onNext(@NonNull SuccessBean successBean) {
+                    dialog.dismiss();
+                    ToastUtils.show("上报成功");
+                    finish();
+                }
 
-                        @Override
-                        public void onError(@NonNull Throwable e) {
-                            dialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
 
-                        @Override
-                        public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                        }
-                    });
+                }
+            });
         }
     }
 
@@ -402,47 +390,40 @@ public class IncidentReportActivity extends BaseActivity {
     private void getMineGridList() {
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "加载中...");
         dialog.show();
-        RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getMineGridList(UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<List<AreaGridListBean.RowsBean>>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+        RetrofitManager.getInstance().create(GridApis.class).getMineGridList(UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<List<AreaGridListBean.RowsBean>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+            }
 
-                    @Override
-                    public void onNext(@NonNull List<AreaGridListBean.RowsBean> rowsBeans) {
-                        dialog.dismiss();
-                        if (rowsBeans != null && rowsBeans.size() > 0) {
-                            mSelGridBean = rowsBeans.get(0);
-                            mTvGridId.setText(mSelGridBean.getGridName());
-                        }
-                    }
+            @Override
+            public void onNext(@NonNull List<AreaGridListBean.RowsBean> rowsBeans) {
+                dialog.dismiss();
+                if (rowsBeans != null && rowsBeans.size() > 0) {
+                    mSelGridBean = rowsBeans.get(0);
+                    mTvGridId.setText(mSelGridBean.getGridName());
+                }
+            }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+            @Override
+            public void onError(@NonNull Throwable e) {
+                dialog.dismiss();
+                ExceptionHandler.handleException(e);
+            }
 
-                    @Override
-                    public void onComplete() {
+            @Override
+            public void onComplete() {
 
-                    }
-                });
+            }
+        });
     }
 
     /**
      * 显示地区选择
      */
     private void onShowArea() {
-        AreaChooseDialog dialog = new AreaChooseDialog
-                .DialogBuilder(mActivity)
-                .setDefault(true)
-                .build();
+        AreaChooseDialog dialog =
+                new AreaChooseDialog.DialogBuilder(mActivity).setDefault(true).build();
         dialog.addOnChoseListener((names, id, code) -> {
             mSelAreaCode = code;
             mSelAreaId = id;
@@ -539,7 +520,8 @@ public class IncidentReportActivity extends BaseActivity {
         }
         Gson gson = new Gson();
         String obj = gson.toJson(bean);
-        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; " +
+                "charset=utf-8"), obj);
         return requestBody;
     }
 
@@ -549,12 +531,8 @@ public class IncidentReportActivity extends BaseActivity {
      * @param bean
      */
     private void showSelectPhoto(AddPhotoBean bean) {
-        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity)
-                .setIsBackCancelable(true)
-                .setIscancelable(true)
-                .setShowLocation(Gravity.BOTTOM)
-                .setIsShowFile(false)
-                .build();
+        ButtomDialogView buttomDialogView =
+                new ButtomDialogView.DialogBuilder(mActivity).setIsBackCancelable(true).setIscancelable(true).setShowLocation(Gravity.BOTTOM).setIsShowFile(false).build();
         buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() {
             @Override
             public void choseFile() {
@@ -564,8 +542,7 @@ public class IncidentReportActivity extends BaseActivity {
             public void choseAlbum() {
                 mCurrentBean = bean;
                 Intent intent = new Intent(Intent.ACTION_PICK, null);
-                intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                        "image/*");
+                intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
                 startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST);
                 buttomDialogView.dismiss();
             }
@@ -573,11 +550,7 @@ public class IncidentReportActivity extends BaseActivity {
             @Override
             public void choseShoot() {
                 mCurrentBean = bean;
-                ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO)
-                        .withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath())
-                        .withString("type", "photo")
-                        .navigation(mActivity, BaseUrlApi.CAMERA_REQUEST);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO).withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath()).withString("type", "photo").navigation(mActivity, BaseUrlApi.CAMERA_REQUEST);
                 buttomDialogView.dismiss();
             }
 
@@ -598,12 +571,8 @@ public class IncidentReportActivity extends BaseActivity {
      * 显示选择视频
      */
     private void showSelectVideo() {
-        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity)
-                .setIsBackCancelable(true)
-                .setIscancelable(true)
-                .setShowLocation(Gravity.BOTTOM)
-                .setIsShowFile(false)
-                .build();
+        ButtomDialogView buttomDialogView =
+                new ButtomDialogView.DialogBuilder(mActivity).setIsBackCancelable(true).setIscancelable(true).setShowLocation(Gravity.BOTTOM).setIsShowFile(false).build();
         buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() {
             @Override
             public void choseFile() {
@@ -612,19 +581,14 @@ public class IncidentReportActivity extends BaseActivity {
             @Override
             public void choseAlbum() {
                 Intent intent = new Intent(Intent.ACTION_PICK, null);
-                intent.setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
-                        "video/*");
+                intent.setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/*");
                 startActivityForResult(intent, BaseUrlApi.CAMERA_REQUEST_PHOTO);
                 buttomDialogView.dismiss();
             }
 
             @Override
             public void choseShoot() {
-                ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO)
-                        .withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath())
-                        .withString("type", "video")
-                        .navigation(mActivity, BaseUrlApi.CAMERA_REQUEST_VIDEO);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO).withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath()).withString("type", "video").navigation(mActivity, BaseUrlApi.CAMERA_REQUEST_VIDEO);
                 buttomDialogView.dismiss();
             }
 
@@ -655,7 +619,8 @@ public class IncidentReportActivity extends BaseActivity {
                         Uri uri = data.getData();
                         String[] proj = {MediaStore.Images.Media.DATA};
                         Cursor cursor = managedQuery(uri, proj, null, null, null);
-                        int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                        int column_index =
+                                cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
                         cursor.moveToFirst();
                         String srcPath = cursor.getString(column_index);
                         uploadImg(srcPath, 2);
@@ -673,7 +638,8 @@ public class IncidentReportActivity extends BaseActivity {
                         Uri uri = data.getData();
                         String[] proj = {MediaStore.Images.Media.DATA};
                         Cursor cursor = managedQuery(uri, proj, null, null, null);
-                        int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                        int column_index =
+                                cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
                         cursor.moveToFirst();
                         String srcPath = cursor.getString(column_index);
                         uploadVideo(srcPath);
@@ -684,7 +650,8 @@ public class IncidentReportActivity extends BaseActivity {
             }
         } else if (resultCode == 13) {
             if (requestCode == 13) {
-                mSelComponentBean = (CaseComponentListBean.RowsBean) data.getSerializableExtra("bean");
+                mSelComponentBean = (CaseComponentListBean.RowsBean) data.getSerializableExtra(
+                        "bean");
                 mTvComponent.setText(mSelComponentBean.getObjName());
             }
         } else if (resultCode == 22) {
@@ -751,8 +718,7 @@ public class IncidentReportActivity extends BaseActivity {
         if (mBitMap == null) {
             mBitMap = BitmapDescriptorFactory.fromResource(R.drawable.ic_map_location_marker);
         }
-        MarkerOptions markerOptions = new MarkerOptions()
-                .position(new LatLng(lat, lng))//mark出现的位置
+        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng(lat, lng))//mark出现的位置
                 .icon(mBitMap) //mark图标
                 .draggable(false)//mark可拖拽
                 .animateType(MarkerOptions.MarkerAnimateType.none);
@@ -769,53 +735,44 @@ public class IncidentReportActivity extends BaseActivity {
         progressDialog.show();
         File file = new File(videoPath);
         if (file.exists()) {
-            RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-            MultipartBody.Part body = MultipartBody.Part.createFormData("video", file.getName(), requestFile);
-            RetrofitManager.getInstance()
-                    .create(BaseApiService.class)
-                    .uploadVideo(body, UserLgUtils.getToken())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<BaseSuccessBean>() {
-                        @Override
-                        public void onSubscribe(Disposable d) {
+            RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"),
+                    file);
+            MultipartBody.Part body = MultipartBody.Part.createFormData("video", file.getName(),
+                    requestFile);
+            RetrofitManager.getInstance().create(BaseApiService.class).uploadVideo(body,
+                    UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BaseSuccessBean>() {
+                @Override
+                public void onSubscribe(Disposable d) {
 
-                        }
+                }
 
-                        @Override
-                        public void onNext(BaseSuccessBean baseUserBean) {
-                            if (progressDialog.isShowing()) {
-                                progressDialog.dismiss();
-                            }
-                            ToastUtils.show("上传成功");
-                            mVideoPath = videoPath;
-                            mVideoId = baseUserBean.getData();
-                            mIvDelVideo.setVisibility(View.VISIBLE);
-                            mIvPlayVideo.setBackgroundResource(R.drawable.ic_play_white_icon);
-                            Glide.with(mActivity)
-                                    .setDefaultRequestOptions(
-                                            new RequestOptions()
-                                                    .frame(0)
-                                                    .centerCrop()
-                                    )
-                                    .load(mVideoPath)
-                                    .into(mIvCover);
-                        }
+                @Override
+                public void onNext(BaseSuccessBean baseUserBean) {
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
+                    }
+                    ToastUtils.show("上传成功");
+                    mVideoPath = videoPath;
+                    mVideoId = baseUserBean.getData();
+                    mIvDelVideo.setVisibility(View.VISIBLE);
+                    mIvPlayVideo.setBackgroundResource(R.drawable.ic_play_white_icon);
+                    Glide.with(mActivity).setDefaultRequestOptions(new RequestOptions().frame(0).centerCrop()).load(mVideoPath).into(mIvCover);
+                }
 
-                        @Override
-                        public void onError(Throwable e) {
-                            if (progressDialog.isShowing()) {
-                                progressDialog.dismiss();
-                            }
-                            ExceptionHandler.handleException(e);
+                @Override
+                public void onError(Throwable e) {
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
+                    }
+                    ExceptionHandler.handleException(e);
 
-                        }
+                }
 
-                        @Override
-                        public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                        }
-                    });
+                }
+            });
         } else {
             progressDialog.dismiss();
             ToastUtils.show("视频文件路径有误.");
@@ -832,51 +789,49 @@ public class IncidentReportActivity extends BaseActivity {
         progressDialog.show();
         File file = new File(filePath);
         if (file.exists()) {
-            RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-            MultipartBody.Part body = MultipartBody.Part.createFormData("audio", file.getName(), requestFile);
-            RetrofitManager.getInstance()
-                    .create(BaseApiService.class)
-                    .uploadAudio(body, UserLgUtils.getToken())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<BaseSuccessBean>() {
-                        @Override
-                        public void onSubscribe(Disposable d) {
+            RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"),
+                    file);
+            MultipartBody.Part body = MultipartBody.Part.createFormData("audio", file.getName(),
+                    requestFile);
+            RetrofitManager.getInstance().create(BaseApiService.class).uploadAudio(body,
+                    UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BaseSuccessBean>() {
+                @Override
+                public void onSubscribe(Disposable d) {
 
-                        }
+                }
 
-                        @Override
-                        public void onNext(BaseSuccessBean baseUserBean) {
-                            mIvVoice.setVisibility(View.GONE);
-                            if (progressDialog.isShowing()) {
-                                progressDialog.dismiss();
-                            }
-                            ToastUtils.show("上传成功");
-                            mAudioPath = filePath;
-                            mAudioId = baseUserBean.getData();
-                            mTvVoiceAnim.setVisibility(View.VISIBLE);
-                            mIvDelAudio.setVisibility(View.VISIBLE);
-                            mArbAudio.setVisibility(View.GONE);
-                        }
+                @Override
+                public void onNext(BaseSuccessBean baseUserBean) {
+                    mIvVoice.setVisibility(View.GONE);
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
+                    }
+                    ToastUtils.show("上传成功");
+                    mAudioPath = filePath;
+                    mAudioId = baseUserBean.getData();
+                    mTvVoiceAnim.setVisibility(View.VISIBLE);
+                    mIvDelAudio.setVisibility(View.VISIBLE);
+                    mArbAudio.setVisibility(View.GONE);
+                }
 
-                        @Override
-                        public void onError(Throwable e) {
+                @Override
+                public void onError(Throwable e) {
 
-                            if (progressDialog.isShowing()) {
-                                progressDialog.dismiss();
-                            }
-                            mTvVoiceAnim.setVisibility(View.GONE);
-                            mIvDelAudio.setVisibility(View.GONE);
-                            mArbAudio.setVisibility(View.VISIBLE);
-                            mIvVoice.setVisibility(View.VISIBLE);
-                            ExceptionHandler.handleException(e);
-                        }
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
+                    }
+                    mTvVoiceAnim.setVisibility(View.GONE);
+                    mIvDelAudio.setVisibility(View.GONE);
+                    mArbAudio.setVisibility(View.VISIBLE);
+                    mIvVoice.setVisibility(View.VISIBLE);
+                    ExceptionHandler.handleException(e);
+                }
 
-                        @Override
-                        public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                        }
-                    });
+                }
+            });
         } else {
             progressDialog.dismiss();
             ToastUtils.show("录音文件路径有误.");
@@ -898,47 +853,44 @@ public class IncidentReportActivity extends BaseActivity {
         ProgressDialog progressDialog = UIUtil.initDialog(mActivity, "正在上传...");
         progressDialog.show();
         RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-        MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile);
-        RetrofitManager.getInstance()
-                .create(BaseApiService.class)
-                .uploadImage(body, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseSuccessBean>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
+        MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(),
+                requestFile);
+        RetrofitManager.getInstance().create(BaseApiService.class).uploadImage(body,
+                UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BaseSuccessBean>() {
+            @Override
+            public void onSubscribe(Disposable d) {
 
-                    }
+            }
 
-                    @Override
-                    public void onNext(BaseSuccessBean baseUserBean) {
-                        if (progressDialog != null && progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                        }
-                        ToastUtils.show("上传成功");
-                        mPhotoIds += (baseUserBean.getData() + ",");
-                        mCurrentBean.setId(baseUserBean.getData());
-                        mCurrentBean.setPath(picPath);
-                        if (mPhotos.size() < 8) {
-                            mPhotos.add(new AddPhotoBean());
-                        }
-                        mAddPhotoAdapter.notifyDataSetChanged();
-                        mCurrentBean = null;
-                    }
+            @Override
+            public void onNext(BaseSuccessBean baseUserBean) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    progressDialog.dismiss();
+                }
+                ToastUtils.show("上传成功");
+                mPhotoIds += (baseUserBean.getData() + ",");
+                mCurrentBean.setId(baseUserBean.getData());
+                mCurrentBean.setPath(picPath);
+                if (mPhotos.size() < 8) {
+                    mPhotos.add(new AddPhotoBean());
+                }
+                mAddPhotoAdapter.notifyDataSetChanged();
+                mCurrentBean = null;
+            }
 
-                    @Override
-                    public void onError(Throwable e) {
-                        if (progressDialog != null && progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                        }
-                        ExceptionHandler.handleException(e);
-                    }
+            @Override
+            public void onError(Throwable e) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    progressDialog.dismiss();
+                }
+                ExceptionHandler.handleException(e);
+            }
 
-                    @Override
-                    public void onComplete() {
+            @Override
+            public void onComplete() {
 
-                    }
-                });
+            }
+        });
     }
 
     /**
@@ -960,12 +912,7 @@ public class IncidentReportActivity extends BaseActivity {
                     } else {
                         ToastUtils.show("详细类型数据未录入,无法选取");
                     }
-                })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
+                }).setTitleText("请选择").setCancelColor(Color.parseColor("#1189FF")).setSubmitColor(Color.parseColor("#1189FF")).setTitleColor(Color.parseColor("#1189FF")).build();
                 mTypePicker.setPicker(mTypeList, mTypeSubList);
             }
             mTypePicker.show();
@@ -980,39 +927,34 @@ public class IncidentReportActivity extends BaseActivity {
     private void getTypeDatas() {
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
         dialog.show();
-        RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getCaseTypeListAll(UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<List<CaseTypeBean>>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+        RetrofitManager.getInstance().create(GridApis.class).getCaseTypeListAll(UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<List<CaseTypeBean>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+            }
 
-                    @Override
-                    public void onNext(@NonNull List<CaseTypeBean> componentTypeBeans) {
-                        dialog.dismiss();
-                        if (componentTypeBeans != null && componentTypeBeans.size() > 0) {
-                            mTypeList = componentTypeBeans;
-                            buildTypeSubBean();
-                        } else {
-                            ToastUtils.show("暂无数据");
-                        }
-                    }
+            @Override
+            public void onNext(@NonNull List<CaseTypeBean> componentTypeBeans) {
+                dialog.dismiss();
+                if (componentTypeBeans != null && componentTypeBeans.size() > 0) {
+                    mTypeList = componentTypeBeans;
+                    buildTypeSubBean();
+                } else {
+                    ToastUtils.show("暂无数据");
+                }
+            }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+            @Override
+            public void onError(@NonNull Throwable e) {
+                dialog.dismiss();
+                ExceptionHandler.handleException(e);
+            }
 
-                    @Override
-                    public void onComplete() {
+            @Override
+            public void onComplete() {
 
-                    }
-                });
+            }
+        });
     }
 
     private void buildTypeSubBean() {
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java
index a21908f..c8e9638 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java
@@ -19,6 +19,11 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
@@ -48,10 +53,10 @@ import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService;
 import com.tenlionsoft.baselib.core.widget.PhotoActivity;
 import com.tenlionsoft.baselib.core.widget.base.AddPhotoAdapter;
 import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
-import com.tenlionsoft.baselib.core.widget.videorecord.AudioRecordButton;
 import com.tenlionsoft.baselib.core.widget.videorecord.MediaManager;
 import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog;
 import com.tenlionsoft.baselib.core.widget.views.ButtomDialogView;
+import com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
 import com.tenlionsoft.baselib.utils.LogUtils;
 import com.tenlionsoft.baselib.utils.PermissionUtils;
@@ -63,9 +68,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.core.widget.NestedScrollView;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -113,7 +115,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
     @BindView(R2.id.ll_voice)
     LinearLayout mLlVoice;
     @BindView(R2.id.arb_audio)
-    AudioRecordButton mArbAudio;
+    VoiceButton mArbAudio;
     @BindView(R2.id.btn_submit)
     Button mBtnSubmit;
     @BindView(R2.id.et_address)
@@ -216,10 +218,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
             if (TextUtils.isEmpty(mSelAreaCode)) {
                 ToastUtils.show("请先选择所在地区");
             } else {
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_SEL_GRID)
-                    .withString("areaCode", mSelAreaCode)
-                    .navigation(mActivity, 15);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_SEL_GRID).withString("areaCode", mSelAreaCode).navigation(mActivity, 15);
             }
         });
         mIvDelVideo.setVisibility(View.GONE);
@@ -228,9 +227,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
             mVideoId = "";
             mIvPlayVideo.setBackgroundResource(R.drawable.picture_icon_video);
             mIvDelVideo.setVisibility(View.GONE);
-            Glide.with(mActivity)
-                .load(R.drawable.shp_rectangle_black)
-                .into(mIvCover);
+            Glide.with(mActivity).load(R.drawable.shp_rectangle_black).into(mIvCover);
         });
         mIvPlayVideo.setBackgroundResource(R.drawable.picture_icon_video);
         mIvPlayVideo.setOnClickListener(v -> {
@@ -239,29 +236,32 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
                 showSelectVideo();
             } else {
                 //播放视频
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
-                    .withString("url", mVideoPath)
-                    .withString("title", "事件视频")
-                    .navigation();
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO).withString("url", mVideoPath).withString("title", "事件视频").navigation();
             }
         });
-        mTvAddressSel.setOnClickListener(v -> ARouter.getInstance()
-            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
-            .navigation(mActivity, 16));
+        mTvAddressSel.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_MAP_SEL_POINT).navigation(mActivity, 16));
 
         //录音
-        mArbAudio.setAudioFinishRecorderListener((seconds, filePath) -> uploadVoice(filePath));
+        mArbAudio.setRecorderListener(new VoiceButton.RecorderListener() {
+            @Override
+            public void onStart() {
+
+            }
+
+            @Override
+            public void onFinish(long time, @Nullable String filePath) {
+                uploadVoice(filePath);
+            }
+        });
         mLlVoice.setOnClickListener(v -> {
             if (!TextUtils.isEmpty(mAudioPath)) {
                 AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground();
                 animationDrawable.start();
-                MediaManager.playSound(mAudioPath,
-                    mp -> {
-                        animationDrawable.selectDrawable(0);//显示动画第一帧
-                        animationDrawable.stop();
-                        MediaManager.destroy();
-                    });
+                MediaManager.playSound(mAudioPath, mp -> {
+                    animationDrawable.selectDrawable(0);//显示动画第一帧
+                    animationDrawable.stop();
+                    MediaManager.destroy();
+                });
             }
         });
         mIvDelAudio.setOnClickListener(v -> {
@@ -275,22 +275,14 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
                 showSelectVideo();
             } else {
                 //视频播放
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
-                    .withString("url", mVideoPath)
-                    .withString("title", "视频")
-                    .navigation();
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO).withString("url", mVideoPath).withString("title", "视频").navigation();
             }
         });
         mTvComponent.setOnClickListener(v -> {
             if (mSelGridBean == null) {
                 ToastUtils.show("请选择所在网格");
             } else {
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_SEL_COMPONENT)
-                    .withBoolean("isSingle", true)
-                    .withString("id", mSelGridBean.getGridCode())
-                    .navigation(mActivity, 13);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_SEL_COMPONENT).withBoolean("isSingle", true).withString("id", mSelGridBean.getGridCode()).navigation(mActivity, 13);
             }
         });
         mBtnSubmit.setOnClickListener(v -> doSubmit());
@@ -316,13 +308,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
      */
     private void onShowTime() {
         hideSoftKeyboard();
-        TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> mTvTime.setText(TimeUtils.date2String(date)))
-            .setTitleText("请选时间")
-            .setCancelColor(Color.parseColor("#1189FF"))
-            .setSubmitColor(Color.parseColor("#1189FF"))
-            .setType(new boolean[]{true, true, true, true, true, true})
-            .setTitleColor(Color.parseColor("#1189FF"))
-            .build();
+        TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> mTvTime.setText(TimeUtils.date2String(date))).setTitleText("请选时间").setCancelColor(Color.parseColor("#1189FF")).setSubmitColor(Color.parseColor("#1189FF")).setType(new boolean[]{true, true, true, true, true, true}).setTitleColor(Color.parseColor("#1189FF")).build();
         mTimePickerView.show();
     }
 
@@ -330,23 +316,21 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
      * 校验权限
      */
     private void checkAuthority() {
-        PermissionUtils.permission(PermissionConstants.STORAGE,
-            PermissionConstants.LOCATION,
-            PermissionConstants.CAMERA,
-            PermissionConstants.MICROPHONE)
-            .callback(new PermissionUtils.SimpleCallback() {
-                @Override
-                public void onGranted() {
-                    mArbAudio.setHasRecordPromission(true);
-                }
+        PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.LOCATION, PermissionConstants.CAMERA, PermissionConstants.MICROPHONE).callback(new PermissionUtils.SimpleCallback() {
+            @Override
+            public void onGranted() {
+//                    mArbAudio.setHasRecordPromission(true);
+                mArbAudio.setEnabled(true);
+            }
 
-                @Override
-                public void onDenied() {
-                    ToastUtils.show("App需要读取SD的权限,和定位的权限,请前往设置里授权.");
-                    mArbAudio.setHasRecordPromission(false);
-                    finish();
-                }
-            }).request();
+            @Override
+            public void onDenied() {
+                ToastUtils.show("App需要读取SD的权限,和定位的权限,请前往设置里授权.");
+//                    mArbAudio.setHasRecordPromission(false);
+                mArbAudio.setEnabled(false);
+                finish();
+            }
+        }).request();
     }
 
     /**
@@ -357,36 +341,31 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
             RequestBody body = buildParams();
             ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
             dialog.show();
-            RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .doSaveTaskReport(body, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<SuccessBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            RetrofitManager.getInstance().create(GridApis.class).doSaveTaskReport(body, UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<SuccessBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@NonNull SuccessBean successBean) {
-                        dialog.dismiss();
-                        ToastUtils.show("上报成功");
-                        setResult(13);
-                        finish();
-                    }
+                @Override
+                public void onNext(@NonNull SuccessBean successBean) {
+                    dialog.dismiss();
+                    ToastUtils.show("上报成功");
+                    setResult(13);
+                    finish();
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
         }
     }
 
@@ -394,10 +373,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
      * 显示地区选择
      */
     private void onShowArea() {
-        AreaChooseDialog dialog = new AreaChooseDialog
-            .DialogBuilder(mActivity)
-            .setDefault(true)
-            .build();
+        AreaChooseDialog dialog = new AreaChooseDialog.DialogBuilder(mActivity).setDefault(true).build();
         dialog.addOnChoseListener((names, id, code) -> {
             mSelAreaCode = code;
             mSelAreaId = id;
@@ -514,12 +490,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
      * @param bean
      */
     private void showSelectPhoto(AddPhotoBean bean) {
-        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity)
-            .setIsBackCancelable(true)
-            .setIscancelable(true)
-            .setShowLocation(Gravity.BOTTOM)
-            .setIsShowFile(false)
-            .build();
+        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity).setIsBackCancelable(true).setIscancelable(true).setShowLocation(Gravity.BOTTOM).setIsShowFile(false).build();
         buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() {
             @Override
             public void choseFile() {
@@ -529,8 +500,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
             public void choseAlbum() {
                 mCurrentBean = bean;
                 Intent intent = new Intent(Intent.ACTION_PICK, null);
-                intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                    "image/*");
+                intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
                 startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST);
                 buttomDialogView.dismiss();
             }
@@ -538,11 +508,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
             @Override
             public void choseShoot() {
                 mCurrentBean = bean;
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO)
-                    .withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath())
-                    .withString("type", "photo")
-                    .navigation(mActivity, BaseUrlApi.CAMERA_REQUEST);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO).withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath()).withString("type", "photo").navigation(mActivity, BaseUrlApi.CAMERA_REQUEST);
                 buttomDialogView.dismiss();
             }
 
@@ -563,12 +529,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
      * 显示选择视频
      */
     private void showSelectVideo() {
-        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity)
-            .setIsBackCancelable(true)
-            .setIscancelable(true)
-            .setShowLocation(Gravity.BOTTOM)
-            .setIsShowFile(false)
-            .build();
+        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity).setIsBackCancelable(true).setIscancelable(true).setShowLocation(Gravity.BOTTOM).setIsShowFile(false).build();
         buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() {
             @Override
             public void choseFile() {
@@ -577,19 +538,14 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
             @Override
             public void choseAlbum() {
                 Intent intent = new Intent(Intent.ACTION_PICK, null);
-                intent.setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
-                    "video/*");
+                intent.setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/*");
                 startActivityForResult(intent, BaseUrlApi.CAMERA_REQUEST_PHOTO);
                 buttomDialogView.dismiss();
             }
 
             @Override
             public void choseShoot() {
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO)
-                    .withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath())
-                    .withString("type", "video")
-                    .navigation(mActivity, BaseUrlApi.CAMERA_REQUEST_VIDEO);
+                ARouter.getInstance().build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO).withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath()).withString("type", "video").navigation(mActivity, BaseUrlApi.CAMERA_REQUEST_VIDEO);
                 buttomDialogView.dismiss();
             }
 
@@ -685,51 +641,39 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
         if (file.exists()) {
             RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
             MultipartBody.Part body = MultipartBody.Part.createFormData("video", file.getName(), requestFile);
-            RetrofitManager.getInstance()
-                .create(BaseApiService.class)
-                .uploadVideo(body, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseSuccessBean>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
+            RetrofitManager.getInstance().create(BaseApiService.class).uploadVideo(body, UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BaseSuccessBean>() {
+                @Override
+                public void onSubscribe(Disposable d) {
 
+                }
+
+                @Override
+                public void onNext(BaseSuccessBean baseUserBean) {
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
                     }
+                    ToastUtils.show("上传成功");
+                    mVideoPath = videoPath;
+                    mVideoId = baseUserBean.getData();
+                    mIvDelVideo.setVisibility(View.VISIBLE);
+                    mIvPlayVideo.setBackgroundResource(R.drawable.ic_play_white_icon);
+                    Glide.with(mActivity).setDefaultRequestOptions(new RequestOptions().frame(0).centerCrop()).load(videoPath).into(mIvCover);
+                }
 
-                    @Override
-                    public void onNext(BaseSuccessBean baseUserBean) {
-                        if (progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                        }
-                        ToastUtils.show("上传成功");
-                        mVideoPath = videoPath;
-                        mVideoId = baseUserBean.getData();
-                        mIvDelVideo.setVisibility(View.VISIBLE);
-                        mIvPlayVideo.setBackgroundResource(R.drawable.ic_play_white_icon);
-                        Glide.with(mActivity)
-                            .setDefaultRequestOptions(
-                                new RequestOptions()
-                                    .frame(0)
-                                    .centerCrop()
-                            )
-                            .load(videoPath)
-                            .into(mIvCover);
+                @Override
+                public void onError(Throwable e) {
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
                     }
+                    ExceptionHandler.handleException(e);
 
-                    @Override
-                    public void onError(Throwable e) {
-                        if (progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                        }
-                        ExceptionHandler.handleException(e);
+                }
 
-                    }
+                @Override
+                public void onComplete() {
 
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
+                }
+            });
         } else {
             progressDialog.dismiss();
             ToastUtils.show("视频文件路径有误.");
@@ -748,46 +692,41 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
         if (file.exists()) {
             RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
             MultipartBody.Part body = MultipartBody.Part.createFormData("audio", file.getName(), requestFile);
-            RetrofitManager.getInstance()
-                .create(BaseApiService.class)
-                .uploadAudio(body, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseSuccessBean>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
+            RetrofitManager.getInstance().create(BaseApiService.class).uploadAudio(body, UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BaseSuccessBean>() {
+                @Override
+                public void onSubscribe(Disposable d) {
 
+                }
+
+                @Override
+                public void onNext(BaseSuccessBean baseUserBean) {
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
                     }
+                    ToastUtils.show("上传成功");
+                    mAudioPath = filePath;
+                    mAudioId = baseUserBean.getData();
+                    mTvVoiceAnim.setVisibility(View.VISIBLE);
+                    mIvDelAudio.setVisibility(View.VISIBLE);
+                    mArbAudio.setVisibility(View.GONE);
+                }
 
-                    @Override
-                    public void onNext(BaseSuccessBean baseUserBean) {
-                        if (progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                        }
-                        ToastUtils.show("上传成功");
-                        mAudioPath = filePath;
-                        mAudioId = baseUserBean.getData();
-                        mTvVoiceAnim.setVisibility(View.VISIBLE);
-                        mIvDelAudio.setVisibility(View.VISIBLE);
-                        mArbAudio.setVisibility(View.GONE);
+                @Override
+                public void onError(Throwable e) {
+                    if (progressDialog.isShowing()) {
+                        progressDialog.dismiss();
                     }
+                    mTvVoiceAnim.setVisibility(View.GONE);
+                    mIvDelAudio.setVisibility(View.GONE);
+                    mArbAudio.setVisibility(View.VISIBLE);
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onError(Throwable e) {
-                        if (progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                        }
-                        mTvVoiceAnim.setVisibility(View.GONE);
-                        mIvDelAudio.setVisibility(View.GONE);
-                        mArbAudio.setVisibility(View.VISIBLE);
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onComplete() {
 
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
+                }
+            });
         } else {
             progressDialog.dismiss();
             ToastUtils.show("录音文件路径有误.");
@@ -810,46 +749,41 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
         progressDialog.show();
         RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile);
-        RetrofitManager.getInstance()
-            .create(BaseApiService.class)
-            .uploadImage(body, UserLgUtils.getToken())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<BaseSuccessBean>() {
-                @Override
-                public void onSubscribe(Disposable d) {
+        RetrofitManager.getInstance().create(BaseApiService.class).uploadImage(body, UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BaseSuccessBean>() {
+            @Override
+            public void onSubscribe(Disposable d) {
 
+            }
+
+            @Override
+            public void onNext(BaseSuccessBean baseUserBean) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    progressDialog.dismiss();
                 }
-
-                @Override
-                public void onNext(BaseSuccessBean baseUserBean) {
-                    if (progressDialog != null && progressDialog.isShowing()) {
-                        progressDialog.dismiss();
-                    }
-                    ToastUtils.show("上传成功");
-                    mPhotoIds += (baseUserBean.getData() + ",");
-                    mCurrentBean.setId(baseUserBean.getData());
-                    mCurrentBean.setPath(picPath);
-                    if (mPhotos.size() < 4) {
-                        mPhotos.add(new AddPhotoBean());
-                    }
-                    mAddPhotoAdapter.notifyDataSetChanged();
-                    mCurrentBean = null;
+                ToastUtils.show("上传成功");
+                mPhotoIds += (baseUserBean.getData() + ",");
+                mCurrentBean.setId(baseUserBean.getData());
+                mCurrentBean.setPath(picPath);
+                if (mPhotos.size() < 4) {
+                    mPhotos.add(new AddPhotoBean());
                 }
+                mAddPhotoAdapter.notifyDataSetChanged();
+                mCurrentBean = null;
+            }
 
-                @Override
-                public void onError(Throwable e) {
-                    if (progressDialog != null && progressDialog.isShowing()) {
-                        progressDialog.dismiss();
-                    }
-                    ExceptionHandler.handleException(e);
+            @Override
+            public void onError(Throwable e) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    progressDialog.dismiss();
                 }
+                ExceptionHandler.handleException(e);
+            }
 
-                @Override
-                public void onComplete() {
+            @Override
+            public void onComplete() {
 
-                }
-            });
+            }
+        });
     }
 
     /**
@@ -871,12 +805,7 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
                     } else {
                         ToastUtils.show("详细类型数据未录入,无法选取");
                     }
-                })
-                    .setTitleText("请选择")
-                    .setCancelColor(Color.parseColor("#1189FF"))
-                    .setSubmitColor(Color.parseColor("#1189FF"))
-                    .setTitleColor(Color.parseColor("#1189FF"))
-                    .build();
+                }).setTitleText("请选择").setCancelColor(Color.parseColor("#1189FF")).setSubmitColor(Color.parseColor("#1189FF")).setTitleColor(Color.parseColor("#1189FF")).build();
                 mTypePicker.setPicker(mTypeList, mTypeSubList);
             }
             mTypePicker.show();
@@ -891,39 +820,34 @@ public class TaskConverIncidentReportActivity extends BaseActivity {
     private void getTypeDatas() {
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
         dialog.show();
-        RetrofitManager.getInstance()
-            .create(GridApis.class)
-            .getCaseTypeListAll(UserLgUtils.getToken())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<List<CaseTypeBean>>() {
-                @Override
-                public void onSubscribe(@NonNull Disposable d) {
+        RetrofitManager.getInstance().create(GridApis.class).getCaseTypeListAll(UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<List<CaseTypeBean>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
 
+            }
+
+            @Override
+            public void onNext(@NonNull List<CaseTypeBean> componentTypeBeans) {
+                dialog.dismiss();
+                if (componentTypeBeans != null && componentTypeBeans.size() > 0) {
+                    mTypeList = componentTypeBeans;
+                    buildTypeSubBean();
+                } else {
+                    ToastUtils.show("暂无数据");
                 }
+            }
 
-                @Override
-                public void onNext(@NonNull List<CaseTypeBean> componentTypeBeans) {
-                    dialog.dismiss();
-                    if (componentTypeBeans != null && componentTypeBeans.size() > 0) {
-                        mTypeList = componentTypeBeans;
-                        buildTypeSubBean();
-                    } else {
-                        ToastUtils.show("暂无数据");
-                    }
-                }
+            @Override
+            public void onError(@NonNull Throwable e) {
+                dialog.dismiss();
+                ExceptionHandler.handleException(e);
+            }
 
-                @Override
-                public void onError(@NonNull Throwable e) {
-                    dialog.dismiss();
-                    ExceptionHandler.handleException(e);
-                }
+            @Override
+            public void onComplete() {
 
-                @Override
-                public void onComplete() {
-
-                }
-            });
+            }
+        });
     }
 
     private void buildTypeSubBean() {
diff --git a/commonmodule/src/main/res/layout/activity_incident_report.xml b/commonmodule/src/main/res/layout/activity_incident_report.xml
index a492e79..0e562f0 100644
--- a/commonmodule/src/main/res/layout/activity_incident_report.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_report.xml
@@ -330,14 +330,15 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="0.3">
 
-                            <com.tenlionsoft.baselib.core.widget.videorecord.AudioRecordButton
+                            <com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton
                                 android:id="@+id/arb_audio"
                                 android:layout_width="wrap_content"
                                 android:layout_height="35dp"
                                 android:background="@drawable/sel_btn_submit_circle"
                                 android:gravity="center"
-                                android:text="@string/long_click_record"
-                                android:textColor="#fff" />
+                                android:textColor="#fff"
+                                android:textSize="14dp" />
+
 
                             <ImageView
                                 android:id="@+id/iv_del_audio"
diff --git a/commonmodule/src/main/res/layout/activity_task_conver_incident_report.xml b/commonmodule/src/main/res/layout/activity_task_conver_incident_report.xml
index c02b0ef..ede4e35 100644
--- a/commonmodule/src/main/res/layout/activity_task_conver_incident_report.xml
+++ b/commonmodule/src/main/res/layout/activity_task_conver_incident_report.xml
@@ -329,7 +329,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="0.3">
 
-                            <com.tenlionsoft.baselib.core.widget.videorecord.AudioRecordButton
+                            <com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton
                                 android:id="@+id/arb_audio"
                                 android:layout_width="wrap_content"
                                 android:layout_height="35dp"