github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-06 09:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix platform implementations

Browse Source
This commit is contained in:
Him188 2020-02-14 22:05:59 +08:00
parent 797cef15e2
commit 8a4750badb
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
View File

@ -16,40 +16,40 @@ import android.util.Log
* 不应该直接构造这个类的实例. 需使用 [DefaultLogger]
*/
actual open class PlatformLogger actual constructor(override val identity: String?) : MiraiLoggerPlatformBase() {
override fun verbose0(any: Any?) {
Log.v(identity, any?.toString() ?: "")
override fun verbose0(message: String?) {
Log.v(identity, message ?: "")
}
override fun verbose0(message: String?, e: Throwable?) {
Log.v(identity, message ?: "", e)
}
override fun debug0(any: Any?) {
Log.d(identity, any?.toString() ?: "")
override fun debug0(message: String?) {
Log.d(identity, message ?: "")
}
override fun debug0(message: String?, e: Throwable?) {
Log.d(identity, message ?: "", e)
}
override fun info0(any: Any?) {
Log.i(identity, any?.toString() ?: "")
override fun info0(message: String?) {
Log.i(identity, message ?: "")
}
override fun info0(message: String?, e: Throwable?) {
Log.i(identity, message ?: "", e)
}
override fun warning0(any: Any?) {
Log.w(identity, any?.toString() ?: "")
override fun warning0(message: String?) {
Log.w(identity, message ?: "")
}
override fun warning0(message: String?, e: Throwable?) {
Log.w(identity, message ?: "", e)
}
override fun error0(any: Any?) {
Log.e(identity, any?.toString() ?: "")
override fun error0(message: String?) {
Log.e(identity, message ?: "")
}
override fun error0(message: String?, e: Throwable?) {

13
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
View File

@ -18,37 +18,37 @@ import java.util.*
actual open class PlatformLogger @JvmOverloads internal actual constructor(
override val identity: String?
) : 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?) {
if (message != null) verbose(message.toString())
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?) {
if (message != null) info(message.toString())
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?) {
if (message != null) warning(message.toString())
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?) {
if (message != null) error(message.toString())
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?) {
if (message != null) debug(message.toString())
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())
if (identity == null) {
@ -62,6 +62,7 @@ actual open class PlatformLogger @JvmOverloads internal actual constructor(
/**
* @author NaturalHG
*/
@Suppress("unused")
internal enum class LoggerTextFormat(private val format: String) {
RESET("\u001b[0m"),