针对华为设备进行了优化

Author: breadeding

README.md

@@ -1,3 +1,30 @@
+# Moonlight Android
+
+此项目实现对[Moonlight安卓端 威力增强版](https://github.com/qiin2333/moonlight-vplus)的功能改进<br><br>
+
+
+# 特性
+
+* **修复了开启无障碍服务后无法使用音量键的问题**
+
+* **自动获取无障碍权限**
+  > *需要通过ADB授权android.permission.WRITE_SECURE_SETTINGS*
+
+* **安卓本地鼠标特殊滚轮的识别**
+  > *在使用安卓本地鼠标光标时，部分设备无法正确获取滚轮事件，如华为安卓平板，滚动滚动时会产生触屏效果造成大范围滑动*
+
+* **适用于部分平板键盘的按键映射**
+  > * Home → **Esc**
+  > * Esc + [1-0, -, =] → **F1 - F12**
+  > * Esc + Q → **呼出串流菜单**
+  > * 安卓截图键 → **Windows 截图 (Win+Shift+S)**
+  > * 安卓媒体键 (上一首/播放暂停/下一首) → **F5/F10/F11**
+
+* **支持鼠标中键**
+  > *部分设备将鼠标中键识别为返回键，此功能开启可以区分触摸返回和鼠标中键造成的返回*
+
+<br><br>
+
 <div align="center">
   <img src="./app/src/main/res/drawable/vplus.webp" width="100" alt="Moonlight V+ Logo">
 

app/build.gradle

@@ -147,7 +147,8 @@ android {
             // is to please change the applicationId before you publish.
             //
             // TL;DR: Leave the following line alone!
-            applicationIdSuffix ".qiin"
+            // applicationIdSuffix ".qiin"
+            applicationIdSuffix ".breaded"
             resValue "string", "app_label", "Moonlight"
             resValue "string", "app_label_root", "Moonlight (Root)"
 

app/nonRoot/release/baselineProfiles/0/app-nonRoot-release.dm

@@ -32,6 +32,7 @@
 import com.limelight.preferences.GlPreferences;
 import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.preferences.StreamSettings;
+import com.limelight.services.KeyboardAccessibilityService;
 import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.AnalyticsManager;
@@ -195,6 +196,28 @@ public void onServiceDisconnected(ComponentName className) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        //自动获取无障碍权限
+        try {
+            ComponentName cn = new ComponentName(this, KeyboardAccessibilityService.class);
+            String myService = cn.flattenToString();
+            String enabledServices = Settings.Secure.getString(getContentResolver(),
+                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+
+            if (enabledServices == null || !enabledServices.contains(myService)) {
+                if (enabledServices == null || enabledServices.isEmpty()) {
+                    enabledServices = myService;
+                } else {
+                    enabledServices += ":" + myService;
+                }
+
+                // 这里可能会抛异常
+                Settings.Secure.putString(getContentResolver(),
+                        Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, enabledServices);
+            }
+        } catch (SecurityException e) {
+            // 没无障碍权限
+        }
+
         easyTierController = new EasyTierController(this, this);
         inForeground = true;
         initBitmapCache();

app/nonRoot/release/baselineProfiles/1/app-nonRoot-release.dm

@@ -55,7 +55,8 @@ public class KeyboardTranslator implements InputManager.InputDeviceListener {
     public static final int VK_SEMICOLON = 59;
     public static final int VK_SLASH = 47;
     public static final int VK_SPACE = 32;
-    public static final int VK_PRINTSCREEN = 154;
+    //    public static final int VK_PRINTSCREEN = 154;
+    public static final int VK_PRINTSCREEN = 44;
     public static final int VK_TAB = 9;
     public static final int VK_LEFT = 37;
     public static final int VK_RIGHT = 39;

app/src/main/java/com/limelight/Game.java

@@ -233,6 +233,12 @@ public enum PerfOverlayPosition {
 
     private static final boolean DEFAULT_ENABLE_LOCAL_CURSOR_RENDERING = true;
     public boolean enableLocalCursorRendering;
+    //自定义按键映射
+    public boolean enableCustomKeyMap;
+    //修复鼠标中键识别
+    public boolean fixMouseMiddle;
+    //修复本地鼠标滚轮识别
+    public boolean fixMouseWheel;
     public static final int FRAME_PACING_MIN_LATENCY = 0;
     public static final int FRAME_PACING_BALANCED = 1;
     public static final int FRAME_PACING_CAP_FPS = 2;
@@ -786,6 +792,9 @@ else if (audioConfig.equals("51")) {
         config.enableDoubleClickDrag = prefs.getBoolean(ENABLE_DOUBLE_CLICK_DRAG_PREF_STRING, DEFAULT_ENABLE_DOUBLE_CLICK_DRAG);
         config.doubleTapTimeThreshold = prefs.getInt(DOUBLE_TAP_TIME_THRESHOLD_PREF_STRING, DEFAULT_DOUBLE_TAP_TIME_THRESHOLD);
         config.enableLocalCursorRendering = prefs.getBoolean(ENABLE_LOCAL_CURSOR_RENDERING_PREF_STRING, DEFAULT_ENABLE_LOCAL_CURSOR_RENDERING);
+        config.enableCustomKeyMap=prefs.getBoolean("checkbox_special_key_map",false);
+        config.fixMouseMiddle=prefs.getBoolean("checkbox_mouse_middle",false);
+        config.fixMouseWheel=prefs.getBoolean("checkbox_mouse_wheel",false);
         config.enableSops = prefs.getBoolean(SOPS_PREF_STRING, DEFAULT_SOPS);
         config.stretchVideo = prefs.getBoolean(STRETCH_PREF_STRING, DEFAULT_STRETCH);
         config.playHostAudio = prefs.getBoolean(HOST_AUDIO_PREF_STRING, DEFAULT_HOST_AUDIO);

app/src/main/java/com/limelight/PcView.java

@@ -2,10 +2,17 @@
 
 import android.accessibilityservice.AccessibilityService;
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityEvent;
 
+import com.limelight.Game;
+import com.limelight.preferences.PreferenceConfiguration;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 /**
  * 一个无障碍服务，用于在系统级别拦截硬件键盘事件。
  * 主要目的是捕获像 Win 键、Alt+Tab 等被 Android 系统默认行为占用的按键，
@@ -78,6 +85,47 @@ protected void onServiceConnected() {
      */
     @Override
     protected boolean onKeyEvent(KeyEvent event) {
+        if (interceptingEnabled && PreferenceConfiguration.readPreferences(this).enableCustomKeyMap) {
+            int fixedKeyCode = event.getKeyCode();
+            switch(fixedKeyCode){
+                case KeyEvent.KEYCODE_HOME:
+                    // HOME键映射ESC
+                    fixedKeyCode = KeyEvent.KEYCODE_ESCAPE;
+                    break;
+                case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+                    // 安卓上一首键映射Windows F5键
+                    fixedKeyCode = KeyEvent.KEYCODE_F5;
+                    break;
+                case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+                    // 安卓播放暂停键映射Windows F10键
+                    fixedKeyCode = KeyEvent.KEYCODE_F10;
+                    break;
+                case KeyEvent.KEYCODE_MEDIA_NEXT:
+                    // 安卓下一首键映射Windows F11键
+                    fixedKeyCode = KeyEvent.KEYCODE_F11;
+                    break;
+            }
+            // 安卓截图键映射Windows PRINT SCREEN键
+            if(fixedKeyCode == KeyEvent.KEYCODE_SYSRQ || fixedKeyCode != event.getKeyCode()) {
+                if (keyEventCallback != null) {
+                    KeyEvent fixedEvent = new KeyEvent(
+                            event.getDownTime(),
+                            event.getEventTime(),
+                            event.getAction(),
+                            fixedKeyCode,
+                            event.getRepeatCount(),
+                            event.getMetaState(),
+                            event.getDeviceId(),
+                            event.getScanCode(),
+                            event.getFlags(),
+                            event.getSource()
+                    );
+                    keyEventCallback.onKeyEvent(fixedEvent);
+                }
+                return true;
+            }
+        }
+
         // 小米平板将物理 ESC 键（ScanCode=1）映射为 Android 的 BACK 键（Code=4）。
         // 必须在下方的 switch-case 过滤之前进行拦截，否则会被当作普通返回键忽略。
         if (event.getScanCode() == 1) {

app/src/main/java/com/limelight/binding/input/KeyboardTranslator.java

@@ -269,6 +269,21 @@
             android:title="显示一个本地光标"
             android:summary="显示一个本地光标，可通过触摸板模式控制光标"
             android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_special_key_map"
+            android:title="特殊按键映射"
+            android:summary="键盘Home键映射Esc键，Esc+数字键/符号映射F1到F12,Esc+Q键映射串流菜单,安卓截图键映射Windows截图,安卓上一首/播放暂停/下一首分别映射到F5/F10/F11。"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_mouse_middle"
+            android:title="修复鼠标中键"
+            android:summary="在一些设备上鼠标中键可能被识别为返回键，选中尝试修复此问题。"
+            android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="checkbox_mouse_wheel"
+            android:title="修复本地鼠标滚轮"
+            android:summary="在一些设备上使用本地鼠标滚轮可能产生触屏滑动事件，选中尝试修复此问题。"
+            android:defaultValue="true" />
         <CheckBoxPreference
             android:key="checkbox_sync_touch_event_with_display"
             android:title="@string/title_checkbox_sync_touch_event_with_display"