InTheForest/QAuxiliary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 40 Wiki Activity

fix: SimplifyPlusPanel for QQ 9.0.55

Browse Source
This commit is contained in:
klxiaoniu
2024-05-14 13:02:14 +08:00
parent 29a1f03189
commit d097e49da2
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/github/qauxv/util/QQVersion.java
View File

@@ -116,4 +116,5 @@ public class QQVersion {
public static final long QQ_9_0_30 = 6038;
public static final long QQ_9_0_35 = 6148;
public static final long QQ_9_0_50 = 6236;
public static final long QQ_9_0_55 = 6348;
}

7
app/src/main/java/io/github/qauxv/util/dexkit/DexKitTarget.kt
View File

@@ -945,3 +945,10 @@ data object TroopInfoCardPageABConfig : DexKitTarget.UsingStr() {
override val declaringClass = ""
override val filter: dexkitFilter = DexKitFilter.allowAll
}
data object PlusPanel_PanelAdapter : DexKitTarget.UsingStr() {
override val findMethod: Boolean = false
override val traitString: Array<String> = arrayOf("appDataLists.subList(startIndex, endIndex)")
override val declaringClass = ""
override val filter: dexkitFilter = DexKitFilter.allowAll
}

12
app/src/main/java/xyz/nextalone/hook/SimplifyPlusPanel.kt
View File

@@ -29,6 +29,8 @@ import io.github.qauxv.base.annotation.UiItemAgentEntry
import io.github.qauxv.dsl.FunctionEntryRouter
import io.github.qauxv.util.Initiator
import io.github.qauxv.util.QQVersion
import io.github.qauxv.util.dexkit.DexKit
import io.github.qauxv.util.dexkit.PlusPanel_PanelAdapter
import io.github.qauxv.util.hostInfo
import io.github.qauxv.util.requireMinQQVersion
import xyz.nextalone.base.MultiItemDelayableHook
@@ -40,7 +42,7 @@ import java.lang.reflect.Method
@FunctionHookEntry
@UiItemAgentEntry
object SimplifyPlusPanel : MultiItemDelayableHook("na_simplify_plus_panel_multi") {
object SimplifyPlusPanel : MultiItemDelayableHook("na_simplify_plus_panel_multi", arrayOf(PlusPanel_PanelAdapter)) {
override val preferenceTitle = "精简加号菜单"
override val extraSearchKeywords: Array<String> = arrayOf("+号菜单")
@@ -134,7 +136,13 @@ object SimplifyPlusPanel : MultiItemDelayableHook("na_simplify_plus_panel_multi"
targetMethods[1]!!.hookBefore(this, callback)
} else {
// assert QQ.version <= QQVersion.QQ_8_4_8
if (QAppUtils.isQQnt()) {
if (requireMinQQVersion(QQVersion.QQ_9_0_55)) {
DexKit.requireClassFromCache(PlusPanel_PanelAdapter).declaredMethods.single { it.paramCount == 1 && it.parameterTypes[0] == ArrayList::class.java }
.hookBefore(
this,
callback
)
} else if (QAppUtils.isQQnt()) {
"Lcom/tencent/qqnt/pluspanel/adapter/PanelAdapter;".clazz!!.declaredMethods.single { it.paramCount == 1 && it.parameterTypes[0] == ArrayList::class.java }
.hookBefore(
this,