Skip to content

Commit faea61c

Browse files
committed
兼容Android
1 parent 1d16303 commit faea61c

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed

src/main/java/cn/kloping/lsys/PluginMain.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package cn.kloping.lsys
33
import cn.kloping.lsys.Resource.conf
44
import cn.kloping.lsys.Resource.i1
55
import cn.kloping.lsys.utils.toText
6+
import net.mamoe.mirai.console.ConsoleFrontEndImplementation
7+
import net.mamoe.mirai.console.MiraiConsoleImplementation
68
import net.mamoe.mirai.console.command.CommandManager
79
import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescriptionBuilder
810
import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
@@ -19,16 +21,19 @@ import kotlin.coroutines.CoroutineContext
1921
class PluginMain : KotlinPlugin {
2022

2123
constructor() : super(
22-
JvmPluginDescriptionBuilder("cn.kloping.Lsys", "0.2")
24+
JvmPluginDescriptionBuilder("cn.kloping.Lsys", "0.2.2")
2325
.name("插件_ Author => HRS LSys Loaded")
2426
.info("插件")
2527
.author("HRS")
2628
.build().apply {
2729
}
2830
)
2931

32+
@OptIn(ConsoleFrontEndImplementation::class)
3033
override fun onEnable() {
3134
logger.info("HRS's LSys Plugin loaded! @作者:qq-3474006766")
35+
Resource.rootPath = MiraiConsoleImplementation.getInstance().rootPath.toFile().absolutePath
36+
// if (Resource.rootPath.startsWith("/storage/emulated/0/Android")) Resource.rootPath = "/sdcard";
3237
i1();
3338
CommandManager.registerCommand(CommandLine.INSTANCE)
3439
GlobalEventChannel.registerListenerHost(object : SimpleListenerHost() {

src/main/java/cn/kloping/lsys/Resource.kt

+17-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import cn.kloping.initialize.FileInitializeValue
44
import cn.kloping.lsys.entitys.Conf
55
import cn.kloping.lsys.entitys.InvokeGroup
66
import cn.kloping.lsys.workers.Methods
7+
import net.mamoe.mirai.console.ConsoleFrontEndImplementation
78
import java.io.File
89
import java.util.concurrent.ConcurrentHashMap
910

@@ -48,18 +49,26 @@ object Resource {
4849
val invokeGroupMap = ConcurrentHashMap<String, InvokeGroup>().apply {
4950
put(invokeGroup.id, invokeGroup)
5051
}
51-
conf = Conf("./data/LSys", -1, arrayOf(-1), invokeGroupMap, false)
52+
conf = Conf("$rootPath/data/LSys", -1, arrayOf(-1), invokeGroupMap, false)
5253
}
5354

55+
@JvmField
56+
var rootPath = "."
57+
58+
@OptIn(ConsoleFrontEndImplementation::class)
5459
@JvmStatic
5560
fun i1() {
56-
if (!File("./conf/LSys/conf.json").exists()) before()
57-
else conf = FileInitializeValue.getValue("./conf/LSys/conf.json", conf, true);
61+
if (!File("$rootPath/", "conf/LSys/conf.json").exists()) {
62+
File("$rootPath/", "conf/LSys/conf.json").parentFile.mkdirs()
63+
File("$rootPath/", "conf/LSys/conf.json").createNewFile()
64+
before()
65+
} else conf = FileInitializeValue.getValue(
66+
File("$rootPath/", "conf/LSys/conf.json").absolutePath, conf, true
67+
)
5868
for (r in loadConfAfter) r.run()
59-
conf.let {
60-
it.load()
61-
it.apply()
62-
Methods.init()
63-
}
69+
conf.load()
70+
conf.apply()
71+
Methods.init()
72+
PluginMain.INSTANCE.logger.info("Lsys-工作目录: $rootPath")
6473
}
6574
}

src/main/java/cn/kloping/lsys/entitys/Conf.kt

+14-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package cn.kloping.lsys.entitys
22

33
import cn.kloping.initialize.FileInitializeValue
44
import cn.kloping.lsys.Resource
5+
import cn.kloping.lsys.Resource.rootPath
56
import com.alibaba.fastjson.annotation.JSONField
7+
import java.io.File
68
import java.util.concurrent.ConcurrentHashMap
79

810
data class Conf(
@@ -28,6 +30,10 @@ data class Conf(
2830
}
2931
}
3032

33+
override fun apply() {
34+
FileInitializeValue.putValues(File("$rootPath/", "conf/LSys/conf.json").absolutePath, Resource.conf, true)
35+
}
36+
3137
override fun equals(other: Any?): Boolean {
3238
if (this === other) return true
3339
if (javaClass != other?.javaClass) return false
@@ -37,6 +43,10 @@ data class Conf(
3743
if (path != other.path) return false
3844
if (qq != other.qq) return false
3945
if (!opens.contentEquals(other.opens)) return false
46+
if (invokeGroups != other.invokeGroups) return false
47+
if (prK != other.prK) return false
48+
if (invokes != other.invokes) return false
49+
if (invokesAfter != other.invokesAfter) return false
4050

4151
return true
4252
}
@@ -45,10 +55,10 @@ data class Conf(
4555
var result = path.hashCode()
4656
result = 31 * result + qq.hashCode()
4757
result = 31 * result + opens.contentHashCode()
58+
result = 31 * result + invokeGroups.hashCode()
59+
result = 31 * result + prK.hashCode()
60+
result = 31 * result + invokes.hashCode()
61+
result = 31 * result + invokesAfter.hashCode()
4862
return result
4963
}
50-
51-
override fun apply() {
52-
FileInitializeValue.putValues("./conf/LSys/conf.json", Resource.conf, true)
53-
}
5464
}

0 commit comments

Comments
 (0)