From 1562eef254568e4116e84a0a3ed6dd4469fa4835 Mon Sep 17 00:00:00 2001
From: xufuji456 <839789740@qq.com>
Date: Sat, 29 May 2021 20:18:56 +0800
Subject: [PATCH] set highlight mode, and check the params

---
 .../ffmpeg/activity/AudioPlayActivity.kt      |  1 +
 .../java/com/frank/ffmpeg/view/LrcView.kt     | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/frank/ffmpeg/activity/AudioPlayActivity.kt b/app/src/main/java/com/frank/ffmpeg/activity/AudioPlayActivity.kt
index fca9792..db6d99c 100644
--- a/app/src/main/java/com/frank/ffmpeg/activity/AudioPlayActivity.kt
+++ b/app/src/main/java/com/frank/ffmpeg/activity/AudioPlayActivity.kt
@@ -59,6 +59,7 @@ class AudioPlayActivity : AppCompatActivity() {
                     audioBar?.max = duration
                 }
                 MSG_FINISH -> {
+                    if (msg.obj == null) return
                     val result = msg.obj as MediaBean
                     txtTitle?.text = result.audioBean?.title
                     txtArtist?.text = result.audioBean?.artist
diff --git a/app/src/main/java/com/frank/ffmpeg/view/LrcView.kt b/app/src/main/java/com/frank/ffmpeg/view/LrcView.kt
index 1ed91f9..322c975 100644
--- a/app/src/main/java/com/frank/ffmpeg/view/LrcView.kt
+++ b/app/src/main/java/com/frank/ffmpeg/view/LrcView.kt
@@ -9,6 +9,7 @@ import android.graphics.Paint.Align
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
+import androidx.annotation.IntDef
 
 import com.frank.ffmpeg.listener.OnLrcListener
 import com.frank.ffmpeg.model.LrcLine
@@ -42,7 +43,12 @@ class LrcView(context: Context, attr: AttributeSet) : View(context, attr) {
 
     private var mDisplayMode = DISPLAY_MODE_NORMAL
 
-    private val mode = MODE_HIGH_LIGHT_KARAOKE
+    @Retention(AnnotationRetention.SOURCE)
+    @IntDef(MODE_HIGH_LIGHT_NORMAL, MODE_HIGH_LIGHT_KARAOKE)
+    annotation class HighLightMode
+
+    @HighLightMode
+    private var mode = MODE_HIGH_LIGHT_KARAOKE
 
 
     init {
@@ -109,20 +115,24 @@ class LrcView(context: Context, attr: AttributeSet) : View(context, attr) {
     }
 
     private fun drawKaraokeHighLightLrcRow(canvas: Canvas, width: Int, rowX: Int, highlightRowY: Int) {
+        if (width <= 0 || rowX <= 0 || highlightRowY <= 0) {
+            return
+        }
         val highLrcLine = mLrcLines!![mHighLightRow]
         val highlightText = highLrcLine.content
+        if (highlightText.isNullOrEmpty()) return
 
         mPaint.color = mNormalRowColor
         mPaint.textSize = mLrcFontSize.toFloat()
         mPaint.textAlign = Align.CENTER
-        canvas.drawText(highlightText!!, rowX.toFloat(), highlightRowY.toFloat(), mPaint)
+        canvas.drawText(highlightText, rowX.toFloat(), highlightRowY.toFloat(), mPaint)
 
         val highLineWidth = mPaint.measureText(highlightText).toInt()
         val leftOffset = (width - highLineWidth) / 2
         val start = highLrcLine.startTime
         val end = highLrcLine.endTime
         val highWidth = ((currentMillis - start) * 1.0f / (end - start) * highLineWidth).toInt()
-        if (highWidth > 0) {
+        if (highWidth > 0 && highWidth < Integer.MAX_VALUE) {
             mPaint.color = mHighLightRowColor
             val textBitmap = Bitmap.createBitmap(highWidth, highlightRowY + mPadding, Bitmap.Config.ARGB_8888)
             val textCanvas = Canvas(textBitmap)
@@ -196,6 +206,10 @@ class LrcView(context: Context, attr: AttributeSet) : View(context, attr) {
         invalidate()
     }
 
+    fun setHighLightMode(@HighLightMode mode: Int) {
+        this.mode = mode
+    }
+
     private fun seekLrc(position: Int, cb: Boolean) {
         if (mLrcLines == null || position < 0 || position > mLrcLines!!.size) {
             return
@@ -251,8 +265,8 @@ class LrcView(context: Context, attr: AttributeSet) : View(context, attr) {
 
         private const val noLrcTip = "No lyrics..."
 
-        private const val MODE_HIGH_LIGHT_NORMAL = 0
+        const val MODE_HIGH_LIGHT_NORMAL = 0
 
-        private const val MODE_HIGH_LIGHT_KARAOKE = 1
+        const val MODE_HIGH_LIGHT_KARAOKE = 1
     }
 }