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
02b4f10e
Commit
02b4f10e
authored
Feb 08, 2020
by
Him188
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
ee3f08f7
f18007f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
166 additions
and
2 deletions
+166
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt
...rai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt
+162
-0
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
...ndroid/network/protocol/packet/chat/receive/OnlinePush.kt
+4
-2
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt
View file @
02b4f10e
...
@@ -84,4 +84,166 @@ class OnlinePushPack {
...
@@ -84,4 +84,166 @@ class OnlinePushPack {
@SerialId
(
3
)
val
uMsgCompleted
:
Long
?
=
null
,
@SerialId
(
3
)
val
uMsgCompleted
:
Long
?
=
null
,
@SerialId
(
4
)
val
vMsgInfos
:
List
<
MsgInfo
>?
=
null
@SerialId
(
4
)
val
vMsgInfos
:
List
<
MsgInfo
>?
=
null
)
:
JceStruct
)
:
JceStruct
@Serializable
internal
class
MsgType0x210
(
@SerialId
(
0
)
val
uSubMsgType
:
Long
,
@SerialId
(
1
)
val
stMsgInfo0x2
:
MsgType0x210SubMsgType0x2
?
=
null
,
@SerialId
(
3
)
val
stMsgInfo0xa
:
MsgType0x210SubMsgType0xa
?
=
null
,
@SerialId
(
4
)
val
stMsgInfo0xe
:
MsgType0x210SubMsgType0xe
?
=
null
,
@SerialId
(
5
)
val
stMsgInfo0x13
:
MsgType0x210SubMsgType0x13
?
=
null
,
@SerialId
(
6
)
val
stMsgInfo0x17
:
MsgType0x210SubMsgType0x17
?
=
null
,
@SerialId
(
7
)
val
stMsgInfo0x20
:
MsgType0x210SubMsgType0x20
?
=
null
,
@SerialId
(
8
)
val
stMsgInfo0x1d
:
MsgType0x210SubMsgType0x1d
?
=
null
,
@SerialId
(
9
)
val
stMsgInfo0x24
:
MsgType0x210SubMsgType0x24
?
=
null
,
@SerialId
(
10
)
val
vProtobuf
:
ByteArray
?
=
null
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0x13
(
@SerialId
(
0
)
val
uint32SrcAppId
:
Long
?
=
null
,
@SerialId
(
1
)
val
uint32SrcInstId
:
Long
?
=
null
,
@SerialId
(
2
)
val
uint32DstAppId
:
Long
?
=
null
,
@SerialId
(
3
)
val
uint32DstInstId
:
Long
?
=
null
,
@SerialId
(
4
)
val
uint64DstUin
:
Long
?
=
null
,
@SerialId
(
5
)
val
uint64Sessionid
:
Long
?
=
null
,
@SerialId
(
6
)
val
uint32Size
:
Long
?
=
null
,
@SerialId
(
7
)
val
uint32Index
:
Long
?
=
null
,
@SerialId
(
8
)
val
uint32Type
:
Long
?
=
null
,
@SerialId
(
9
)
val
buf
:
ByteArray
?
=
null
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0x17
(
@SerialId
(
0
)
val
dwOpType
:
Long
?
=
null
,
@SerialId
(
1
)
val
stAddGroup
:
AddGroup
?
=
null
,
@SerialId
(
2
)
val
stDelGroup
:
DelGroup
?
=
null
,
@SerialId
(
3
)
val
stModGroupName
:
ModGroupName
?
=
null
,
@SerialId
(
4
)
val
stModGroupSort
:
ModGroupSort
?
=
null
,
@SerialId
(
5
)
val
stModFriendGroup
:
ModFriendGroup
?
=
null
)
:
JceStruct
@Serializable
internal
class
AddGroup
(
@SerialId
(
0
)
val
dwGroupID
:
Long
?
=
null
,
@SerialId
(
1
)
val
dwSortID
:
Long
?
=
null
,
@SerialId
(
2
)
val
groupName
:
String
?
=
""
)
:
JceStruct
@Serializable
internal
class
DelGroup
(
@SerialId
(
0
)
val
dwGroupID
:
Long
?
=
null
)
:
JceStruct
@Serializable
internal
class
ModFriendGroup
(
@SerialId
(
0
)
val
vMsgFrdGroup
:
List
<
FriendGroup
>?
=
null
)
:
JceStruct
@Serializable
internal
class
FriendGroup
(
@SerialId
(
0
)
val
dwFuin
:
Long
?
=
null
,
@SerialId
(
1
)
val
vOldGroupID
:
List
<
Long
>?
=
null
,
@SerialId
(
2
)
val
vNewGroupID
:
List
<
Long
>?
=
null
)
:
JceStruct
@Serializable
internal
class
ModGroupName
(
@SerialId
(
0
)
val
dwGroupID
:
Long
?
=
null
,
@SerialId
(
1
)
val
groupName
:
String
?
=
""
)
:
JceStruct
@Serializable
internal
class
ModGroupSort
(
@SerialId
(
0
)
val
vMsgGroupSort
:
List
<
GroupSort
>?
=
null
)
:
JceStruct
@Serializable
internal
class
GroupSort
(
@SerialId
(
0
)
val
dwGroupID
:
Long
?
=
null
,
@SerialId
(
1
)
val
dwSortID
:
Long
?
=
null
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0x1d
(
@SerialId
(
0
)
val
dwOpType
:
Long
?
=
null
,
@SerialId
(
1
)
val
dwUin
:
Long
?
=
null
,
@SerialId
(
2
)
val
dwID
:
Long
?
=
null
,
@SerialId
(
3
)
val
value
:
String
?
=
""
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0x2
(
@SerialId
(
0
)
val
uSrcAppId
:
Long
?
=
null
,
@SerialId
(
1
)
val
uSrcInstId
:
Long
?
=
null
,
@SerialId
(
2
)
val
uDstAppId
:
Long
?
=
null
,
@SerialId
(
3
)
val
uDstInstId
:
Long
?
=
null
,
@SerialId
(
4
)
val
uDstUin
:
Long
?
=
null
,
@SerialId
(
5
)
val
fileName
:
ByteArray
?
=
null
,
@SerialId
(
6
)
val
fileIndex
:
ByteArray
?
=
null
,
@SerialId
(
7
)
val
fileMd5
:
ByteArray
?
=
null
,
@SerialId
(
8
)
val
fileKey
:
ByteArray
?
=
null
,
@SerialId
(
9
)
val
uServerIp
:
Long
?
=
null
,
@SerialId
(
10
)
val
uServerPort
:
Long
?
=
null
,
@SerialId
(
11
)
val
fileLen
:
Long
?
=
null
,
@SerialId
(
12
)
val
sessionId
:
Long
?
=
null
,
@SerialId
(
13
)
val
originfileMd5
:
ByteArray
?
=
null
,
@SerialId
(
14
)
val
uOriginfiletype
:
Long
?
=
null
,
@SerialId
(
15
)
val
uSeq
:
Long
?
=
null
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0x20
(
@SerialId
(
0
)
val
dwOpType
:
Long
?
=
null
,
@SerialId
(
1
)
val
dwType
:
Long
?
=
null
,
@SerialId
(
2
)
val
dwUin
:
Long
?
=
null
,
@SerialId
(
3
)
val
remaek
:
String
?
=
""
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0x24
(
@SerialId
(
0
)
val
vPluginNumList
:
List
<
PluginNum
>?
=
null
)
:
JceStruct
@Serializable
internal
class
PluginNum
(
@SerialId
(
0
)
val
dwID
:
Long
?
=
null
,
@SerialId
(
1
)
val
dwNUm
:
Long
?
=
null
,
@SerialId
(
2
)
val
flag
:
Byte
?
=
null
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0xa
(
@SerialId
(
0
)
val
uSrcAppId
:
Long
?
=
null
,
@SerialId
(
1
)
val
uSrcInstId
:
Long
?
=
null
,
@SerialId
(
2
)
val
uDstAppId
:
Long
?
=
null
,
@SerialId
(
3
)
val
uDstInstId
:
Long
?
=
null
,
@SerialId
(
4
)
val
uDstUin
:
Long
?
=
null
,
@SerialId
(
5
)
val
uType
:
Long
?
=
null
,
@SerialId
(
6
)
val
uServerIp
:
Long
?
=
null
,
@SerialId
(
7
)
val
uServerPort
:
Long
?
=
null
,
@SerialId
(
8
)
val
vUrlNotify
:
ByteArray
?
=
null
,
@SerialId
(
9
)
val
vTokenKey
:
ByteArray
?
=
null
,
@SerialId
(
10
)
val
uFileLen
:
Long
?
=
null
,
@SerialId
(
11
)
val
fileName
:
ByteArray
?
=
null
,
@SerialId
(
12
)
val
vMd5
:
ByteArray
?
=
null
,
@SerialId
(
13
)
val
sessionId
:
Long
?
=
null
,
@SerialId
(
14
)
val
originfileMd5
:
ByteArray
?
=
null
,
@SerialId
(
15
)
val
uOriginfiletype
:
Long
?
=
null
,
@SerialId
(
16
)
val
uSeq
:
Long
?
=
null
)
:
JceStruct
@Serializable
internal
class
MsgType0x210SubMsgType0xe
(
@SerialId
(
0
)
val
uint32SrcAppId
:
Long
?
=
null
,
@SerialId
(
1
)
val
uint32SrcInstId
:
Long
?
=
null
,
@SerialId
(
2
)
val
uint32DstAppId
:
Long
?
=
null
,
@SerialId
(
3
)
val
uint32DstInstId
:
Long
?
=
null
,
@SerialId
(
4
)
val
uint64DstUin
:
Long
?
=
null
,
@SerialId
(
5
)
val
uint64Sessionid
:
Long
?
=
null
,
@SerialId
(
6
)
val
uint32Operate
:
Long
?
=
null
,
@SerialId
(
7
)
val
uint32Seq
:
Long
?
=
null
,
@SerialId
(
8
)
val
uint32Code
:
Long
?
=
null
,
@SerialId
(
9
)
val
msg
:
String
?
=
""
)
:
JceStruct
}
}
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View file @
02b4f10e
...
@@ -116,7 +116,6 @@ internal class OnlinePush {
...
@@ -116,7 +116,6 @@ internal class OnlinePush {
debug
+=
" "
+
time
+
"s"
debug
+=
" "
+
time
+
"s"
}
}
}
}
3585
->
{
3585
->
{
val
operatorUin
=
this
.
readUInt
().
toLong
()
val
operatorUin
=
this
.
readUInt
().
toLong
()
debug
+=
" 管理员 $operatorUin"
debug
+=
" 管理员 $operatorUin"
...
@@ -127,7 +126,6 @@ internal class OnlinePush {
...
@@ -127,7 +126,6 @@ internal class OnlinePush {
debug
+=
" 关闭 "
debug
+=
" 关闭 "
}
}
}
}
4096
->
{
4096
->
{
val
dataBytes
=
this
.
readBytes
(
26
)
val
dataBytes
=
this
.
readBytes
(
26
)
val
message
=
this
.
readString
(
this
.
readByte
().
toInt
())
val
message
=
this
.
readString
(
this
.
readByte
().
toInt
())
...
@@ -153,6 +151,10 @@ internal class OnlinePush {
...
@@ -153,6 +151,10 @@ internal class OnlinePush {
println
(
"unknown group internal type $internalType , data: "
+
this
.
readBytes
().
toUHexString
()
+
" "
)
println
(
"unknown group internal type $internalType , data: "
+
this
.
readBytes
().
toUHexString
()
+
" "
)
}
}
}
}
}
else
if
(
msgInfo
.
shMsgType
.
toInt
()
==
528
)
{
}
else
if
(
msgInfo
.
shMsgType
.
toInt
()
==
4352
)
{
}
else
{
}
else
{
println
(
"unknown shtype ${msgInfo.shMsgType.toInt()}"
)
println
(
"unknown shtype ${msgInfo.shMsgType.toInt()}"
)
}
}
...
...
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