3.2.4

Author: mzdluo123

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "io.github.mzdluo123.mirai.android"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 54
-        versionName "3.2.3"
+        versionCode 55
+        versionName "3.2.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "COREVERSION", "\"$CORE_VERSION\"")
         buildConfigField("String", "CONSOLEVERSION", "\"$CONSOLE_VERSION\"")
@@ -141,9 +141,13 @@ dependencies {
     //androidx-constraintlayout
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 
-//    // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
-//    implementation group: 'org.bouncycastle', name: 'bcprov-jdk15to18', version: '1.69'
-//
+    // 下一个mirai版本可以移除
+    // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
+    implementation group: 'org.bouncycastle', name: 'bcprov-jdk15to18', version: '1.69'
+
+    implementation("io.netty:netty-all:4.1.63.Final")
+
+
 
     //androidx-navigation
     implementation 'androidx.navigation:navigation-fragment:2.3.5'
@@ -174,10 +178,10 @@ dependencies {
 
     //mirai-core
 //    implementation("net.mamoe:mirai-core-android:$CORE_VERSION")
-    implementation("net.mamoe:mirai-core-android:$CORE_VERSION") {
-        exclude module: "net.mamoe:mirai-core-api"
-        exclude module: "net.mamoe:mirai-core-utils"
-    }
+//    implementation("net.mamoe:mirai-core-android:$CORE_VERSION") {
+//        exclude module: "net.mamoe:mirai-core-api"
+//        exclude module: "net.mamoe:mirai-core-utils"
+//    }
     implementation("net.mamoe:mirai-core-api-android:$CORE_VERSION") {
         exclude module: "net.mamoe:mirai-core-utils"
     }

app/libs/mirai-core-android-2.7-RC.jar

@@ -36,7 +36,6 @@ class BotApplication : Application() {
         super.onCreate()
         injectAsAppCtx()
         context = this
-        byPassECDHCHeck()
         val processName = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
             getProcessName()
         else
@@ -48,19 +47,6 @@ class BotApplication : Application() {
         }
     }
 
-    /**
-     * 在新版系统上无法使用ECDH算法，使用下面的代码绕过
-     * */
-    private fun byPassECDHCHeck() {
-        try {
-            val cls = Class.forName("sun.security.jca.Providers")
-            val field = cls.getDeclaredField("maximumAllowableApiLevelForBcDeprecation")
-            field.isAccessible = true
-            field.setInt(null, 999)
-        }
-        catch(e : Exception) {}
-    }
-
 
     //崩溃事件注册
     override fun attachBaseContext(base: Context?) {

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

@@ -27,8 +27,11 @@ import net.mamoe.mirai.console.MiraiConsoleFrontEndDescription
 import net.mamoe.mirai.console.MiraiConsoleImplementation
 import net.mamoe.mirai.console.data.MultiFilePluginDataStorage
 import net.mamoe.mirai.console.data.PluginDataStorage
+import net.mamoe.mirai.console.internal.logging.LoggerControllerImpl
+import net.mamoe.mirai.console.logging.LoggerController
 import net.mamoe.mirai.console.plugin.loader.PluginLoader
 import net.mamoe.mirai.console.util.ConsoleInput
+import net.mamoe.mirai.console.util.ConsoleInternalApi
 import net.mamoe.mirai.console.util.NamedSupervisorJob
 import net.mamoe.mirai.console.util.SemVersion
 import net.mamoe.mirai.event.events.BotOfflineEvent
@@ -39,6 +42,7 @@ import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.utils.BotConfiguration
 import net.mamoe.mirai.utils.LoginSolver
 import net.mamoe.mirai.utils.MiraiLogger
+import net.mamoe.mirai.utils.SimpleLogger
 import java.nio.file.Path
 import java.nio.file.Paths
 
@@ -88,6 +92,8 @@ class AndroidMiraiConsole(
     @ConsoleFrontEndImplementation
     override val consoleCommandSender: MiraiConsoleImplementation.ConsoleCommandSenderImpl =
         AndroidConsoleCommandSenderImpl
+
+    @ConsoleFrontEndImplementation
     override val consoleInput: ConsoleInput
         get() = AndroidConsoleInput
 
@@ -108,6 +114,22 @@ class AndroidMiraiConsole(
     override val configStorageForBuiltIns: PluginDataStorage =
         MultiFilePluginDataStorage(rootPath.resolve("config"))
 
+    @ConsoleInternalApi
+    @ConsoleFrontEndImplementation
+    override val loggerController: LoggerController
+        get() = if (AppSettings.printToLogcat) { // 显示所有级别的日志
+            object : LoggerController {
+                override fun shouldLog(
+                    identity: String?,
+                    priority: SimpleLogger.LogPriority
+                ): Boolean {
+                    return true
+                }
+            }
+        } else {
+            LoggerControllerImpl
+        }
+
     fun afterBotLogin(bot: Bot) {
         startRefreshNotificationJob(bot)
         bot.eventChannel.subscribeAlways<BotOfflineEvent>() {
@@ -189,6 +211,7 @@ object AndroidConsoleFrontEndDescImpl : MiraiConsoleFrontEndDescription {
     override val version: SemVersion = SemVersion(BuildConfig.VERSION_NAME)
 }
 
+
 @ConsoleFrontEndImplementation
 object AndroidConsoleCommandSenderImpl : MiraiConsoleImplementation.ConsoleCommandSenderImpl {
 

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

@@ -120,6 +120,9 @@ class BotService : LifecycleService() {
             Debug.waitForDebugger()
         }
 
+        if (AppSettings.printToLogcat) {
+
+        }
         //powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
 //        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "BotWakeLock")
     }

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

@@ -17,8 +17,8 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_local_printshop_24"
             android:key="print_to_logcat_preference"
-            android:summary="你可以使用 TAG: MA 级别:INFO 来看到log"
-            android:title="打印日志到logcat" />
+            android:summary="该选项会覆盖配置文件，同时会打印日志到logcat。你可以使用 TAG: MA 级别:INFO 来看到log"
+            android:title="显示调试日志" />
 
 
     </PreferenceCategory>

app/src/main/res/xml/setting_screen.xml

@@ -1,3 +1,3 @@
-3.2.3
+3.2.4
 https://maupdate.rainchan.win/app-normal-release.apk
-紧急修复在某些设备上启动白屏的问题
+修复了在大部分设备上无法正常登录的问题