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

Add @SinceMirai for MiraiProtocol

Browse Source
This commit is contained in:
Him188 2020-07-09 01:13:41 +08:00
parent 486a0dc5cb
commit 46af55fcdf
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
View File

@ -52,26 +52,24 @@ expect open class BotConfiguration() : BotConfigurationBase {
@ConfigurationDsl @ConfigurationDsl
fun randomDeviceInfo() fun randomDeviceInfo()
/**
* 协议类型, 服务器仅允许使用不同协议同时登录.
*/
enum class MiraiProtocol { enum class MiraiProtocol {
/** /**
* Android 手机. * Android 手机.
*
* - 与手机冲突
* - 与平板和电脑不冲突
*/ */
ANDROID_PHONE, ANDROID_PHONE,
/** /**
* Android 平板. * Android 平板.
*
* - 与平板冲突
* - 与手机和电脑不冲突
*/ */
ANDROID_PAD, ANDROID_PAD,
/** /**
* Android 手表. * Android 手表.
* */ * */
@SinceMirai("1.1.0")
ANDROID_WATCH; ANDROID_WATCH;

7
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
View File

@ -134,23 +134,18 @@ actual open class BotConfiguration : BotConfigurationBase() { // open for Java
) { ) {
/** /**
* Android 手机. * Android 手机.
*
* - 与手机冲突
* - 与平板和电脑不冲突
*/ */
ANDROID_PHONE(537062845), ANDROID_PHONE(537062845),
/** /**
* Android 平板. * Android 平板.
*
* - 与平板冲突
* - 与手机和电脑不冲突
*/ */
ANDROID_PAD(537062409), ANDROID_PAD(537062409),
/** /**
* Android 手表. * Android 手表.
* */ * */
@SinceMirai("1.1.0")
ANDROID_WATCH(537061176) ANDROID_WATCH(537061176)
} }