From eb311da65ebd8e33d86f26cfce61bf31ef4438bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=8C=E5=A0=86=E5=B0=8F=E9=80=8F=E6=98=8E?= <841474544@qq.com> Date: Fri, 25 Feb 2022 22:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E8=87=B31.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新上游blockmiui,修复重启菜单显示异常 --- app/build.gradle.kts | 4 +- .../activity/SettingsActivity.kt | 80 ++++++++++--------- blockmiui | 2 +- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 38681779..65994dfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.lt2333.simplicitytools" minSdk = 31 targetSdk = 32 - versionCode = 21 - versionName = "1.2.0" + versionCode = 22 + versionName = "1.2.1" } buildTypes { diff --git a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt index 46e864b6..f410cddb 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt @@ -407,42 +407,50 @@ class SettingsActivity : MIUIActivity() { override fun menuItems(): ArrayList { return ArrayList().apply { - add(TextSummaryV(textId = R.string.reboot, onClickListener = { - MIUIDialog(activity).apply { - setTitle(R.string.Tips) - setMessage("确定重启系统?") - setLButton("取消") { - dismiss() - } - setRButton("确定") { - val command = arrayOf("reboot") - ShellUtils.execCommand(command, true) - dismiss() - } - show() - } - })) - add(TextSummaryV(textId = R.string.reboot_host, onClickListener = { - MIUIDialog(activity).apply { - setTitle(R.string.Tips) - setMessage("确定重启作用域?") - setLButton("取消") { - dismiss() - } - setRButton("确定") { - val command = arrayOf( - "killall com.miui.home", - "killall com.miui.securitycenter ", - "killall com.miui.powerkeeper", - "killall com.miui.mediaeditor", - "killall com.android.systemui" - ) - ShellUtils.execCommand(command, true) - dismiss() - } - show() - } - })) + add( + TextSummaryArrowV( + TextSummaryV(textId = R.string.reboot, onClickListener = { + MIUIDialog(activity).apply { + setTitle(R.string.Tips) + setMessage("确定重启系统?") + setLButton("取消") { + dismiss() + } + setRButton("确定") { + val command = arrayOf("reboot") + ShellUtils.execCommand(command, true) + dismiss() + } + show() + } + }) + ) + ) + add( + TextSummaryArrowV( + TextSummaryV(textId = R.string.reboot_host, onClickListener = { + MIUIDialog(activity).apply { + setTitle(R.string.Tips) + setMessage("确定重启作用域?") + setLButton("取消") { + dismiss() + } + setRButton("确定") { + val command = arrayOf( + "killall com.miui.home", + "killall com.miui.securitycenter ", + "killall com.miui.powerkeeper", + "killall com.miui.mediaeditor", + "killall com.android.systemui" + ) + ShellUtils.execCommand(command, true) + dismiss() + } + show() + } + }) + ) + ) } } diff --git a/blockmiui b/blockmiui index fc5dbede..ccbbe658 160000 --- a/blockmiui +++ b/blockmiui @@ -1 +1 @@ -Subproject commit fc5dbedeb83fbc3bfe35c18fa7f1e53134c014ad +Subproject commit ccbbe65867fc8cc893f453af89d0953e48e93349