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
8a4750ba
Commit
8a4750ba
authored
Feb 14, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix platform implementations
parent
797cef15
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
...ain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
+10
-10
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
...rc/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
+7
-6
No files found.
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
View file @
8a4750ba
...
@@ -16,40 +16,40 @@ import android.util.Log
...
@@ -16,40 +16,40 @@ import android.util.Log
* 不应该直接构造这个类的实例. 需使用 [DefaultLogger]
* 不应该直接构造这个类的实例. 需使用 [DefaultLogger]
*/
*/
actual
open
class
PlatformLogger
actual
constructor
(
override
val
identity
:
String
?)
:
MiraiLoggerPlatformBase
()
{
actual
open
class
PlatformLogger
actual
constructor
(
override
val
identity
:
String
?)
:
MiraiLoggerPlatformBase
()
{
override
fun
verbose0
(
any
:
Any
?)
{
override
fun
verbose0
(
message
:
String
?)
{
Log
.
v
(
identity
,
any
?.
toString
()
?:
""
)
Log
.
v
(
identity
,
message
?:
""
)
}
}
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
{
Log
.
v
(
identity
,
message
?:
""
,
e
)
Log
.
v
(
identity
,
message
?:
""
,
e
)
}
}
override
fun
debug0
(
any
:
Any
?)
{
override
fun
debug0
(
message
:
String
?)
{
Log
.
d
(
identity
,
any
?.
toString
()
?:
""
)
Log
.
d
(
identity
,
message
?:
""
)
}
}
override
fun
debug0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
debug0
(
message
:
String
?,
e
:
Throwable
?)
{
Log
.
d
(
identity
,
message
?:
""
,
e
)
Log
.
d
(
identity
,
message
?:
""
,
e
)
}
}
override
fun
info0
(
any
:
Any
?)
{
override
fun
info0
(
message
:
String
?)
{
Log
.
i
(
identity
,
any
?.
toString
()
?:
""
)
Log
.
i
(
identity
,
message
?:
""
)
}
}
override
fun
info0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
info0
(
message
:
String
?,
e
:
Throwable
?)
{
Log
.
i
(
identity
,
message
?:
""
,
e
)
Log
.
i
(
identity
,
message
?:
""
,
e
)
}
}
override
fun
warning0
(
any
:
Any
?)
{
override
fun
warning0
(
message
:
String
?)
{
Log
.
w
(
identity
,
any
?.
toString
()
?:
""
)
Log
.
w
(
identity
,
message
?:
""
)
}
}
override
fun
warning0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
warning0
(
message
:
String
?,
e
:
Throwable
?)
{
Log
.
w
(
identity
,
message
?:
""
,
e
)
Log
.
w
(
identity
,
message
?:
""
,
e
)
}
}
override
fun
error0
(
any
:
Any
?)
{
override
fun
error0
(
message
:
String
?)
{
Log
.
e
(
identity
,
any
?.
toString
()
?:
""
)
Log
.
e
(
identity
,
message
?:
""
)
}
}
override
fun
error0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
error0
(
message
:
String
?,
e
:
Throwable
?)
{
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
View file @
8a4750ba
...
@@ -18,37 +18,37 @@ import java.util.*
...
@@ -18,37 +18,37 @@ import java.util.*
actual
open
class
PlatformLogger
@JvmOverloads
internal
actual
constructor
(
actual
open
class
PlatformLogger
@JvmOverloads
internal
actual
constructor
(
override
val
identity
:
String
?
override
val
identity
:
String
?
)
:
MiraiLoggerPlatformBase
()
{
)
:
MiraiLoggerPlatformBase
()
{
override
fun
verbose0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
RESET
)
override
fun
verbose0
(
message
:
String
?)
=
println
(
message
,
LoggerTextFormat
.
RESET
)
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
{
if
(
message
!=
null
)
verbose
(
message
.
toString
())
if
(
message
!=
null
)
verbose
(
message
.
toString
())
e
?.
printStackTrace
()
e
?.
printStackTrace
()
}
}
override
fun
info0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
LIGHT_GREEN
)
override
fun
info0
(
message
:
String
?)
=
println
(
message
,
LoggerTextFormat
.
LIGHT_GREEN
)
override
fun
info0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
info0
(
message
:
String
?,
e
:
Throwable
?)
{
if
(
message
!=
null
)
info
(
message
.
toString
())
if
(
message
!=
null
)
info
(
message
.
toString
())
e
?.
printStackTrace
()
e
?.
printStackTrace
()
}
}
override
fun
warning0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
LIGHT_RED
)
override
fun
warning0
(
message
:
String
?)
=
println
(
message
,
LoggerTextFormat
.
LIGHT_RED
)
override
fun
warning0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
warning0
(
message
:
String
?,
e
:
Throwable
?)
{
if
(
message
!=
null
)
warning
(
message
.
toString
())
if
(
message
!=
null
)
warning
(
message
.
toString
())
e
?.
printStackTrace
()
e
?.
printStackTrace
()
}
}
override
fun
error0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
RED
)
override
fun
error0
(
message
:
String
?)
=
println
(
message
,
LoggerTextFormat
.
RED
)
override
fun
error0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
error0
(
message
:
String
?,
e
:
Throwable
?)
{
if
(
message
!=
null
)
error
(
message
.
toString
())
if
(
message
!=
null
)
error
(
message
.
toString
())
e
?.
printStackTrace
()
e
?.
printStackTrace
()
}
}
override
fun
debug0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
LIGHT_CYAN
)
override
fun
debug0
(
message
:
String
?)
=
println
(
message
,
LoggerTextFormat
.
LIGHT_CYAN
)
override
fun
debug0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
debug0
(
message
:
String
?,
e
:
Throwable
?)
{
if
(
message
!=
null
)
debug
(
message
.
toString
())
if
(
message
!=
null
)
debug
(
message
.
toString
())
e
?.
printStackTrace
()
e
?.
printStackTrace
()
}
}
private
fun
println
(
value
:
Any
?,
color
:
LoggerTextFormat
)
{
private
fun
println
(
value
:
String
?,
color
:
LoggerTextFormat
)
{
val
time
=
SimpleDateFormat
(
"HH:mm:ss"
,
Locale
.
SIMPLIFIED_CHINESE
).
format
(
Date
())
val
time
=
SimpleDateFormat
(
"HH:mm:ss"
,
Locale
.
SIMPLIFIED_CHINESE
).
format
(
Date
())
if
(
identity
==
null
)
{
if
(
identity
==
null
)
{
...
@@ -62,6 +62,7 @@ actual open class PlatformLogger @JvmOverloads internal actual constructor(
...
@@ -62,6 +62,7 @@ actual open class PlatformLogger @JvmOverloads internal actual constructor(
/**
/**
* @author NaturalHG
* @author NaturalHG
*/
*/
@Suppress
(
"unused"
)
internal
enum
class
LoggerTextFormat
(
private
val
format
:
String
)
{
internal
enum
class
LoggerTextFormat
(
private
val
format
:
String
)
{
RESET
(
"\u001b[0m"
),
RESET
(
"\u001b[0m"
),
...
...
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