修复了一些已知问题

手势:
- 修复平板右边角滑动手势被左边角功能覆盖的问题
- 优化选择应用 picker 调整为全部应用

Author: lingqiqi5211

library/core/src/main/java/com/sevtinge/hyperceiler/model/data/AppDataManager.java

@@ -25,13 +25,14 @@ public List<AppData> getAppInfo(int modeSelection) {
         try {
             return switch (modeSelection) {
                 case SubPickerActivity.LAUNCHER_MODE,
-                     SubPickerActivity.CALLBACK_MODE,
                      SubPickerActivity.LAUNCHER_PICK_MODE,
                      SubPickerActivity.INPUT_MODE -> getLauncherApps();
                 case SubPickerActivity.APP_OPEN_MODE -> getOpenWithApps();
                 case SubPickerActivity.PROCESS_TEXT_MODE -> getProcessTextApps();
                 case SubPickerActivity.IME_MODE -> getInputMethodApps();
-                case SubPickerActivity.ALL_APPS_MODE, SubPickerActivity.SCOPE_MODE -> getAllApps();
+                case SubPickerActivity.ALL_APPS_MODE,
+                     SubPickerActivity.SCOPE_MODE,
+                     SubPickerActivity.CALLBACK_MODE -> getAllApps();
                 default -> new ArrayList<>();
             };
         } catch (Exception e) {

library/core/src/main/java/com/sevtinge/hyperceiler/sub/MultiActionSettings.java

@@ -18,7 +18,7 @@
  */
 package com.sevtinge.hyperceiler.sub;
 
-import static com.sevtinge.hyperceiler.sub.SubPickerActivity.LAUNCHER_PICK_MODE;
+import static com.sevtinge.hyperceiler.sub.SubPickerActivity.CALLBACK_MODE;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -252,7 +252,7 @@ private void updateRadioButtonPreference(String key) {
     @Override
     public void onClick() {
         Intent intent = new Intent(getActivity(), SubPickerActivity.class);
-        intent.putExtra("mode", LAUNCHER_PICK_MODE);
+        intent.putExtra("mode", CALLBACK_MODE);
         intent.putExtra("key", mKey);
         appPickerLauncher.launch(intent);
     }

library/core/src/main/java/com/sevtinge/hyperceiler/sub/SubPickerActivity.java

@@ -353,7 +353,7 @@ private List<AppData> processAppData(List<AppData> data) {
         }
 
         // 4. 手势应用选择保留 launcher 列表样式，但当前已选项需要置顶
-        if (mModeSelection == LAUNCHER_PICK_MODE && mKey != null) {
+        if ((mModeSelection == LAUNCHER_PICK_MODE || mModeSelection == CALLBACK_MODE) && mKey != null) {
             String selectedApp = PrefsBridge.getString(mKey + "_app", "");
             if (!selectedApp.isEmpty()) {
                 String[] selectedParts = selectedApp.split("\\|", 2);

library/libhook/src/main/java/com/sevtinge/hyperceiler/libhook/rules/home/gesture/CornerSlide.java

@@ -22,6 +22,7 @@
 import static com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.EzxHelpUtils.findAndHookConstructor;
 
 import android.content.Context;
+import android.graphics.RectF;
 import android.os.Bundle;
 import android.view.MotionEvent;
 
@@ -37,13 +38,16 @@ public class CornerSlide extends BaseHook {
     public int inDirection = 0;
 
     Context mContext;
+    Class<?> mGestureOperationHelperClass;
 
     @Override
     public void init() {
         findAndHookMethod("com.android.systemui.shared.recents.system.AssistManager",
             "isSupportGoogleAssist", int.class,
             returnConstant(true));
         Class<?> FsGestureAssistHelper = findClassIfExists("com.miui.home.recents.FsGestureAssistHelper");
+        Class<?> gestureModeAssistantClass = findClassIfExists("com.miui.home.recents.GestureModeAssistant");
+        mGestureOperationHelperClass = findClassIfExists("com.miui.home.recents.GestureOperationHelper");
         if (isPad()) {
             findAndHookMethod(FsGestureAssistHelper, "canTriggerAssistantAction",
                 float.class, float.class, int.class,
@@ -95,14 +99,27 @@ public void before(HookParam param) {
                 public void after(HookParam param) {
                     MotionEvent motionEvent = (MotionEvent) param.getArgs()[0];
                     if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                        float mDownX = EzxHelpUtils.getFloatField(param.getThisObject(), "mDownX");
-                        int mAssistantWidth = EzxHelpUtils.getIntField(param.getThisObject(), "mAssistantWidth");
-                        inDirection = mDownX < mAssistantWidth ? 0 : 1;
+                        updateDirection(param.getThisObject(), motionEvent);
                     }
                 }
             }
         );
 
+        if (gestureModeAssistantClass != null) {
+            hookAllMethods(gestureModeAssistantClass,
+                "onStartGesture", new IMethodHook() {
+                    @Override
+                    public void after(HookParam param) {
+                        updateDirectionFromDownPoint(
+                            param.getThisObject(),
+                            EzxHelpUtils.getFloatField(param.getThisObject(), "mDownX"),
+                            EzxHelpUtils.getFloatField(param.getThisObject(), "mDownY")
+                        );
+                    }
+                }
+            );
+        }
+
         findAndHookConstructor("com.miui.home.recents.NavStubView",
             Context.class, new IMethodHook() {
                 @Override
@@ -132,4 +149,36 @@ public void before(HookParam param) {
             }
         );
     }
+
+    private void updateDirection(Object helper, MotionEvent motionEvent) {
+        updateDirectionFromDownPoint(helper, motionEvent.getRawX(), motionEvent.getRawY());
+    }
+
+    private void updateDirectionFromDownPoint(Object helper, float downX, float downY) {
+        if (isPad() && updateDirectionWithGestureRegions(downX, downY)) {
+            return;
+        }
+        int assistantWidth = EzxHelpUtils.getIntField(helper, "mAssistantWidth");
+        inDirection = downX < assistantWidth ? 0 : 1;
+    }
+
+    private boolean updateDirectionWithGestureRegions(float downX, float downY) {
+        if (mGestureOperationHelperClass == null) {
+            return false;
+        }
+        try {
+            RectF leftRegion = (RectF) EzxHelpUtils.getStaticObjectField(mGestureOperationHelperClass, "REGION_BOTTOM_LEFT_CORNER");
+            RectF rightRegion = (RectF) EzxHelpUtils.getStaticObjectField(mGestureOperationHelperClass, "REGION_BOTTOM_RIGHT_CORNER");
+            if (leftRegion != null && leftRegion.contains(downX, downY)) {
+                inDirection = 0;
+                return true;
+            }
+            if (rightRegion != null && rightRegion.contains(downX, downY)) {
+                inDirection = 1;
+                return true;
+            }
+        } catch (Throwable ignored) {
+        }
+        return false;
+    }
 }