feat: 卡片消息展示

java30433 · java30433 · commit 78d00e613c10 · 2025-05-17T21:51:13.000+08:00
Signed-off-by: java30433 &lt;2159116373@qq.com&gt;
diff --git a/app/src/main/java/com/tencent/qqnt/kernel/nativeinterface/ArkElement.java b/app/src/main/java/com/tencent/qqnt/kernel/nativeinterface/ArkElement.java
@@ -0,0 +1,5 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class ArkElement {
+    public String bytesData;
+}
diff --git a/app/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MsgElement.java b/app/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MsgElement.java
@@ -2,7 +2,7 @@
 
 public final class MsgElement {
     //public AdelieActionBarElement actionBarElement;
-    //public ArkElement arkElement;
+    public ArkElement arkElement;
     //public AVRecordElement avRecordElement;
     //public CalendarElement calendarElement;
     public long elementId;
diff --git a/app/src/main/java/momoi/mod/qqpro/Settings.kt b/app/src/main/java/momoi/mod/qqpro/Settings.kt
@@ -2,6 +2,7 @@ package momoi.mod.qqpro
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
+import momoi.mod.qqpro.util.Utils
 
 object Settings {
     val sp: SharedPreferences = Utils.application.getSharedPreferences("qqpro", 0)
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/action/CurrentMsgList.kt b/app/src/main/java/momoi/mod/qqpro/hook/action/CurrentMsgList.kt
@@ -14,7 +14,7 @@ import com.tencent.watch.aio_impl.coreImpl.vb.WatchAIOListVB
 import com.tencent.watch.aio_impl.data.WatchAIOMsgItem
 import com.tencent.watch.aio_impl.ext.MsgListUtilKt
 import momoi.anno.mixin.Mixin
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.lib.Observable
 
 object CurrentMsgList {
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/action/RecentContacts.kt b/app/src/main/java/momoi/mod/qqpro/hook/action/RecentContacts.kt
@@ -10,7 +10,7 @@ import com.tencent.qqnt.kernel.nativeinterface.RecentContactInfo
 import com.tencent.qqnt.watch.chat.list.WatchRecentContactHolder
 import com.tencent.qqnt.watch.chat.list.WatchRecentItemBuilder
 import momoi.anno.mixin.Mixin
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import mqq.app.AppRuntime
 
 object RecentContacts {
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/AIOCell.kt b/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/AIOCell.kt
@@ -38,6 +38,12 @@ object AIOCell {
                 loadData(CurrentContact, msg.forwardData!!)
             },
         )
+        addHook<CardMsgView>(
+            type = NTMsgType.ARKSTRUCT,
+            onBind = { msg, widget ->
+                loadData(msg.elements.firstNotNullOf { it.arkElement })
+            }
+        )
     }
     inline fun <reified T : View> addHook(
         type: Int,
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/CardMsgView.kt b/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/CardMsgView.kt
@@ -0,0 +1,103 @@
+package momoi.mod.qqpro.hook.aio_cell
+
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.tencent.qqnt.kernel.nativeinterface.ArkElement
+import loadPicUrl
+import momoi.mod.qqpro.Settings
+import momoi.mod.qqpro.lib.FILL
+import momoi.mod.qqpro.lib.WRAP
+import momoi.mod.qqpro.lib.background
+import momoi.mod.qqpro.lib.clickable
+import momoi.mod.qqpro.lib.content
+import momoi.mod.qqpro.lib.dp
+import momoi.mod.qqpro.lib.height
+import momoi.mod.qqpro.lib.margin
+import momoi.mod.qqpro.lib.marginVertical
+import momoi.mod.qqpro.lib.padding
+import momoi.mod.qqpro.lib.scaleType
+import momoi.mod.qqpro.lib.size
+import momoi.mod.qqpro.lib.textColor
+import momoi.mod.qqpro.lib.textSize
+import momoi.mod.qqpro.lib.vertical
+import momoi.mod.qqpro.lib.width
+import momoi.mod.qqpro.util.Json
+import momoi.mod.qqpro.util.Utils
+import org.json.JSONObject
+
+class CardMsgView(context: Context) : LinearLayout(context) {
+    private lateinit var mTvTitle: TextView
+    private lateinit var mTvTag: TextView
+    private lateinit var mTvDesc: TextView
+    private lateinit var mIvIcon: ImageView
+    private lateinit var mIvPreview: ImageView
+
+    init {
+        vertical()
+        padding(2.dp)
+        content {
+            mTvTitle = add<TextView>()
+                .textSize(12f * Settings.chatScale.value)
+                .textColor(0xFF_FFFFFF.toInt())
+            mTvDesc = add<TextView>()
+                .textSize(10f * Settings.chatScale.value)
+                .textColor(0xFF_CCCCCC.toInt())
+            mIvPreview = add<ImageView>()
+               .width(FILL)
+            add<View>()
+                .size(width = FILL, height = 1)
+                .background(0xFF_AAAAAA.toInt())
+                .marginVertical(1.dp)
+            add<LinearLayout>()
+                .width(FILL)
+                .content {
+                    mIvIcon = add<ImageView>()
+                        .size(WRAP, FILL)
+                        .scaleType(ImageView.ScaleType.CENTER_CROP)
+                    mTvTag = add<TextView>()
+                        .textSize(9f * Settings.chatScale.value)
+                        .textColor(0xFF_FFFFFF.toInt())
+                        .weight(1f)
+                        .margin(left = 2.dp)
+                }
+        }
+    }
+
+    fun loadData(ark: ArkElement) {
+        try {
+            val json = Json(ark.bytesData)
+            val meta = json.json("meta")!!
+            val data = meta.json(meta.keys.first())!!
+            val desc = data.str("desc")
+            val title = data.str("title")!!
+            mTvTitle.text = title
+            mTvDesc.text = desc
+            val icon = data.str("icon")
+            if (!icon.isNullOrEmpty()) {
+                mIvIcon.loadPicUrl(icon)
+            }
+            val tag = data.str("tag")
+            if (!tag.isNullOrEmpty()) {
+                mTvTag.visibility = VISIBLE
+                mTvTag.text = tag
+                mIvIcon.loadPicUrl(data.str("tagIcon"))
+            } else {
+                mTvTag.visibility = GONE
+            }
+            val preview = data.str("preview")
+            if (!preview.isNullOrEmpty() && json.str("view") != "news") {
+                mIvPreview.loadPicUrl(preview)
+            }
+            clickable {
+                (data.str("jumpUrl") ?: data.str("qqdocurl"))?.let {
+                    Utils.openUrl(it)
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/ForwardMsgView.kt b/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/ForwardMsgView.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.tencent.qqnt.kernel.nativeinterface.Contact
+import momoi.mod.qqpro.Settings
 import momoi.mod.qqpro.lib.FILL
 import momoi.mod.qqpro.lib.background
 import momoi.mod.qqpro.lib.clickable
@@ -35,17 +36,17 @@ class ForwardMsgView(context: Context) : LinearLayout(context) {
             .padding(2.dp)
             .content {
                 mTvTitle = add<TextView>()
-                    .textSize(13f)
+                    .textSize(13f * Settings.chatScale.value)
                     .textColor(0xFF_FFFFFF.toInt())
                 mTvPreview = add<TextView>()
-                    .textSize(12f)
+                    .textSize(12f * Settings.chatScale.value)
                     .textColor(0xFF_CCCCCC.toInt())
                 add<View>()
                     .size(width = FILL, height = 1)
                     .background(0xFF_AAAAAA.toInt())
                     .marginVertical(1.dp)
                 mTvSummary = add<TextView>()
-                    .textSize(10f)
+                    .textSize(10f * Settings.chatScale.value)
                     .textColor(0xFF_CCCCCC.toInt())
             }
     }
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/ReplyView.kt b/app/src/main/java/momoi/mod/qqpro/hook/aio_cell/ReplyView.kt
@@ -9,7 +9,8 @@ import com.tencent.qqnt.kernel.nativeinterface.ReplyElement
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.Colors
 import momoi.mod.qqpro.MsgUtil
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.Settings
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.join
 import momoi.mod.qqpro.lib.background
 import momoi.mod.qqpro.lib.content
@@ -38,10 +39,10 @@ class ReplyView(context: Context) : LinearLayout(context) {
             .paddingHorizontal(2.dp)
             .content {
                 mTvName = add<TextView>()
-                    .textSize(10f)
+                    .textSize(10f * Settings.chatScale.value)
                     .textColor(Colors.replyText)
                 mTvContent = add<TextView>()
-                    .textSize(12f)
+                    .textSize(12f * Settings.chatScale.value)
                     .textColor(Colors.replyText)
                     .apply {
                         maxLines = 2
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/style/聊天底部按钮调整.kt b/app/src/main/java/momoi/mod/qqpro/hook/style/聊天底部按钮调整.kt
@@ -13,7 +13,7 @@ import com.tencent.mobileqq.app.ThreadManagerV2
 import com.tencent.watch.aio_impl.coreImpl.vb.`InputBarController$inputContent$2`
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.Settings
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.asGroup
 import momoi.mod.qqpro.drawable.roundCornerDrawable
 import momoi.mod.qqpro.lib.FILL
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/style/长按菜单调整.kt b/app/src/main/java/momoi/mod/qqpro/hook/style/长按菜单调整.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.view.forEach
 import com.tencent.watch.aio_impl.ui.menu.AIOLongClickMenuFragment
 import momoi.anno.mixin.Mixin
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.asGroup
 import momoi.mod.qqpro.forEachAll
 import momoi.mod.qqpro.lib.FILL
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/view/NetworkImage.kt b/app/src/main/java/momoi/mod/qqpro/hook/view/NetworkImage.kt
@@ -3,7 +3,7 @@ import android.graphics.BitmapFactory
 import android.graphics.Rect
 import android.widget.ImageView
 import com.tencent.qqnt.kernel.nativeinterface.PicElement
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.child
 import momoi.mod.qqpro.lib.bitmapDecodeFile
 import momoi.mod.qqpro.msg.getImageUrl
@@ -14,16 +14,19 @@ import java.net.HttpURLConnection
 import java.net.URL
 import kotlin.concurrent.thread
 
-//TODO 优化逻辑
-fun ImageView.loadPicElement(pic: PicElement) = apply {
+// 抽取的加载图片 URL 的函数
+fun ImageView.loadPicUrl(url: String?, cacheFileName: String = "${System.currentTimeMillis() / 1000}${url.hashCode()}") = apply {
+    if (url.isNullOrEmpty()) {
+        return@apply
+    }
     require(maxHeight != 0)
-    val cacheFile = context.externalCacheDir!!.child("${pic.md5HexStr}.jpg")
+    val cacheFile = context.externalCacheDir!!.child("$cacheFileName.jpg")
     cacheFile.parentFile?.mkdirs()
     if (cacheFile.exists()) {
         Utils.log("Load Image from disk ${cacheFile.path}")
         bitmapDecodeFile(cacheFile)
     } else {
-        download(pic.getImageUrl(), cacheFile) { succeed ->
+        download(url, cacheFile) { succeed ->
             if (!succeed) {
                 val error = context.externalCacheDir!!.child("error.jpg")
                 if (error.exists()) {
@@ -35,13 +38,16 @@ fun ImageView.loadPicElement(pic: PicElement) = apply {
                         }
                     }
                 }
-            } else {
-                bitmapDecodeFile(cacheFile)
             }
         }
     }
 }
 
+fun ImageView.loadPicElement(pic: PicElement) = apply {
+    // 调用抽取的函数
+    loadPicUrl(pic.getImageUrl(), pic.md5HexStr)
+}
+
 inline fun download(url: String, file: File, crossinline callback: (Boolean) -> Unit) {
     thread {
         var connection: HttpURLConnection? = null
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/图片查看圆屏适配.kt b/app/src/main/java/momoi/mod/qqpro/hook/图片查看圆屏适配.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import com.tencent.richframework.widget.matrix.RFWMatrixImageView
 import momoi.anno.mixin.Mixin
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import kotlin.math.sqrt
 
 private val size = ((Utils.heightPixels - Utils.heightPixels / sqrt(2f)) / 2).toInt()
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/屏蔽返回键.kt b/app/src/main/java/momoi/mod/qqpro/hook/屏蔽返回键.kt
@@ -3,7 +3,7 @@ package momoi.mod.qqpro.hook
 import com.tencent.qqnt.watch.mainframe.MainActivity
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.Settings
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 
 @Mixin
 class 屏蔽返回键 : MainActivity() {
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/更新检查.kt b/app/src/main/java/momoi/mod/qqpro/hook/更新检查.kt
@@ -7,7 +7,7 @@ import com.tencent.qqnt.watch.app.JumpActivity
 import com.tencent.qqnt.watch.mainframe.MainActivity
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.Settings
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.api.Http
 import java.io.BufferedReader
 import java.io.InputStreamReader
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/滚轮适配.kt b/app/src/main/java/momoi/mod/qqpro/hook/滚轮适配.kt
@@ -15,7 +15,7 @@ import com.tencent.qqnt.watch.mainframe.MainActivity
 import com.tencent.richframework.widget.matrix.RFWMatrixImageView
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.Settings
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.asGroup
 import momoi.mod.qqpro.forEachAll
 import kotlin.math.roundToInt
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/设置页.kt b/app/src/main/java/momoi/mod/qqpro/hook/设置页.kt
@@ -14,7 +14,7 @@ import androidx.core.widget.doAfterTextChanged
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.Pref
 import momoi.mod.qqpro.Settings
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.asGroup
 import momoi.mod.qqpro.forEachAll
 import momoi.mod.qqpro.lib.FILL
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/跳转第一条未读消息.kt b/app/src/main/java/momoi/mod/qqpro/hook/跳转第一条未读消息.kt
@@ -15,7 +15,7 @@ import com.tencent.watch.aio_impl.coreImpl.vb.WatchAIOListVB
 import com.tencent.watch.aio_impl.data.WatchAIOMsgItem
 import momoi.anno.mixin.Mixin
 import momoi.mod.qqpro.MsgUtil
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import momoi.mod.qqpro.asGroup
 import momoi.mod.qqpro.drawable.roundCornerDrawable
 import momoi.mod.qqpro.hook.action.CurrentContact
diff --git a/app/src/main/java/momoi/mod/qqpro/hook/通话可使用蓝牙.kt b/app/src/main/java/momoi/mod/qqpro/hook/通话可使用蓝牙.kt
@@ -5,7 +5,7 @@ import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothProfile
 import com.tencent.qqnt.qav_component_impl.qav.bussiness.QavBussinessCtrl
 import momoi.anno.mixin.Mixin
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 
 @Mixin
 class 通话可使用蓝牙 : QavBussinessCtrl() {
diff --git a/app/src/main/java/momoi/mod/qqpro/lib/ImageView.kt b/app/src/main/java/momoi/mod/qqpro/lib/ImageView.kt
@@ -4,7 +4,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Rect
 import android.widget.ImageView
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 import java.io.File
 import java.io.InputStream
 
diff --git a/app/src/main/java/momoi/mod/qqpro/lib/Units.kt b/app/src/main/java/momoi/mod/qqpro/lib/Units.kt
@@ -3,7 +3,7 @@ package momoi.mod.qqpro.lib
 import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.util.TypedValue
-import momoi.mod.qqpro.Utils
+import momoi.mod.qqpro.util.Utils
 
 val Int.dp @SuppressLint("WrongConstant")
 get() = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, toFloat(), Utils.application.resources.displayMetrics).toInt()
diff --git a/app/src/main/java/momoi/mod/qqpro/util/Json.kt b/app/src/main/java/momoi/mod/qqpro/util/Json.kt
@@ -0,0 +1,26 @@
+package momoi.mod.qqpro.util
+
+import org.json.JSONObject
+
+class Json(private val json: JSONObject) {
+    constructor(data: String) : this(JSONObject(data))
+    val keys: Set<String> by lazy {
+        val set = mutableSetOf<String>()
+        json.keys().forEach { set.add(it) }
+        set
+    }
+    fun json(key: String): Json? {
+        return if (json.has(key)) {
+            Json(json.getJSONObject(key))
+        } else {
+            null
+        }
+    }
+    fun str(key: String): String? {
+        return if (json.has(key)) {
+            json.getString(key)
+        } else {
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/momoi/mod/qqpro/util/Utils.kt b/app/src/main/java/momoi/mod/qqpro/util/Utils.kt

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ object AIOCell {`
`38`	`38`	`loadData(CurrentContact, msg.forwardData!!)`
`39`	`39`	`},`
`40`	`40`	`)`
	`41`	`+ addHook<CardMsgView>(`
	`42`	`+ type = NTMsgType.ARKSTRUCT,`
	`43`	`+ onBind = { msg, widget ->`
	`44`	`+ loadData(msg.elements.firstNotNullOf { it.arkElement })`
	`45`	`+ }`
	`46`	`+ )`
`41`	`47`	`}`
`42`	`48`	`inline fun <reified T : View> addHook(`
`43`	`49`	`type: Int,`