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
3b16f0a2
Commit
3b16f0a2
authored
Mar 05, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings
parent
b0abd0df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/JceNew.kt
...tlin/net/mamoe/mirai/qqandroid/io/serialization/JceNew.kt
+2
-2
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/ExternalImageAndroid.kt
...Main/kotlin/net/mamoe/mirai/utils/ExternalImageAndroid.kt
+2
-1
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/SystemDeviceInfo.kt
...roidMain/kotlin/net/mamoe/mirai/utils/SystemDeviceInfo.kt
+8
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
.../commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
+2
-0
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/JceNew.kt
View file @
3b16f0a2
...
@@ -191,12 +191,12 @@ private class JceInput(
...
@@ -191,12 +191,12 @@ private class JceInput(
/**
/**
* 跳过 [JceHead] 和对应的数据值, 直到找到 [tag], 否则抛出异常
* 跳过 [JceHead] 和对应的数据值, 直到找到 [tag], 否则抛出异常
*/
*/
inline
fun
<
R
>
skipToTagAndUseIfPossibleOrFail
(
inline
fun
<
R
:
Any
>
skipToTagAndUseIfPossibleOrFail
(
tag
:
Int
,
tag
:
Int
,
crossinline
message
:
()
->
String
=
{
"tag not found: $tag"
},
crossinline
message
:
()
->
String
=
{
"tag not found: $tag"
},
crossinline
block
:
(
JceHead
)
->
R
crossinline
block
:
(
JceHead
)
->
R
):
R
{
):
R
{
return
checkNotNull
(
skipToTagAndUseIfPossibleOrNull
(
tag
,
block
),
message
)
return
checkNotNull
<
R
>
(
skipToTagAndUseIfPossibleOrNull
(
tag
,
block
),
message
)
}
}
tailrec
fun
skipToHeadOrNull
(
tag
:
Int
):
JceHead
?
{
tailrec
fun
skipToHeadOrNull
(
tag
:
Int
):
JceHead
?
{
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/ExternalImageAndroid.kt
View file @
3b16f0a2
...
@@ -30,8 +30,9 @@ import java.net.URL
...
@@ -30,8 +30,9 @@ import java.net.URL
/**
/**
* 读取 [B
ufferedImage
] 的属性, 然后构造 [ExternalImage]
* 读取 [B
itmap
] 的属性, 然后构造 [ExternalImage]
*/
*/
@Suppress
(
"UNUSED_PARAMETER"
)
@Throws
(
IOException
::
class
)
@Throws
(
IOException
::
class
)
fun
Bitmap
.
toExternalImage
(
formatName
:
String
=
"gif"
):
Nothing
{
fun
Bitmap
.
toExternalImage
(
formatName
:
String
=
"gif"
):
Nothing
{
TODO
()
TODO
()
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/SystemDeviceInfo.kt
View file @
3b16f0a2
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
*/
@
file
:
Suppress
(
"unused"
)
package
net.mamoe.mirai.utils
package
net.mamoe.mirai.utils
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
...
@@ -18,6 +20,7 @@ import kotlinx.serialization.Serializable
...
@@ -18,6 +20,7 @@ import kotlinx.serialization.Serializable
import
kotlinx.serialization.Transient
import
kotlinx.serialization.Transient
import
kotlinx.serialization.UnstableDefault
import
kotlinx.serialization.UnstableDefault
import
kotlinx.serialization.json.Json
import
kotlinx.serialization.json.Json
import
kotlinx.serialization.json.JsonConfiguration
import
java.io.File
import
java.io.File
/**
/**
...
@@ -27,14 +30,17 @@ import java.io.File
...
@@ -27,14 +30,17 @@ import java.io.File
fun
File
.
loadAsDeviceInfo
(
context
:
Context
):
DeviceInfo
{
fun
File
.
loadAsDeviceInfo
(
context
:
Context
):
DeviceInfo
{
if
(!
this
.
exists
()
||
this
.
length
()
==
0L
)
{
if
(!
this
.
exists
()
||
this
.
length
()
==
0L
)
{
return
SystemDeviceInfo
(
context
).
also
{
return
SystemDeviceInfo
(
context
).
also
{
this
.
writeText
(
J
son
.
plain
.
stringify
(
SystemDeviceInfo
.
serializer
(),
it
))
this
.
writeText
(
J
SON
.
stringify
(
SystemDeviceInfo
.
serializer
(),
it
))
}
}
}
}
return
J
son
.
nonstrict
.
parse
(
DeviceInfoData
.
serializer
(),
this
.
readText
()).
also
{
return
J
SON
.
parse
(
DeviceInfoData
.
serializer
(),
this
.
readText
()).
also
{
it
.
context
=
context
it
.
context
=
context
}
}
}
}
@OptIn
(
UnstableDefault
::
class
)
private
val
JSON
=
Json
(
JsonConfiguration
.
Default
)
/**
/**
* 部分引用指向 [Build].
* 部分引用指向 [Build].
* 部分需要权限, 若无权限则会使用默认值.
* 部分需要权限, 若无权限则会使用默认值.
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
View file @
3b16f0a2
...
@@ -15,6 +15,7 @@ import io.ktor.utils.io.ByteReadChannel
...
@@ -15,6 +15,7 @@ import io.ktor.utils.io.ByteReadChannel
import
io.ktor.utils.io.core.ByteReadPacket
import
io.ktor.utils.io.core.ByteReadPacket
import
io.ktor.utils.io.core.Input
import
io.ktor.utils.io.core.Input
import
kotlinx.io.InputStream
import
kotlinx.io.InputStream
import
kotlinx.serialization.InternalSerializationApi
import
net.mamoe.mirai.contact.Contact
import
net.mamoe.mirai.contact.Contact
import
net.mamoe.mirai.contact.Group
import
net.mamoe.mirai.contact.Group
import
net.mamoe.mirai.contact.QQ
import
net.mamoe.mirai.contact.QQ
...
@@ -69,6 +70,7 @@ class ExternalImage private constructor(
...
@@ -69,6 +70,7 @@ class ExternalImage private constructor(
filename
:
String
filename
:
String
)
:
this
(
width
,
height
,
md5
,
imageFormat
,
input
as
Any
,
input
.
remaining
,
filename
)
)
:
this
(
width
,
height
,
md5
,
imageFormat
,
input
as
Any
,
input
.
remaining
,
filename
)
@OptIn
(
InternalSerializationApi
::
class
)
constructor
(
constructor
(
width
:
Int
,
width
:
Int
,
height
:
Int
,
height
:
Int
,
...
...
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