Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
6abc8c17
Commit
6abc8c17
authored
Jul 31, 2020
by
Him188
Committed by
GitHub
Jul 31, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #471 from Mrs4s/dev
fix issue of multi msg cannot view on phone.
parents
fe306c4a
65b8d4e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
24 deletions
+31
-24
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
.../mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
+31
-24
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
View file @
6abc8c17
...
@@ -48,33 +48,40 @@ internal fun Collection<ForwardMessage.INode>.calculateValidationDataForGroup(
...
@@ -48,33 +48,40 @@ internal fun Collection<ForwardMessage.INode>.calculateValidationDataForGroup(
random
:
Int
,
random
:
Int
,
groupCode
:
Long
groupCode
:
Long
):
MessageValidationData
{
):
MessageValidationData
{
val
msgTransmit
=
MsgTransmit
.
PbMultiMsgTransmit
(
val
msgList
=
map
{
chain
->
msg
=
this
.
map
{
chain
->
MsgComm
.
Msg
(
MsgComm
.
Msg
(
msgHead
=
MsgComm
.
MsgHead
(
msgHead
=
MsgComm
.
MsgHead
(
fromUin
=
chain
.
senderId
,
fromUin
=
chain
.
senderId
,
msgSeq
=
sequenceId
,
msgSeq
=
sequenceId
,
msgTime
=
chain
.
time
,
msgTime
=
chain
.
time
,
msgUid
=
0
x01000000000000000L
or
random
.
toLongUnsigned
(),
msgUid
=
0
x01000000000000000L
or
random
.
toLongUnsigned
(),
mutiltransHead
=
MsgComm
.
MutilTransHead
(
mutiltransHead
=
MsgComm
.
MutilTransHead
(
status
=
0
,
status
=
0
,
msgId
=
1
msgId
=
1
),
),
msgType
=
82
,
// troop
msgType
=
82
,
// troop
groupInfo
=
MsgComm
.
GroupInfo
(
groupInfo
=
MsgComm
.
GroupInfo
(
groupCode
=
groupCode
,
groupCode
=
groupCode
,
groupCard
=
chain
.
senderName
// Cinnamon
groupCard
=
chain
.
senderName
// Cinnamon
),
isSrcMsg
=
false
),
),
msgBody
=
ImMsgBody
.
MsgBody
(
isSrcMsg
=
false
richText
=
ImMsgBody
.
RichText
(
),
elems
=
chain
.
message
.
asMessageChain
()
msgBody
=
ImMsgBody
.
MsgBody
(
.
toRichTextElems
(
forGroup
=
true
,
withGeneralFlags
=
false
).
toMutableList
()
richText
=
ImMsgBody
.
RichText
(
)
elems
=
chain
.
message
.
asMessageChain
()
.
toRichTextElems
(
forGroup
=
true
,
withGeneralFlags
=
false
).
toMutableList
()
)
)
)
)
}
)
}
val
msgTransmit
=
MsgTransmit
.
PbMultiMsgTransmit
(
msg
=
msgList
,
pbItemList
=
listOf
(
MsgTransmit
.
PbMultiMsgItem
(
fileName
=
"MultiMsg"
,
buffer
=
MsgTransmit
.
PbMultiMsgNew
(
msgList
).
toByteArray
(
MsgTransmit
.
PbMultiMsgNew
.
serializer
())
)
)
)
)
val
bytes
=
msgTransmit
.
toByteArray
(
MsgTransmit
.
PbMultiMsgTransmit
.
serializer
())
val
bytes
=
msgTransmit
.
toByteArray
(
MsgTransmit
.
PbMultiMsgTransmit
.
serializer
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment