Skip to content

[pull] master from yujincheng08:master #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 3, 2025
Merged

[pull] master from yujincheng08:master #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 56 additions & 47 deletions app/src/main/java/me/iacn/biliroaming/XposedInit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,64 +78,64 @@ class XposedInit : IXposedHookLoadPackage, IXposedHookZygoteInit {

BiliBiliPackage(lpparam.classLoader, param.args[0] as Context)
if (BuildConfig.DEBUG) {
startHook(SSLHook(lpparam.classLoader))
startHook { SSLHook(lpparam.classLoader) }
}
startHook(KillDelayBootHook(lpparam.classLoader))
startHook(HintHook(lpparam.classLoader))
startHook(BangumiSeasonHook(lpparam.classLoader))
startHook(BangumiPlayUrlHook(lpparam.classLoader))
startHook(PegasusHook(lpparam.classLoader))
startHook(CustomThemeHook(lpparam.classLoader))
startHook(TeenagersModeHook(lpparam.classLoader))
startHook(JsonHook(lpparam.classLoader))
startHook(ShareHook(lpparam.classLoader))
startHook(AutoLikeHook(lpparam.classLoader))
startHook(SettingHook(lpparam.classLoader))
startHook(SplashHook(lpparam.classLoader))
startHook(EnvHook(lpparam.classLoader))
startHook(DownloadThreadHook(lpparam.classLoader))
startHook(MusicNotificationHook(lpparam.classLoader))
startHook(DrawerHook(lpparam.classLoader))
startHook(CoverHook(lpparam.classLoader))
startHook(SubtitleHook(lpparam.classLoader))
startHook(CopyHook(lpparam.classLoader))
startHook(LiveRoomHook(lpparam.classLoader))
startHook(QualityHook(lpparam.classLoader))
startHook(DynamicHook(lpparam.classLoader))
startHook(ProtoBufHook(lpparam.classLoader))
startHook(PlayArcConfHook(lpparam.classLoader))
startHook(TryWatchVipQualityHook(lpparam.classLoader))
startHook(AllowMiniPlayHook(lpparam.classLoader))
startHook(StartActivityHook(lpparam.classLoader))
startHook(FullStoryHook(lpparam.classLoader))
startHook(DialogBlurBackgroundHook(lpparam.classLoader))
startHook(PlayerLongPressHook(lpparam.classLoader))
startHook(BlockUpdateHook(lpparam.classLoader))
startHook(VipSectionHook(lpparam.classLoader))
startHook(CommentImageHook(lpparam.classLoader))
startHook(WebViewHook(lpparam.classLoader))
startHook(P2pHook(lpparam.classLoader))
startHook(DanmakuHook(lpparam.classLoader))
startHook(BangumiPageAdHook(lpparam.classLoader))
startHook(VideoQualityHook(lpparam.classLoader))
startHook { KillDelayBootHook(lpparam.classLoader) }
startHook { HintHook(lpparam.classLoader) }
startHook { BangumiSeasonHook(lpparam.classLoader) }
startHook { BangumiPlayUrlHook(lpparam.classLoader) }
startHook { PegasusHook(lpparam.classLoader) }
startHook { CustomThemeHook(lpparam.classLoader) }
startHook { TeenagersModeHook(lpparam.classLoader) }
startHook { JsonHook(lpparam.classLoader) }
startHook { ShareHook(lpparam.classLoader) }
startHook { AutoLikeHook(lpparam.classLoader) }
startHook { SettingHook(lpparam.classLoader) }
startHook { SplashHook(lpparam.classLoader) }
startHook { EnvHook(lpparam.classLoader) }
startHook { DownloadThreadHook(lpparam.classLoader) }
startHook { MusicNotificationHook(lpparam.classLoader) }
startHook { DrawerHook(lpparam.classLoader) }
startHook { CoverHook(lpparam.classLoader) }
startHook { SubtitleHook(lpparam.classLoader) }
startHook { CopyHook(lpparam.classLoader) }
startHook { LiveRoomHook(lpparam.classLoader) }
startHook { QualityHook(lpparam.classLoader) }
startHook { DynamicHook(lpparam.classLoader) }
startHook { ProtoBufHook(lpparam.classLoader) }
startHook { PlayArcConfHook(lpparam.classLoader) }
startHook { TryWatchVipQualityHook(lpparam.classLoader) }
startHook { AllowMiniPlayHook(lpparam.classLoader) }
startHook { StartActivityHook(lpparam.classLoader) }
startHook { FullStoryHook(lpparam.classLoader) }
startHook { DialogBlurBackgroundHook(lpparam.classLoader) }
startHook { PlayerLongPressHook(lpparam.classLoader) }
startHook { BlockUpdateHook(lpparam.classLoader) }
startHook { VipSectionHook(lpparam.classLoader) }
startHook { CommentImageHook(lpparam.classLoader) }
startHook { WebViewHook(lpparam.classLoader) }
startHook { P2pHook(lpparam.classLoader) }
startHook { DanmakuHook(lpparam.classLoader) }
startHook { BangumiPageAdHook(lpparam.classLoader) }
startHook { VideoQualityHook(lpparam.classLoader) }
// startHook(PublishToFollowingHook(lpparam.classLoader))
startHook(UposReplaceHook(lpparam.classLoader))
startHook(SpeedHook(lpparam.classLoader))
startHook(MultiWindowHook(lpparam.classLoader))
startHook(LiveQualityHook(lpparam.classLoader))
startHook { UposReplaceHook(lpparam.classLoader) }
startHook { SpeedHook(lpparam.classLoader) }
startHook { MultiWindowHook(lpparam.classLoader) }
startHook { LiveQualityHook(lpparam.classLoader) }
}

lpparam.processName.endsWith(":web") -> {
BiliBiliPackage(lpparam.classLoader, param.args[0] as Context)
CustomThemeHook(lpparam.classLoader).insertColorForWebProcess()
startHook(WebViewHook(lpparam.classLoader))
startHook(ShareHook(lpparam.classLoader))
startHook(DialogBlurBackgroundHook(lpparam.classLoader))
startHook { WebViewHook(lpparam.classLoader) }
startHook { ShareHook(lpparam.classLoader) }
startHook { DialogBlurBackgroundHook(lpparam.classLoader) }
}

lpparam.processName.endsWith(":download") -> {
BiliBiliPackage(lpparam.classLoader, param.args[0] as Context)
startHook(BangumiPlayUrlHook(lpparam.classLoader))
startHook { BangumiPlayUrlHook(lpparam.classLoader) }
}
}
}
Expand All @@ -145,8 +145,17 @@ class XposedInit : IXposedHookLoadPackage, IXposedHookZygoteInit {
}
}

@Deprecated(
"Use startHook(hookerCreater: () -> BaseHook) instead",
ReplaceWith("startHook { hooker }")
)
private fun startHook(hooker: BaseHook) {
startHook { hooker }
}

private fun startHook(hookerCreater: () -> BaseHook) {
try {
val hooker = hookerCreater()
hookers.add(hooker)
hooker.startHook()
} catch (e: Throwable) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/iacn/biliroaming/hook/DialogBlurBackgroundHook.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class DialogBlurBackgroundHook(mClassLoader: ClassLoader) : BaseHook(mClassLoade
override fun startHook() {
if (sPrefs.getBoolean("dialog_blur_background", false).not()) return
Log.d("startHook: DialogBlurBackgroundHook")
Dialog::class.java.hookAfterMethod("show") {
Dialog::class.java.hookAfterMethod("onStart") {
(it.thisObject as Dialog).window?.blurBackground()
}
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/me/iacn/biliroaming/utils/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import java.lang.reflect.Proxy
import java.math.BigInteger
import java.net.URL
import java.util.*
import java.util.function.Consumer
import kotlin.math.roundToInt
import kotlin.reflect.KProperty

Expand Down Expand Up @@ -335,7 +336,7 @@ fun Window.blurBackground() {
addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
attributes.blurBehindRadius = 50
setBackgroundBlurRadius(50)
val blurEnableListener = { enable: Boolean ->
val blurEnableListener = Consumer<Boolean> { enable: Boolean ->
setDimAmount(if (enable) 0.1F else 0.6F)
}
decorView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
Expand Down