【TUILiveKit】【Android】publish beta version 3.6.1

Author: xanderzhao-zb

live/tuilivekit/build.gradle

@@ -69,7 +69,9 @@ dependencies {
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:8.8.7357"
 
-    api rootProject.getProperties().containsKey("atomicxCoreSdk") ? rootProject.ext.atomicxCoreSdk : "io.trtc.uikit:atomicx-core:3.6.1.66"
+    api rootProject.getProperties().containsKey("roomEngineSdk") ? rootProject.ext.roomEngineSdk : "io.trtc.uikit:rtc_room_engine:3.5.0.954"
+    api rootProject.getProperties().containsKey("atomicxCoreSdk") ? rootProject.ext.atomicxCoreSdk : "io.trtc.uikit:atomicx-core:3.5.0.954"
+    api rootProject.getProperties().containsKey("liteavSdk") ? rootProject.ext.liteavSdk : "com.tencent.liteav:LiteAVSDK_Professional:12.8.0.19279"
     api rootProject.getProperties().containsKey("imSdk") ? rootProject.ext.imSdk : "com.tencent.imsdk:imsdk-plus:8.7.7201"
     api rootProject.getProperties().containsKey("common") ? rootProject.ext.common : "io.trtc.uikit:common:3.3.0.1194"
 }

live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/AnchorTagSpan.kt

@@ -0,0 +1,74 @@
+package com.trtc.uikit.livekit.component.barrage.view
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.drawable.Drawable
+import android.text.style.ReplacementSpan
+
+class AnchorTagSpan(
+    private val text: String,
+    private val textColor: Int,
+    private val textSize: Float,
+    private val background: Drawable,
+    private val tagWidth: Int,
+    private val tagHeight: Int,
+    private val margin: Int,
+    private val isRtl: Boolean = false
+) : ReplacementSpan() {
+
+    override fun getSize(
+        paint: Paint,
+        text: CharSequence,
+        start: Int,
+        end: Int,
+        fm: Paint.FontMetricsInt?
+    ): Int {
+        fm?.run {
+            val pfm = paint.fontMetricsInt
+            val centerOffset = (tagHeight - (pfm.descent - pfm.ascent)) / 2
+            ascent = pfm.ascent - centerOffset
+            top = pfm.top - centerOffset
+            bottom = pfm.descent + centerOffset
+            descent = pfm.descent + centerOffset
+        }
+        return tagWidth + margin
+    }
+
+    override fun draw(
+        canvas: Canvas,
+        text: CharSequence,
+        start: Int,
+        end: Int,
+        x: Float,
+        top: Int,
+        y: Int,
+        bottom: Int,
+        paint: Paint
+    ) {
+        val pfm = paint.fontMetricsInt
+        val fontCenter = y + (pfm.descent + pfm.ascent) / 2
+        val tagTop = fontCenter - tagHeight / 2
+
+        val tagX = if (isRtl) x + margin else x
+
+        background.setBounds(tagX.toInt(), tagTop, tagX.toInt() + tagWidth, tagTop + tagHeight)
+        background.draw(canvas)
+
+        val originalTextSize = paint.textSize
+        val originalColor = paint.color
+
+        paint.textSize = textSize
+        paint.color = textColor
+        paint.isFakeBoldText = true
+
+        val textWidth = paint.measureText(this.text.uppercase())
+        val textX = tagX + (tagWidth - textWidth) / 2
+        val textY = tagTop + tagHeight / 2 - (paint.descent() + paint.ascent()) / 2
+
+        canvas.drawText(this.text.uppercase(), textX, textY, paint)
+
+        paint.textSize = originalTextSize
+        paint.color = originalColor
+        paint.isFakeBoldText = false
+    }
+}

live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/EmojiSpan.kt

@@ -5,7 +5,6 @@ import android.graphics.Paint
 import android.graphics.drawable.Drawable
 import android.text.style.ImageSpan
 import androidx.core.graphics.withSave
-import com.trtc.tuikit.common.util.ScreenUtil
 
 class EmojiSpan @JvmOverloads constructor(
     drawable: Drawable,
@@ -20,13 +19,14 @@ class EmojiSpan @JvmOverloads constructor(
         fm: Paint.FontMetricsInt?
     ) = drawable.bounds.right.also {
         fm?.run {
-            val fontHeight = paint.fontMetricsInt.run { bottom - top }
-            val drHeight = drawable.bounds.bottom + ScreenUtil.dip2px(6f)
-            val centerY = drHeight / 2 - fontHeight / 4
-            ascent = -centerY
-            top = -centerY
-            bottom = centerY
-            descent = centerY
+            val pfm = paint.fontMetricsInt
+            val drHeight = drawable.bounds.height()
+            val fontHeight = pfm.descent - pfm.ascent
+            val centerOffset = (drHeight - fontHeight) / 2
+            ascent = pfm.ascent - centerOffset
+            top = pfm.top - centerOffset
+            bottom = pfm.descent + centerOffset
+            descent = pfm.descent + centerOffset
         }
     }
 
@@ -41,11 +41,12 @@ class EmojiSpan @JvmOverloads constructor(
         bottom: Int,
         paint: Paint
     ) {
-        canvas.run {
-            withSave {
-                translate(x, ((bottom - top - drawable.bounds.bottom) / 2 + top - emojiTranslateY).toFloat())
-                drawable.draw(this)
-            }
+        canvas.withSave {
+            val pfm = paint.fontMetricsInt
+            val fontCenter = y + (pfm.descent + pfm.ascent) / 2
+            val translateY = fontCenter - drawable.bounds.height() / 2 - emojiTranslateY
+            translate(x, translateY.toFloat())
+            drawable.draw(this)
         }
     }
 }