修复了部分系统无法编译插件的问题

Author: mzdluo123

app/build.gradle

@@ -130,10 +130,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.google.android.material:material:1.3.0'
 
-    implementation 'androidx.core:core-ktx:1.5.0-rc01'
+    implementation 'androidx.core:core-ktx:1.6.0-rc01'
 
     //androidx-appcompat
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
 
     //androidx-legacy
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -156,7 +156,7 @@ dependencies {
     implementation 'androidx.preference:preference:1.1.1'
 
     //kotlinx-coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0"
@@ -193,7 +193,7 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
 
     //yaml
-    implementation 'net.mamoe.yamlkt:yamlkt:0.7.5'
+    implementation 'net.mamoe.yamlkt:yamlkt:0.9.0'
     implementation group: 'com.moandjiezana.toml', name: 'toml4j', version: '0.7.2'
 
     //okhttp3
@@ -204,6 +204,9 @@ dependencies {
 
     implementation 'com.fanjun:keeplive:1.1.22'
 
+    implementation group: 'commons-io', name: 'commons-io', version: '2.10.0'
+
+
     // fuck!! 他不能在Android平台工作
     //    implementation  'org.codehaus.groovy:groovy:2.4.6:grooid'
 

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

@@ -68,6 +68,7 @@ class PluginImportActivity : AppCompatActivity() {
                     "无法编译插件 \n${throwable}",
                     Toast.LENGTH_LONG
                 ).show()
+                throwable.printStackTrace()
             }
         }
 
@@ -80,17 +81,20 @@ class PluginImportActivity : AppCompatActivity() {
                     val name = withContext(Dispatchers.Main) {
                         askFileName()
                     } ?: return@launch
+                    // 从contentprovider 读取插件数据到缓存
                     withContext(Dispatchers.IO) {
                         copyToFileDir(
                             uri,
                             name,
                             this@PluginImportActivity.getExternalFilesDir(null)!!.absolutePath
                         )
                     }
+                    // 编译插件
                     pluginViewModel.compilePlugin(
                         File(baseContext.getExternalFilesDir(null), name),
                         desugaring_checkBox.isChecked
                     )
+                    // 删除缓存
                     withContext(Dispatchers.IO) {
                         File(this@PluginImportActivity.getExternalFilesDir(null), name).delete()
                     }

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

@@ -46,6 +46,7 @@ import net.mamoe.mirai.console.rootDir
 import net.mamoe.mirai.event.GlobalEventChannel
 import net.mamoe.mirai.event.events.BotOnlineEvent
 import net.mamoe.mirai.message.data.At
+import net.mamoe.mirai.utils.MiraiLogger
 import java.nio.file.Paths
 import kotlin.system.exitProcess
 
@@ -135,7 +136,12 @@ class BotService : LifecycleService() {
         // 新的自动登录
         //MiraiConsole.addBot().alsoLogin()
 //        GlobalScope.launch(handler) { sendMessage("$qq login successes") }
-        val bot = MiraiConsole.addBot(qq, pwd!!.chunkedHexToBytes())
+        val bot = MiraiConsole.addBot(qq, pwd!!.chunkedHexToBytes(),){
+            if (AppSettings.printToLogcat){
+                this.networkLoggerSupplier =  {MiraiLogger.create("NetLog")}
+            }
+        }
+
         lifecycleScope.launch(Dispatchers.Default + handler) { bot.login() }
     }
 

app/src/main/java/io/github/mzdluo123/mirai/android/ui/plugin/PluginViewModel.kt

@@ -73,6 +73,7 @@ class PluginViewModel : ViewModel() {
             val out = compiler.compile(file, desugaring)
             compiler.copyResourcesAndMove(file, out)
         }
+
     }
 
     private fun deleteDir(path: File) {

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

@@ -10,6 +10,8 @@
 import net.lingala.zip4j.exception.ZipException;
 
 
+import org.apache.commons.io.FileUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -76,6 +78,8 @@ public void copyResourcesAndMove(File origin, File newFile) throws IOException {
             newZip.addFiles(resources);
         }
         newZip.addFolder(new File(tempDir, "META-INF"));
-        newFile.renameTo(new File(pluginDir, newFile.getName()));
+        // 自带的moveto在遇到不同文件系统的时候会失败
+        FileUtils.moveFile(newFile,new File(pluginDir, newFile.getName()));
+
     }
 }