Skip to content

Commit dc9cbc7

Browse files
committed
refactor: 优化 MusicBaseHook.kt 的代码结构与作用域
- **代码重构:** 将 `ResourceIds`、`IconBundle`、`RemoteViewType`、`SplitConfig` 和 `Token` 等辅助数据类和枚举移动到 `MusicBaseHook` 类内部,以收紧类成员的作用域并改善组织结构。 - **代码规范:** 调整了 `PrefsBridge` 的导入顺序,使其符合字母排序规范。 Signed-off-by: ghhccghk <2137610394@qq.com>
1 parent 73c0db2 commit dc9cbc7

1 file changed

Lines changed: 60 additions & 59 deletions

File tree

  • library/libhook/src/main/java/com/sevtinge/hyperceiler/libhook/appbase/systemui

library/libhook/src/main/java/com/sevtinge/hyperceiler/libhook/appbase/systemui/MusicBaseHook.kt

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ import com.hchen.superlyricapi.SuperLyricData
4747
import com.hchen.superlyricapi.SuperLyricTool
4848
import com.hyperfocus.api.FocusApi
4949
import com.hyperfocus.api.IslandApi
50+
import com.sevtinge.hyperceiler.common.utils.PrefsBridge
5051
import com.sevtinge.hyperceiler.libhook.R
5152
import com.sevtinge.hyperceiler.libhook.base.BaseHook
5253
import com.sevtinge.hyperceiler.common.utils.api.ProjectApi
5354
import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.AppsTool
5455
import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.EzxHelpUtils
55-
import com.sevtinge.hyperceiler.common.log.XposedLog
56-
import com.sevtinge.hyperceiler.common.utils.PrefsBridge
56+
import com.sevtinge.hyperceiler.libhook.utils.log.XposedLog
5757
import io.github.kyuubiran.ezxhelper.xposed.EzXposed
5858
import org.json.JSONObject
5959
import kotlin.math.min
@@ -671,66 +671,67 @@ abstract class MusicBaseHook : BaseHook() {
671671
}
672672
return tokens
673673
}
674-
}
675674

676-
/**
677-
* 资源 ID 缓存
678-
*/
679-
private data class ResourceIds(
680-
val focuslyricLayout: Int,
681-
val focuslyricIslandLayout: Int,
682-
val focusaodlyricLayout: Int,
683-
val focuslyricId: Int,
684-
val focusiconId: Int,
685-
val focustflyricId: Int
686-
)
675+
/**
676+
* 资源 ID 缓存
677+
*/
678+
private data class ResourceIds(
679+
val focuslyricLayout: Int,
680+
val focuslyricIslandLayout: Int,
681+
val focusaodlyricLayout: Int,
682+
val focuslyricId: Int,
683+
val focusiconId: Int,
684+
val focustflyricId: Int
685+
)
687686

688-
/**
689-
* 图标包
690-
*/
691-
private data class IconBundle(
692-
val primaryBitmap: Bitmap,
693-
val icon: Icon,
694-
val darkIcon: Icon,
695-
val circularIcon: Icon,
696-
val activityIcon: Bitmap?,
697-
val hasTint: Boolean
698-
)
687+
/**
688+
* 图标包
689+
*/
690+
private data class IconBundle(
691+
val primaryBitmap: Bitmap,
692+
val icon: Icon,
693+
val darkIcon: Icon,
694+
val circularIcon: Icon,
695+
val activityIcon: Bitmap?,
696+
val hasTint: Boolean
697+
)
699698

700-
/**
701-
* RemoteView 类型
702-
*/
703-
private enum class RemoteViewType {
704-
DAY, ISLAND, AOD
705-
}
699+
/**
700+
* RemoteView 类型
701+
*/
702+
private enum class RemoteViewType {
703+
DAY, ISLAND, AOD
704+
}
706705

707-
/**
708-
* 拆字配置
709-
*
710-
* @param maxLength 最大长度
711-
* @param lookahead 前瞻距离
712-
* @param minFraction 最小分割比例
713-
* @param keepSpaceInSecond 是否保留第二部分开头的空格
714-
* @param pairedSymbols 成对符号映射
715-
*/
716-
data class SplitConfig(
717-
val maxLength: Int,
718-
val lookahead: Int = 2,
719-
val minFraction: Double = 0.45,
720-
val keepSpaceInSecond: Boolean = false,
721-
val pairedSymbols: Map<Char, Char> = mapOf(
722-
'(' to ')',
723-
'[' to ']',
724-
'{' to '}',
725-
'《' to '》',
726-
'"' to '"',
727-
'\'' to '\'',
728-
'「' to '」',
729-
'『' to '』'
706+
/**
707+
* 拆字配置
708+
*
709+
* @param maxLength 最大长度
710+
* @param lookahead 前瞻距离
711+
* @param minFraction 最小分割比例
712+
* @param keepSpaceInSecond 是否保留第二部分开头的空格
713+
* @param pairedSymbols 成对符号映射
714+
*/
715+
data class SplitConfig(
716+
val maxLength: Int,
717+
val lookahead: Int = 2,
718+
val minFraction: Double = 0.45,
719+
val keepSpaceInSecond: Boolean = false,
720+
val pairedSymbols: Map<Char, Char> = mapOf(
721+
'(' to ')',
722+
'[' to ']',
723+
'{' to '}',
724+
'《' to '》',
725+
'"' to '"',
726+
'\'' to '\'',
727+
'「' to '」',
728+
'『' to '』'
729+
)
730730
)
731-
)
732731

733-
/**
734-
* 分词 Token
735-
*/
736-
data class Token(val text: String)
732+
/**
733+
* 分词 Token
734+
*/
735+
data class Token(val text: String)
736+
737+
}

0 commit comments

Comments
 (0)