Skip to content
This repository was archived by the owner on Oct 20, 2023. It is now read-only.

Commit 6772391

Browse files
committed
3.3.0
1 parent 29c18e4 commit 6772391

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

app/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ apply plugin: 'kotlinx-serialization'
99
apply plugin: "com.github.johnrengelman.shadow"
1010

1111

12-
def CORE_VERSION = "2.7-RC"
13-
def CONSOLE_VERSION = "2.7-RC"
12+
def CORE_VERSION = "2.7.0"
13+
def CONSOLE_VERSION = "2.7.0"
1414
def LUAMIRAI_VERSION = "2.0.8"
1515

1616

@@ -24,8 +24,8 @@ android {
2424
applicationId "io.github.mzdluo123.mirai.android"
2525
minSdkVersion 26
2626
targetSdkVersion 30
27-
versionCode 56
28-
versionName "3.2.5"
27+
versionCode 57
28+
versionName "3.3.0"
2929
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
buildConfigField("String", "COREVERSION", "\"$CORE_VERSION\"")
3131
buildConfigField("String", "CONSOLEVERSION", "\"$CONSOLE_VERSION\"")
@@ -144,11 +144,11 @@ dependencies {
144144
//androidx-constraintlayout
145145
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
146146

147-
// 下一个mirai版本可以移除
148-
// https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
149-
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15to18', version: '1.69'
147+
// // 下一个mirai版本可以移除
148+
// // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
149+
// implementation group: 'org.bouncycastle', name: 'bcprov-jdk15to18', version: '1.69'
150150

151-
implementation("io.netty:netty-all:4.1.63.Final")
151+
// implementation("io.netty:netty-all:4.1.63.Final")
152152

153153

154154

@@ -180,11 +180,11 @@ dependencies {
180180
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.2'
181181

182182
//mirai-core
183-
// implementation("net.mamoe:mirai-core-android:$CORE_VERSION")
184-
// implementation("net.mamoe:mirai-core-android:$CORE_VERSION") {
185-
// exclude module: "net.mamoe:mirai-core-api"
186-
// exclude module: "net.mamoe:mirai-core-utils"
187-
// }
183+
implementation("net.mamoe:mirai-core-android:$CORE_VERSION")
184+
implementation("net.mamoe:mirai-core-android:$CORE_VERSION") {
185+
exclude module: "net.mamoe:mirai-core-api"
186+
exclude module: "net.mamoe:mirai-core-utils"
187+
}
188188
implementation("net.mamoe:mirai-core-api-android:$CORE_VERSION") {
189189
exclude module: "net.mamoe:mirai-core-utils"
190190
}
-12.6 MB
Binary file not shown.

app/src/main/java/io/github/mzdluo123/mirai/android/ui/console/ConsoleFragment.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,17 @@ class ConsoleFragment : Fragment() {
191191

192192
private fun submitCmd() {
193193
var command = command_input.text.toString()
194-
lifecycleScope.launch(Dispatchers.Default) {
194+
195195
if (!command.startsWith("/")) {
196196
command = "/$command"
197197
}
198198
try {
199-
conn.botService.runCmd(command)
200-
requireActivity().runOnUiThread {
201-
command_input.text.clear()
199+
lifecycleScope.launch(Dispatchers.Default) {
200+
conn.botService.runCmd(command)
202201
}
202+
command_input.text.clear()
203203
} catch (e: DeadObjectException) {
204204
toast("服务状态异常,请在菜单内点击快速重启")
205-
}
206205
}
207206

208207
}

0 commit comments

Comments
 (0)