3.0.0 dev2

Author: mzdluo123

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "io.github.mzdluo123.mirai.android"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 32
-        versionName "3.0.0 dev"
+        versionCode 33
+        versionName "3.0.0 dev2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "COREVERSION", "\"$CORE_VERSION\"")
         buildConfigField("String", "CONSOLEVERSION", "\"$CONSOLE_VERSION\"")

app/src/main/java/io/github/mzdluo123/mirai/android/miraiconsole/AndroidStatusCommand.kt

@@ -0,0 +1,19 @@
+package io.github.mzdluo123.mirai.android.miraiconsole
+
+import io.github.mzdluo123.mirai.android.utils.MiraiAndroidStatus
+import net.mamoe.mirai.console.command.CommandSender
+import net.mamoe.mirai.console.command.ConsoleCommandOwner
+import net.mamoe.mirai.console.command.SimpleCommand
+
+object AndroidStatusCommand : SimpleCommand(
+    ConsoleCommandOwner,
+    "androidstatus",
+    "astatus",
+    description = "查询MiraiAndroid状态信息"
+) {
+    @Handler
+    suspend fun CommandSender.handle() {
+        sendMessage(MiraiAndroidStatus.recentStatus().format())
+
+    }
+}

app/src/main/java/io/github/mzdluo123/mirai/android/service/BotService.kt

@@ -23,6 +23,7 @@ import io.github.mzdluo123.mirai.android.AppSettings
 import io.github.mzdluo123.mirai.android.IbotAidlInterface
 import io.github.mzdluo123.mirai.android.NotificationFactory
 import io.github.mzdluo123.mirai.android.miraiconsole.AndroidMiraiConsole
+import io.github.mzdluo123.mirai.android.miraiconsole.AndroidStatusCommand
 import io.github.mzdluo123.mirai.android.miraiconsole.MiraiAndroidLogger
 import io.github.mzdluo123.mirai.android.receiver.PushMsgReceiver
 import io.github.mzdluo123.mirai.android.script.ScriptManager
@@ -35,6 +36,7 @@ import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.ConsoleFrontEndImplementation
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.MiraiConsoleImplementation.Companion.start
+import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.command.ConsoleCommandSender
 import net.mamoe.mirai.console.command.executeCommand
 import net.mamoe.mirai.console.rootDir
@@ -132,6 +134,7 @@ class BotService : Service() {
     }
 
     private fun registerDefaultCommand() {
+        AndroidStatusCommand.register()
 //        register(_description = "显示MiraiAndroid运行状态", _name = "android") { sender, _ ->
 //            sender.sendMessage(MiraiAndroidStatus.recentStatus().format())
 //            true

app/src/main/java/io/github/mzdluo123/mirai/android/utils/CommandFastRegister.kt

@@ -8,16 +8,16 @@ import io.github.mzdluo123.mirai.android.BuildConfig
 import splitties.experimental.ExperimentalSplittiesApi
 import java.text.SimpleDateFormat
 
-class MiraiAndroidStatus (
-    var miraiAndroidVersion:String,
-    var coreVersion:String,
-    var luaMiraiVersion:String,
-    var releaseVersion:String,
-    var sdkVersion:Int,
-    var memorySize:String,
-    var netType:String,
-    var startTime:String,
-    var logBuffer:Int
+class MiraiAndroidStatus(
+    var miraiAndroidVersion: String,
+    var coreVersion: String,
+    var miraiConsoleVersion: String,
+    var releaseVersion: String,
+    var sdkVersion: Int,
+    var memorySize: String,
+    var netType: String,
+    var startTime: String,
+    var logBuffer: Int
 ) {
     @ExperimentalSplittiesApi
     @ExperimentalUnsignedTypes
@@ -27,7 +27,7 @@ class MiraiAndroidStatus (
             MiraiAndroidStatus(
                 context.packageManager.getPackageInfo(context.packageName, 0).versionName,
                 BuildConfig.COREVERSION,
-                BuildConfig.LUAMIRAI_VERSION,
+                BuildConfig.CONSOLEVERSION,
                 Build.VERSION.RELEASE,
                 Build.VERSION.SDK_INT,
                 DeviceStatus.getSystemAvaialbeMemorySize(context.applicationContext),
@@ -46,8 +46,8 @@ class MiraiAndroidStatus (
         append(coreVersion)
         append("\n")
 
-        append("LuaMirai v")
-        append(luaMiraiVersion)
+        append("MiraiConsole v")
+        append(miraiConsoleVersion)
         append("\n")
 
         append("系统版本 ")