Skip to content

Commit ee61c63

Browse files
QimingQiming
Qiming
authored and
Qiming
committed
AudioEffect - Fixed a typo; Kotlin风格代码优化
1 parent becc4e8 commit ee61c63

6 files changed

Lines changed: 29 additions & 26 deletions

File tree

‎AndroidMedia/src/main/java/com/frank/androidmedia/controller/AudioEffectController.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ open class AudioEffectController(audioEffectCallback: AudioEffectCallback) {
9191
override fun onItemSelected(arg0: AdapterView<*>, arg1: View, arg2: Int, arg3: Long) {
9292
try {
9393
mEqualizer!!.usePreset(arg2.toShort())
94-
val seekBarList: List<SeekBar>? = mAudioEffectCallback?.getSeeBarList()
94+
val seekBarList: List<SeekBar>? = mAudioEffectCallback?.getSeekBarList()
9595
if (mBands > 0 && seekBarList != null && mEqualizer != null) {
9696
for (band in 0 until mBands) {
9797
seekBarList[band].progress = mEqualizer!!.getBandLevel(band.toShort()) - minEQLevel

‎AndroidMedia/src/main/java/com/frank/androidmedia/listener/AudioEffectCallback.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.util.ArrayList
1212
*/
1313
interface AudioEffectCallback {
1414

15-
fun getSeeBarList(): List<SeekBar>?
15+
fun getSeekBarList(): List<SeekBar>?
1616

1717
fun setEqualizerList(maxProgress: Int, equalizerList: ArrayList<Pair<*, *>>)
1818

‎app/src/main/java/com/frank/ffmpeg/activity/AudioEffectActivity.kt‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import com.frank.androidmedia.controller.AudioEffectController
1515
import com.frank.androidmedia.listener.AudioEffectCallback
1616
import com.frank.ffmpeg.R
1717
import com.frank.ffmpeg.adapter.EqualizerAdapter
18-
import com.frank.ffmpeg.listener.OnSeeBarListener
18+
import com.frank.ffmpeg.listener.OnSeekBarListener
1919
import com.frank.ffmpeg.util.FileUtil
2020
import com.frank.ffmpeg.view.VisualizerView
2121
import java.io.IOException
@@ -25,11 +25,11 @@ import java.util.ArrayList
2525
* Audio effect: equalizer, enhancer, visualizer, bassBoost
2626
* Created by frank on 2020/10/20.
2727
*/
28-
class AudioEffectActivity : BaseActivity(), OnSeeBarListener, AudioEffectCallback {
28+
class AudioEffectActivity : BaseActivity(), OnSeekBarListener, AudioEffectCallback {
2929

3030
companion object {
3131

32-
private val audioPath = Environment.getExternalStorageDirectory().path + "/tiger.mp3"
32+
private var audioPath = Environment.getExternalStorageDirectory().path + "/tiger.mp3"
3333
}
3434

3535
private var mPlayer: MediaPlayer? = null
@@ -48,12 +48,13 @@ class AudioEffectActivity : BaseActivity(), OnSeeBarListener, AudioEffectCallbac
4848
Manifest.permission.MODIFY_AUDIO_SETTINGS)
4949

5050
private val onPreparedListener = MediaPlayer.OnPreparedListener {
51-
mAudioEffectController = AudioEffectController(this)
52-
mAudioEffectController?.setupEqualizer(mPlayer!!.audioSessionId)
53-
mAudioEffectController?.setupPresetStyle(this@AudioEffectActivity, spinnerStyle!!)
54-
mAudioEffectController?.setupBassBoost(mPlayer!!.audioSessionId, barBassBoost!!)
55-
mAudioEffectController?.setLoudnessEnhancer(mPlayer!!.audioSessionId, barEnhancer!!)
56-
mAudioEffectController?.setupVisualizer(mPlayer!!.audioSessionId)
51+
mAudioEffectController = AudioEffectController(this).apply {
52+
setupEqualizer(mPlayer!!.audioSessionId)
53+
setupPresetStyle(this@AudioEffectActivity, spinnerStyle!!)
54+
setupBassBoost(mPlayer!!.audioSessionId, barBassBoost!!)
55+
setLoudnessEnhancer(mPlayer!!.audioSessionId, barEnhancer!!)
56+
setupVisualizer(mPlayer!!.audioSessionId)
57+
}
5758

5859
mPlayer!!.start()
5960
}
@@ -95,10 +96,11 @@ class AudioEffectActivity : BaseActivity(), OnSeeBarListener, AudioEffectCallbac
9596
return
9697
}
9798
try {
98-
mPlayer = MediaPlayer()
99-
mPlayer!!.setDataSource(audioPath)
100-
mPlayer!!.setOnPreparedListener(onPreparedListener)
101-
mPlayer!!.prepareAsync()
99+
mPlayer = MediaPlayer().apply {
100+
setDataSource(audioPath)
101+
setOnPreparedListener(onPreparedListener)
102+
prepareAsync()
103+
}
102104
} catch (e: IOException) {
103105
Log.e("AudioEffect", "play error=$e")
104106
}
@@ -113,17 +115,18 @@ class AudioEffectActivity : BaseActivity(), OnSeeBarListener, AudioEffectCallbac
113115
}
114116

115117
override fun onSelectedFile(filePath: String) {
116-
118+
audioPath = filePath
119+
initPlayer()
117120
}
118121

119122
override fun setEqualizerList(maxProgress: Int, equalizerList: ArrayList<Pair<*, *>>) {
120-
if (equalizerAdapter != null) {
121-
equalizerAdapter!!.setMaxProgress(maxProgress)
122-
equalizerAdapter!!.setEqualizerList(equalizerList)
123+
equalizerAdapter?.let {
124+
it.setMaxProgress(maxProgress)
125+
it.setEqualizerList(equalizerList)
123126
}
124127
}
125128

126-
override fun getSeeBarList(): List<SeekBar>? {
129+
override fun getSeekBarList(): List<SeekBar>? {
127130
return equalizerAdapter?.getSeekBarList()
128131
}
129132

‎app/src/main/java/com/frank/ffmpeg/activity/EqualizerActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView
1212
import com.frank.ffmpeg.AudioPlayer
1313
import com.frank.ffmpeg.R
1414
import com.frank.ffmpeg.adapter.EqualizerAdapter
15-
import com.frank.ffmpeg.listener.OnSeeBarListener
15+
import com.frank.ffmpeg.listener.OnSeekBarListener
1616
import com.frank.ffmpeg.view.VisualizerView
1717
import java.lang.StringBuilder
1818
import java.util.ArrayList
1919

20-
class EqualizerActivity : BaseActivity(), OnSeeBarListener {
20+
class EqualizerActivity : BaseActivity(), OnSeekBarListener {
2121

2222
// unit: Hz gain:0-20
2323
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

‎app/src/main/java/com/frank/ffmpeg/adapter/EqualizerAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import android.widget.TextView
1010
import androidx.recyclerview.widget.RecyclerView
1111

1212
import com.frank.ffmpeg.R
13-
import com.frank.ffmpeg.listener.OnSeeBarListener
13+
import com.frank.ffmpeg.listener.OnSeekBarListener
1414

1515
import java.util.ArrayList
1616

@@ -20,7 +20,7 @@ import java.util.ArrayList
2020
* @desc Adapter of equalizer
2121
*/
2222

23-
class EqualizerAdapter(private val context: Context, private val onSeeBarListener: OnSeeBarListener?) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
23+
class EqualizerAdapter(private val context: Context, private val onSeekBarListener: OnSeekBarListener?) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
2424

2525
private var equalizerList: List<Pair<*, *>>? = ArrayList()
2626
private val seekBarList = ArrayList<SeekBar>()
@@ -51,7 +51,7 @@ class EqualizerAdapter(private val context: Context, private val onSeeBarListene
5151
}
5252

5353
override fun onStopTrackingTouch(seekBar: SeekBar) {
54-
onSeeBarListener?.onProgress(i, seekBar.progress)
54+
onSeekBarListener?.onProgress(i, seekBar.progress)
5555
}
5656
})
5757
}

app/src/main/java/com/frank/ffmpeg/listener/OnSeeBarListener.kt renamed to app/src/main/java/com/frank/ffmpeg/listener/OnSeekBarListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.frank.ffmpeg.listener
22

3-
interface OnSeeBarListener {
3+
interface OnSeekBarListener {
44
fun onProgress(index: Int, progress: Int)
55
}

0 commit comments

Comments
 (0)