fix: 回复消息显示不支持类型

Signed-off-by: java30433 <[email protected]>

Author: java30433

app/src/main/java/momoi/mod/qqpro/MsgUtil.kt

@@ -7,7 +7,11 @@ import com.tencent.qqnt.kernel.nativeinterface.TextElement
 import com.tencent.qqnt.msg.api.impl.MsgServiceImpl
 import com.tencent.qqnt.msg.api.impl.MsgUtilApiImpl
 import com.tencent.watch.aio_impl.ext.MsgListUtilKt
+import momoi.mod.qqpro.enum.ElementType
+import momoi.mod.qqpro.enum.NTMsgType
 import momoi.mod.qqpro.hook.view.MyDialogFragment
+import momoi.mod.qqpro.util.Json
+import momoi.mod.qqpro.util.Utils
 import java.util.UUID
 import kotlin.random.Random
 
@@ -16,40 +20,57 @@ object MsgUtil {
     val msgUtilApi = MsgUtilApiImpl()
 
     fun summary(elements: List<MsgElement>): CharSequence {
+        if (elements[0].elementType == ElementType.GREY_TIP) {
+            //subElementType == 1
+            return "[原消息已被撤回]"
+        }
         elements.forEach { ele ->
             ele.picElement?.let {
                 ele.picElement = null
+                ele.elementType = ElementType.TEXT
                 ele.textElement = TextElement().apply {
                     content = "[图片]"
                 }
             }
             ele.multiForwardMsgElement?.let {
                 ele.multiForwardMsgElement = null
+                ele.elementType = ElementType.TEXT
                 ele.textElement = TextElement().apply {
                     content = "[聊天记录]"
                 }
             }
             ele.videoElement?.let {
                 ele.videoElement = null
+                ele.elementType = ElementType.TEXT
                 ele.textElement = TextElement().apply {
                     content = "[视频]"
                 }
             }
             ele.fileElement?.let {
                 ele.fileElement = null
+                ele.elementType = ElementType.TEXT
                 ele.textElement = TextElement().apply {
                     content = "[文件]"
                 }
             }
             ele.pttElement?.let {
                 ele.pttElement = null
+                ele.elementType = ElementType.TEXT
                 ele.textElement = TextElement().apply {
                     content = "[语音]"
                 }
             }
+            ele.arkElement?.let {
+                ele.arkElement = null
+                ele.elementType = ElementType.TEXT
+                ele.textElement = TextElement().apply {
+                    content = Json(it.bytesData).str("prompt") ?: "[卡片信息]"
+                }
+            }
         }
         return MsgListUtilKt.a(elements)
     }
+
     fun summary(record: MsgRecord) = summary(record.elements)
 }
 

app/src/main/java/momoi/mod/qqpro/enum/ElementType.kt

@@ -0,0 +1,36 @@
+package momoi.mod.qqpro.enum
+
+object ElementType {
+    const val UNKNOWN = 0
+    const val TEXT = 1
+    const val PIC = 2
+    const val FILE = 3
+    const val PTT = 4
+    const val VIDEO = 5
+    const val FACE = 6
+    const val REPLY = 7
+    const val GREY_TIP = 8 // “小灰条”，包括拍一拍 (Poke)、撤回提示等
+    const val WALLET = 9
+    const val ARK = 10
+    const val MFACE = 11
+    const val LIVE_GIFT = 12
+    const val STRUCT_LONG_MSG = 13
+    const val MARKDOWN = 14
+    const val GIPHY = 15
+    const val MULTI_FORWARD = 16
+    const val INLINE_KEYBOARD = 17
+    const val IN_TEXT_GIFT = 18
+    const val CALENDAR = 19
+    const val YOLO_GAME_RESULT = 20
+    const val AV_RECORD = 21
+    const val FEED = 22
+    const val TOFU_RECORD = 23
+    const val ACE_BUBBLE = 24
+    const val ACTIVITY = 25
+    const val TOFU = 26
+    const val FACE_BUBBLE = 27
+    const val SHARE_LOCATION = 28
+    const val TASK_TOP_MSG = 29
+    const val RECOMMENDED_MSG = 43
+    const val ACTION_BAR = 44
+}

app/src/main/java/momoi/mod/qqpro/hook/版权信息.kt

@@ -24,6 +24,7 @@ class 版权信息 : SelfFragment() {
             appendLine()
             appendLine("更新日志：")
             appendLine("现在可以展示卡片信息和跳转链接")
+            appendLine("修复了回复消息内容显示问题")
             appendLine("移除了跳转未读消息的滚动动画")
             appendLine("修复圆屏长按菜单错位问题")
             appendLine()