Revert "add : sort troop setting view GroupAppInfoListView(GroupFileV…

…iew) to top" This reverts commit 953419e Signed-off-by: suzhelan <[email protected]>
cinit · Dec 2, 2023 · 41599b8 · 41599b8
1 parent a9cbdc2
commit 41599b8
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 360 deletions.
diff --git a/app/src/main/java/io/github/qauxv/dsl/FunctionEntryRouter.kt b/app/src/main/java/io/github/qauxv/dsl/FunctionEntryRouter.kt
@@ -124,7 +124,6 @@ object FunctionEntryRouter {
                     category("auxiliary-friend", "好友")
                     category("auxiliary-profile", "资料卡")
                 }
-                fragment("auxiliary-group", "群聊")
                 fragment("auxiliary-notification", "通知设置")
                 fragment("auxiliary-experimental", "实验性功能")
                 fragment("entertainment-function", "娱乐功能")
@@ -258,9 +257,6 @@ object FunctionEntryRouter {
             @JvmField
             val FRIEND_CATEGORY: Array<String> = arrayOf(ANY_CAST_PREFIX, "auxiliary-friend")
 
-            @JvmField
-            val GROUP_CATEGORY: Array<String> = arrayOf(ANY_CAST_PREFIX, "auxiliary-group")
-
             @JvmField
             val PROFILE_CATEGORY: Array<String> = arrayOf(ANY_CAST_PREFIX, "auxiliary-profile")
 

diff --git a/app/src/main/java/top/linl/hook/OffRelationshipIdentification.java b/app/src/main/java/top/linl/hook/OffRelationshipIdentification.java
@@ -11,8 +11,8 @@
 import io.github.qauxv.hook.CommonSwitchFunctionHook;
 import io.github.qauxv.util.Initiator;
 import java.lang.reflect.Method;
-import top.linl.util.reflect.FieIdUtils;
-import top.linl.util.reflect.MethodTool;
+import top.linl.util.FieIdUtils;
+import top.linl.util.MethodTool;
 
 
 @FunctionHookEntry

diff --git a/app/src/main/java/top/linl/hook/SortTroopSettingAppListView.java b/app/src/main/java/top/linl/hook/SortTroopSettingAppListView.java
diff --git a/app/src/main/java/top/linl/hook/TurnOffFriendInteractionLogoView.java b/app/src/main/java/top/linl/hook/TurnOffFriendInteractionLogoView.java
@@ -30,8 +30,8 @@
 import io.github.qauxv.hook.CommonSwitchFunctionHook;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import top.linl.util.reflect.FieIdUtils;
-import top.linl.util.reflect.MethodTool;
+import top.linl.util.FieIdUtils;
+import top.linl.util.MethodTool;
 
 @FunctionHookEntry
 @UiItemAgentEntry

diff --git a/...top/linl/util/reflect/CheckClassType.java → ...in/java/top/linl/util/CheckClassType.java b/...top/linl/util/reflect/CheckClassType.java → ...in/java/top/linl/util/CheckClassType.java
@@ -1,26 +1,4 @@
-/*
- * QAuxiliary - An Xposed module for QQ/TIM
- * Copyright (C) 2019-2023 QAuxiliary developers
- * https://github.com/cinit/QAuxiliary
- *
- * This software is non-free but opensource software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by QAuxiliary contributors.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * and eula along with this software.  If not, see
- * <https://www.gnu.org/licenses/>
- * <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>.
- */
-
-package top.linl.util.reflect;
+package top.linl.util;
 
 public class CheckClassType {
 

diff --git a/...ava/top/linl/util/reflect/FieIdUtils.java → ...c/main/java/top/linl/util/FieIdUtils.java b/...ava/top/linl/util/reflect/FieIdUtils.java → ...c/main/java/top/linl/util/FieIdUtils.java
@@ -1,26 +1,4 @@
-/*
- * QAuxiliary - An Xposed module for QQ/TIM
- * Copyright (C) 2019-2023 QAuxiliary developers
- * https://github.com/cinit/QAuxiliary
- *
- * This software is non-free but opensource software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by QAuxiliary contributors.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * and eula along with this software.  If not, see
- * <https://www.gnu.org/licenses/>
- * <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>.
- */
-
-package top.linl.util.reflect;
+package top.linl.util;
 
 
 import java.lang.reflect.Field;

diff --git a/...ava/top/linl/util/reflect/MethodTool.java → ...c/main/java/top/linl/util/MethodTool.java b/...ava/top/linl/util/reflect/MethodTool.java → ...c/main/java/top/linl/util/MethodTool.java
@@ -1,26 +1,4 @@
-/*
- * QAuxiliary - An Xposed module for QQ/TIM
- * Copyright (C) 2019-2023 QAuxiliary developers
- * https://github.com/cinit/QAuxiliary
- *
- * This software is non-free but opensource software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by QAuxiliary contributors.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * and eula along with this software.  If not, see
- * <https://www.gnu.org/licenses/>
- * <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>.
- */
-
-package top.linl.util.reflect;
+package top.linl.util;
 
 import io.github.qauxv.util.Initiator;
 import java.lang.reflect.Method;

diff --git a/app/src/main/java/top/linl/util/ReflectException.java b/app/src/main/java/top/linl/util/ReflectException.java
@@ -0,0 +1,27 @@
+package top.linl.util;
+
+public class ReflectException extends RuntimeException {
+
+    private Exception otherExceptions;
+
+    public ReflectException() {
+        super();
+    }
+
+    public ReflectException(String content) {
+        super(content);
+    }
+
+    public ReflectException(String content, Exception e) {
+        super(content);
+        this.otherExceptions = e;
+    }
+
+    public boolean hasOtherExceptions() {
+        return otherExceptions != null;
+    }
+
+    public Exception getOtherExceptions() {
+        return this.otherExceptions;
+    }
+}
diff --git a/app/src/main/java/top/linl/util/ScreenParamUtils.java b/app/src/main/java/top/linl/util/ScreenParamUtils.java