shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: friend poke event detail fix #103

Browse Source
This commit is contained in:
ikechan8370 2023-11-28 17:19:08 +08:00
parent c6dad5677c
commit 85aaa54e4e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt
View File

@ -395,7 +395,7 @@ internal object GlobalEventTransmitter: BaseSvc() {
* 私聊通知 通知器 * 私聊通知 通知器
*/ */
object PrivateNoticeTransmitter { object PrivateNoticeTransmitter {
suspend fun transPrivatePoke(msgTime: Long, operation: Long, target: Long): Boolean { suspend fun transPrivatePoke(msgTime: Long, operation: Long, target: Long, action: String?, suffix: String?, actionImg: String?): Boolean {
pushNotice(NoticeEvent( pushNotice(NoticeEvent(
time = msgTime, time = msgTime,
selfId = app.longAccountUin, selfId = app.longAccountUin,
@ -405,7 +405,12 @@ internal object GlobalEventTransmitter: BaseSvc() {
operatorId = operation, operatorId = operation,
userId = operation, userId = operation,
senderId = operation, senderId = operation,
target = target target = target,
pokeDetail = PokeDetail(
actionImg = actionImg,
action = action,
suffix = suffix
)
)) ))
return true return true
} }

12
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt
View File

@ -96,6 +96,9 @@ internal object PrimitiveListener {
lateinit var target: String lateinit var target: String
lateinit var operation: String lateinit var operation: String
var suffix: String? = null
var actionImg: String? = null
var action: String? = null
detail[7] detail[7]
.asList .asList
.value .value
@ -104,12 +107,17 @@ internal object PrimitiveListener {
when(it[1].asUtf8String) { when(it[1].asUtf8String) {
"uin_str1" -> operation = value "uin_str1" -> operation = value
"uin_str2" -> target = value "uin_str2" -> target = value
"action_str" -> action = value
"alt_str1" -> action = value
"suffix_str" -> suffix = value
"action_img_url" -> actionImg = value
} }
} }
LogCenter.log("私聊戳一戳: $operation -> $target")
LogCenter.log("私聊戳一戳: $operation $action $target $suffix")
if(!GlobalEventTransmitter.PrivateNoticeTransmitter if(!GlobalEventTransmitter.PrivateNoticeTransmitter
.transPrivatePoke(msgTime, operation.toLong(), target.toLong())) { .transPrivatePoke(msgTime, operation.toLong(), target.toLong(), action, suffix, actionImg)) {
LogCenter.log("私聊戳一戳推送失败！", Level.WARN) LogCenter.log("私聊戳一戳推送失败！", Level.WARN)
} }
} }