Skip to content

Commit 927efd2

Browse files
lingqiqi5211lingqiqi5211
committed
小修一个更新 ezx 版本出现的 field hook 问题
1 parent 3b8fbad commit 927efd2

5 files changed

Lines changed: 38 additions & 42 deletions

File tree

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.11.0"
2+
agp = "8.11.1"
33
kotlin-android = "2.2.0"
44
lsparanoid = "0.6.0"
55
autoService = "1.1.1"

‎library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/hook/systemui/controlcenter/media/MediaControlPanelBackugroundMix.kt‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ class MediaControlPanelBackgroundMix : BaseHook() {
119119
it.thisObject.objectHelper().getObjectOrNullUntilSuperclass("holder")
120120
?: return@createBeforeHook
121121
val titleText =
122-
mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("titleText")
123-
val artistText = mMediaViewHolder.objectHelper()
124-
.getObjectFieldOrNullAs<TextView>("artistText")
122+
mMediaViewHolder.getObjectFieldOrNullAs<TextView>("titleText")
123+
val artistText = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("artistText")
125124
val grey = if (isDarkMode()) Color.LTGRAY else Color.DKGRAY
126125
val color = if (isDarkMode()) Color.WHITE else Color.BLACK
127126

@@ -148,17 +147,17 @@ class MediaControlPanelBackgroundMix : BaseHook() {
148147
it.thisObject.objectHelper().getObjectOrNullUntilSuperclass("mMediaViewHolder")
149148
?: return@createAfterHook
150149

151-
val action0 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action0")
152-
val action1 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action1")
153-
val action2 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action2")
154-
val action3 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action3")
155-
val action4 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action4")
156-
val titleText = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("titleText")
157-
val artistText = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("artistText")
158-
val seamlessIcon = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageView>("seamlessIcon")
159-
val seekBar = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<SeekBar>("seekBar")
160-
val elapsedTimeView = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("elapsedTimeView")
161-
val totalTimeView = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("totalTimeView")
150+
val action0 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action0")
151+
val action1 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action1")
152+
val action2 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action2")
153+
val action3 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action3")
154+
val action4 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action4")
155+
val titleText = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("titleText")
156+
val artistText = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("artistText")
157+
val seamlessIcon = mMediaViewHolder.getObjectFieldOrNullAs<ImageView>("seamlessIcon")
158+
val seekBar = mMediaViewHolder.getObjectFieldOrNullAs<SeekBar>("seekBar")
159+
val elapsedTimeView = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("elapsedTimeView")
160+
val totalTimeView = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("totalTimeView")
162161

163162
val grey = if (isDarkMode()) Color.LTGRAY else Color.DKGRAY
164163
val color = if (isDarkMode()) Color.WHITE else Color.BLACK
@@ -212,8 +211,8 @@ class MediaControlPanelBackgroundMix : BaseHook() {
212211
XposedHelpers.callStaticMethod(notificationUtil, "isBackgroundBlurOpened", context) as Boolean
213212
if (!isBackgroundBlurOpened) return@createBeforeHook
214213

215-
val mPaint1 = it.thisObject.objectHelper().getObjectFieldOrNullAs<Paint>("mPaint1")
216-
val mPaint2 = it.thisObject.objectHelper().getObjectFieldOrNullAs<Paint>("mPaint2")
214+
val mPaint1 = it.thisObject.getObjectFieldOrNullAs<Paint>("mPaint1")
215+
val mPaint2 = it.thisObject.getObjectFieldOrNullAs<Paint>("mPaint2")
217216
if (mPaint1?.alpha == 0) return@createBeforeHook
218217

219218
mPaint1?.alpha = 0
@@ -258,17 +257,17 @@ class MediaControlPanelBackgroundMix : BaseHook() {
258257
if (isBackgroundBlurOpened) {
259258
val mMediaViewHolder = mediaControlPanelInstance.objectHelper().getObjectOrNullUntilSuperclass("mMediaViewHolder")
260259
if (mMediaViewHolder != null) {
261-
val action0 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action0")
262-
val action1 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action1")
263-
val action2 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action2")
264-
val action3 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action3")
265-
val action4 = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageButton>("action4")
266-
val titleText = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("titleText")
267-
val artistText = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("artistText")
268-
val seamlessIcon = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageView>("seamlessIcon")
269-
val seekBar = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<SeekBar>("seekBar")
270-
val elapsedTimeView = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("elapsedTimeView")
271-
val totalTimeView = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("totalTimeView")
260+
val action0 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action0")
261+
val action1 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action1")
262+
val action2 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action2")
263+
val action3 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action3")
264+
val action4 = mMediaViewHolder.getObjectFieldOrNullAs<ImageButton>("action4")
265+
val titleText = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("titleText")
266+
val artistText = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("artistText")
267+
val seamlessIcon = mMediaViewHolder.getObjectFieldOrNullAs<ImageView>("seamlessIcon")
268+
val seekBar = mMediaViewHolder.getObjectFieldOrNullAs<SeekBar>("seekBar")
269+
val elapsedTimeView = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("elapsedTimeView")
270+
val totalTimeView = mMediaViewHolder.getObjectFieldOrNullAs<TextView>("totalTimeView")
272271
val grey = if (isDarkMode()) Color.LTGRAY else Color.DKGRAY
273272
val color = if (isDarkMode()) Color.WHITE else Color.BLACK
274273
artistText?.setTextColor(grey)
@@ -312,14 +311,14 @@ class MediaControlPanelBackgroundMix : BaseHook() {
312311
runCatching {
313312
// 获取 Icon
314313
miuiMediaControlPanel?.methodFinder()?.filterByName("bindPlayer")?.first()?.createBeforeHook {
315-
artwork = it.args[0].objectHelper().getObjectFieldOrNullAs<Icon>("artwork")
314+
artwork = it.args[0].getObjectFieldOrNullAs<Icon>("artwork")
316315
?: return@createBeforeHook
317316
}
318317

319318
// 重写 onDraw
320319
playerTwoCircleView?.methodFinder()?.filterByName("onDraw")?.first()?.createBeforeHook {
321-
(it.thisObject.objectHelper().getObjectFieldOrNullAs<Paint>("mPaint1"))?.alpha = 0
322-
(it.thisObject.objectHelper().getObjectFieldOrNullAs<Paint>("mPaint2"))?.alpha = 0
320+
(it.thisObject.getObjectFieldOrNullAs<Paint>("mPaint1"))?.alpha = 0
321+
(it.thisObject.getObjectFieldOrNullAs<Paint>("mPaint2"))?.alpha = 0
323322
it.thisObject.objectHelper().setObject("mRadius", 0.0f)
324323
}
325324

‎library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/hook/systemui/controlcenter/media/MediaControlPanelTimeViewTextSize.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class MediaControlPanelTimeViewTextSize : BaseHook() {
4444
it.thisObject.objectHelper().getObjectOrNullUntilSuperclass("mMediaViewHolder")
4545
?: return@createAfterHook
4646
val elapsedTimeView =
47-
mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("elapsedTimeView")
47+
mMediaViewHolder.getObjectFieldOrNullAs<TextView>("elapsedTimeView")
4848
val totalTimeView =
49-
mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<TextView>("totalTimeView")
49+
mMediaViewHolder.getObjectFieldOrNullAs<TextView>("totalTimeView")
5050

5151
elapsedTimeView?.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
5252
totalTimeView?.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)

‎library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/hook/systemui/controlcenter/media/MediaPicture.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,9 @@ object MediaPicture : BaseHook() {
6262

6363
if (albumPictureIdentifier) {
6464
val appIcon =
65-
mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageView>("appIcon")
65+
mMediaViewHolder.getObjectFieldOrNullAs<ImageView>("appIcon")
6666
(appIcon?.parent as ViewGroup?)?.removeView(appIcon)
67-
}
68-
69-
if (albumPictureCorners) {
67+
} else if (albumPictureCorners) {
7068
optPicture(mMediaViewHolder, it, context)
7169
}
7270
}
@@ -77,8 +75,8 @@ object MediaPicture : BaseHook() {
7775
param: XC_MethodHook.MethodHookParam,
7876
context: Context
7977
) {
80-
val albumView = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<ImageView>("albumView")
81-
val artwork = param.args[0].objectHelper().getObjectFieldOrNullAs<Icon>("artwork") ?: return
78+
val albumView = mMediaViewHolder.getObjectFieldOrNullAs<ImageView>("albumView")
79+
val artwork = param.args[0].getObjectFieldOrNullAs<Icon>("artwork") ?: return
8280
val artworkLayer = artwork.loadDrawable(context) ?: return
8381

8482
val artworkBitmap = createBitmap(artworkLayer.intrinsicWidth, artworkLayer.intrinsicHeight)

‎library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/hook/systemui/controlcenter/media/MediaSeekBar.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ object MediaSeekBar : BaseHook() {
5353

5454
override fun init() {
5555
mediaViewHolder?.constructors?.first()?.createAfterHook {
56-
val seekBar = it.thisObject.objectHelper()
57-
.getObjectFieldOrNullAs<SeekBar>("seekBar")
56+
val seekBar = it.thisObject.getObjectFieldOrNullAs<SeekBar>("seekBar")
5857

5958
val backgroundDrawable = GradientDrawable().apply {
6059
color = ColorStateList(arrayOf(intArrayOf()), intArrayOf("#20ffffff".toColorInt()))
@@ -95,7 +94,7 @@ object MediaSeekBar : BaseHook() {
9594
miuiMediaControlPanel?.methodFinder()?.filterByName("bindPlayer")?.first()?.createAfterHook {
9695
val mMediaViewHolder = it.thisObject.objectHelper().getObjectOrNullUntilSuperclass("mMediaViewHolder") ?: return@createAfterHook
9796

98-
val seekBar = mMediaViewHolder.objectHelper().getObjectFieldOrNullAs<SeekBar>("seekBar")
97+
val seekBar = mMediaViewHolder.getObjectFieldOrNullAs<SeekBar>("seekBar")
9998
seekBar?.thumb?.colorFilter = colorFilter(Color.TRANSPARENT)
10099
}
101100
}

0 commit comments

Comments
 (0)