Skip to content

Commit

Permalink
opt: 优化状态栏时钟显示逻辑
Browse files Browse the repository at this point in the history
  • Loading branch information
@lingqiqi5211
lingqiqi5211 committed Jan 24, 2025
1 parent 320e083 commit 538acbb
Show file tree
Hide file tree
Showing 17 changed files with 103 additions and 560 deletions.
114 changes: 0 additions & 114 deletions app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/BatteryIndicator.java
View file

This file was deleted.

100 changes: 52 additions & 48 deletions ...n/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/clock/StatusBarClockNew.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,51 @@ object StatusBarClockNew : BaseHook() {
}

// 时钟格式
private val getFormatS = mPrefsMap.getString("system_ui_statusbar_clock_editor_s", "HH:mm")
private val getFormatN = mPrefsMap.getString("system_ui_statusbar_clock_editor_n", "")
private val getFormatS by lazy {
mPrefsMap.getString("system_ui_statusbar_clock_editor_s", "HH:mm")
}
private val getFormatB by lazy {
mPrefsMap.getString("system_ui_statusbar_clock_editor_b", "HH:mm")
}
private val getFormatN by lazy {
mPrefsMap.getString("system_ui_statusbar_clock_editor_n", "")
}
private val getClockStyle by lazy {
mPrefsMap.getStringAsInt("system_ui_statusbar_clock_style", 0)
}

private val safeFormatS by lazy {
safeSplitFirst(getFormatS)
}
private val safeFormatB by lazy {
safeSplitFirst(getFormatB)
}
private val safeFormatN by lazy {
safeSplitFirst(getFormatN)
}
private val sClockName by lazy {
if (getFormatN.isNullOrEmpty()) {
when (getClockStyle) {
0 -> safeFormatS
1 -> "$safeFormatS\nM/d E"
else -> "M/d E\n$safeFormatS"
}
} else {
when (getClockStyle) {
0 -> safeFormatS
1 -> "$safeFormatS\n$safeFormatN"
else -> "$safeFormatN\n$safeFormatS"
}
}
}

override fun init() {
statusBarClass.constructorFinder()
.filterByParamCount(3)
.filterByParamTypes {
it[0] == Context::class.java
}.first().createAfterHook {
try {
runCatching {
val miuiClock = it.thisObject as TextView
val miuiClockName = miuiClock.resources.getResourceEntryName(miuiClock.id)
?: return@createAfterHook
Expand Down Expand Up @@ -148,7 +180,6 @@ object StatusBarClockNew : BaseHook() {

Timer().schedule(timerTask, 1000 - System.currentTimeMillis() % 1000, 1000)
}
} catch (_: Exception) {
}
}

Expand All @@ -160,32 +191,29 @@ object StatusBarClockNew : BaseHook() {
notificationHeaderExpandController!!.callMethod("updateWeight", 0.3f)
}
} else if (isHyperOSVersion(1f)) {
try {
runCatching {
loadClassOrNull("com.android.systemui.statusbar.policy.FakeStatusBarClockController")!!
.methodFinder().filterByName("initState")
.first().createHook {
replace { null }
}
} catch (_: Throwable) {
}
}

// 设置格式
statusBarClass.methodFinder()
.filterByName("updateTime")
.single().createBeforeHook {
try {
runCatching {
applyMiuiClockStyleAndFormat(it)
} catch (_: Exception) {
}
}

mNewClockClass.methodFinder()
.filterByName("updateTime")
.single().createBeforeHook {
try {
runCatching {
applyMiuiClockStyleAndFormat(it)
} catch (_: Exception) {
}
}
}
Expand All @@ -198,17 +226,13 @@ object StatusBarClockNew : BaseHook() {
if (miuiClockName in setOf("clock", "big_time", "date_time")) {
setMiuiClockStyle(miuiClockName, textV)

if (shouldSkipHook(isSync, miuiClockName, getFormatN)) return
if (getFormatN.isEmpty() && miuiClockName == "date_time") return

setMiuiClockFormat(context, miuiClockName, textV)
hook.result = null
}
}

private fun shouldSkipHook(isSync: Boolean, miuiClockName: String, formatN: String): Boolean {
return (isSync && miuiClockName == "big_time") || (formatN.isEmpty() && miuiClockName == "date_time")
}

private fun setMiuiClockStyle(name: String, text: TextView) {
// 时钟加粗
if (clockBold && (name == "clock" || (name == "big_time" && isBold && !isMoreHyperOSVersion(2f)))) {
Expand Down Expand Up @@ -283,28 +307,23 @@ object StatusBarClockNew : BaseHook() {
id.setPaddingRelative(left, topMargin, right, 0)
}

private fun setMiuiClockFormat(context: Context?, name: String, textV: TextView) {
private fun setMiuiClockFormat(context: Context?, name: String, textV: TextView?) {
if (context == null || textV == null) return

val mMiuiStatusBarClockController =
textV.getObjectField("mMiuiStatusBarClockController")
val mCalendar =
mMiuiStatusBarClockController?.getObjectField("mCalendar")
if (mCalendar == null) return
val sClockName = buildFormatString(getFormatS, getFormatN, getClockStyle)
textV.getObjectField("mMiuiStatusBarClockController")
?.getObjectField("mCalendar") ?: return

val (textSb, formatSb) = when (name) {
"clock" -> {
val baseFormat = StringBuilder(sClockName)
Pair(StringBuilder(), baseFormat)
}
"big_time" -> {
val baseFormat = StringBuilder(safeSplitFirst(getFormatS))
Pair(StringBuilder(), baseFormat)
}
else -> {
val baseFormat = StringBuilder(safeSplitFirst(getFormatN))
Pair(StringBuilder(), baseFormat)
}
"clock" -> Pair(StringBuilder(), StringBuilder(sClockName))

"big_time" -> Pair(
StringBuilder(),
if (isSync) StringBuilder(safeFormatB)
else StringBuilder(safeFormatS)
)

else -> Pair(StringBuilder(), StringBuilder(safeFormatN))
}

mCalendar.let {
Expand All @@ -317,19 +336,4 @@ object StatusBarClockNew : BaseHook() {
private fun safeSplitFirst(str: String?): String {
return str?.split("\n")?.firstOrNull() ?: ""
}

private fun buildFormatString(formatS: String?, formatN: String?, clockStyle: Int): String {
return when {
formatN.isNullOrEmpty() -> when (clockStyle) {
0 -> safeSplitFirst(formatS)
1 -> "${safeSplitFirst(formatS)}\nM/d E"
else -> "M/d E\n${safeSplitFirst(formatS)}"
}
else -> when (clockStyle) {
0 -> safeSplitFirst(formatS)
1 -> "${safeSplitFirst(formatS)}\n${safeSplitFirst(formatN)}"
else -> "${safeSplitFirst(formatN)}\n${safeSplitFirst(formatS)}"
}
}
}
}
Loading

0 comments on commit 538acbb

Please sign in to comment.