Merge branch 'master' into breaded

# Conflicts:
#	README.md
#	app/nonRoot/release/baselineProfiles/0/app-nonRoot-release.dm
#	app/nonRoot/release/baselineProfiles/1/app-nonRoot-release.dm

Author: breadeding

README.md

@@ -1,3 +1,35 @@
+# Moonlight Android
+
+此项目实现对[Moonlight安卓端 威力增强版](https://github.com/qiin2333/moonlight-vplus)的功能改进<br><br>
+
+
+# 特性
+
+* **修复了开启无障碍服务后无法使用音量键的问题**
+
+* **修复了Ctrl+Shift+Alt+C在本地鼠标模式下无法正确切换模式的问题**
+
+* **自动获取无障碍权限**
+  > *需要通过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,7 @@ android {
             // is to please change the applicationId before you publish.
             //
             // TL;DR: Leave the following line alone!
-            applicationIdSuffix ".qiin"
+            applicationIdSuffix ".breaded"
             resValue "string", "app_label", "Moonlight"
             resValue "string", "app_label_root", "Moonlight (Root)"
 
@@ -190,6 +190,8 @@ dependencies {
     implementation 'androidx.tvprovider:tvprovider:1.1.0'
 
     // Firebase Analytics
-    implementation platform('com.google.firebase:firebase-bom:32.7.0')
+    // BOM 版本说明: https://firebase.google.com/support/release-notes/android
+    // 注意: Firebase 33.0.0+ 需要 minSdk 23，我们使用 32.8.1 保持 API 22 兼容
+    implementation platform('com.google.firebase:firebase-bom:32.8.1')
     implementation 'com.google.firebase:firebase-analytics'
 }

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

@@ -148,7 +148,7 @@
             android:name=".preferences.StreamSettings"
             android:resizeableActivity="true"
             android:enableOnBackInvokedCallback="true"
-            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:label="Streaming Settings">
             <meta-data android:name="WindowManagerPreference:FreeformWindowSize" android:value="system-default" />
             <meta-data android:name="WindowManagerPreference:FreeformWindowOrientation" android:value="landscape" />

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

@@ -92,8 +92,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.RequiresApi;
-
 import java.io.ByteArrayInputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -175,7 +173,10 @@ public interface PerformanceInfoDisplay {
     private boolean surfaceCreated = false;
     private boolean attemptedConnection = false;
     private AnalyticsManager analyticsManager;
-    private long streamStartTime;
+    private long streamStartTime;           // 串流开始的时间戳
+    private long accumulatedStreamTime;     // 累计的有效串流时间（排除后台暂停）
+    private long lastActiveTime;            // 上次活跃的时间戳（用于计算暂停时间）
+    private boolean isStreamingActive;      // 串流是否处于活跃状态
     private int suppressPipRefCount = 0;
     private String pcName;
     private String appName;
@@ -363,6 +364,20 @@ private void stopAndUnbindUsbDriverService() {
     private boolean detectScrolling = false;
     private boolean detectMouseMiddle = false;
     private boolean detectMouseMiddleDown = false;
+    private static final String CURSOR_PREFS = "CursorPrefs";
+    private static final String KEY_CURSOR_RESTORE = "cursor_switch_state";
+
+    private void saveCursorState(int state) {
+        getSharedPreferences(CURSOR_PREFS, MODE_PRIVATE)
+                .edit()
+                .putInt(KEY_CURSOR_RESTORE, state)
+                .commit(); // 使用 commit 确保即使进程随后被杀也能保存
+    }
+
+    private int getCursorState() {
+        return getSharedPreferences(CURSOR_PREFS, MODE_PRIVATE)
+                .getInt(KEY_CURSOR_RESTORE, 0);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -1103,6 +1118,9 @@ public void onStreamViewReady(StreamView streamView) {
     protected void onResume() {
         super.onResume();
 
+        // 回到游戏时，重置标志位，允许下次暂停时再次恢复
+        isCursorRestored = false;
+
         // 当 Activity 回到前台时，通知服务开始拦截键盘事件。
         KeyboardAccessibilityService.setIntercepting(true);
 
@@ -1802,8 +1820,28 @@ protected void onDestroy() {
         }
     }
 
+    private boolean isCursorRestored = false;
+
+    /**
+     * 封装恢复逻辑：确保只执行一次
+     */
+    public void restoreCursorIfNecessary() {
+        if (!isCursorRestored) {
+            if (prefConfig.cursorAutoShow && cursorVisible && conn != null && connected) {
+                switchRemoteCursorShow();
+                saveCursorState(1); // 标记为已恢复/待处理
+            }
+            isCursorRestored = true; // 锁定，防止重复执行
+        }
+    }
+
     @Override
     protected void onPause() {
+        // 本地光标下，结束串流自动恢复光标显示
+        // 只有在非销毁（按 Home 键或切应用）的情况下尝试自动恢复
+        // 如果是通过按钮退出的，标志位会提前变为 true，这里就不会再跑一次
+        restoreCursorIfNecessary();
+
         // 当 Activity 进入后台时，必须停止拦截，否则会影响手机的正常使用！
         KeyboardAccessibilityService.setIntercepting(false);
 
@@ -1830,6 +1868,13 @@ protected void onPause() {
     protected void onStop() {
         super.onStop();
 
+        // 暂停串流时长计时（进入后台时串流实际上是暂停的）
+        if (isStreamingActive && lastActiveTime > 0) {
+            accumulatedStreamTime += System.currentTimeMillis() - lastActiveTime;
+            isStreamingActive = false;
+            LimeLog.info("串流时长计时暂停，已累计: " + (accumulatedStreamTime / 1000) + " 秒");
+        }
+
         // 检查是否是因为进入后台（包括锁屏、滑到任务栏、Home键）导致的应用停止
         // 只要 Activity 不是正在 Finishing（即不是用户点了退出或崩溃），且开启了快速恢复，就标记为需要恢复
         if (!shouldResumeSession && !isFinishing()) {
@@ -1928,7 +1973,15 @@ protected void onStop() {
 
         // 记录游戏流媒体结束事件
         if (analyticsManager != null && pcName != null && streamStartTime > 0) {
-            long streamDuration = System.currentTimeMillis() - streamStartTime;
+            // 计算精确的有效串流时长
+            // = 已累计的时间 + 当前活跃段时间（如果当前是活跃状态）
+            long effectiveStreamDuration = accumulatedStreamTime;
+            if (isStreamingActive && lastActiveTime > 0) {
+                effectiveStreamDuration += System.currentTimeMillis() - lastActiveTime;
+            }
+            
+            // 同时记录总耗时（包括后台暂停时间）用于对比
+            long totalElapsedTime = System.currentTimeMillis() - streamStartTime;
 
             // 收集性能数据
             int resolutionWidth = 0;
@@ -1943,9 +1996,17 @@ protected void onStop() {
                 averageDecoderLatency = decoderRenderer.getAverageDecoderLatency();
             }
 
-            analyticsManager.logGameStreamEnd(pcName, appName, streamDuration,
+            // 使用有效串流时长进行统计
+            analyticsManager.logGameStreamEnd(pcName, appName, effectiveStreamDuration,
                     decoderMessage, resolutionWidth, resolutionHeight,
                     averageEndToEndLatency, averageDecoderLatency);
+            
+            LimeLog.info("串流统计 - 有效时长: " + (effectiveStreamDuration / 1000) + "秒, 总耗时: " + (totalElapsedTime / 1000) + "秒");
+            
+            // 重置统计状态
+            streamStartTime = 0;
+            accumulatedStreamTime = 0;
+            isStreamingActive = false;
         }
 
         if (shouldResumeSession) {
@@ -1977,6 +2038,40 @@ private void setInputGrabState(boolean grab) {
 
     private final Runnable toggleGrab = () -> setInputGrabState(!grabbedInput);
 
+    private void switchRemoteCursorShow() {
+        final short[] keys = {
+                KeyboardTranslator.VK_LCONTROL,
+                KeyboardTranslator.VK_MENU,
+                KeyboardTranslator.VK_LSHIFT,
+                KeyboardTranslator.VK_N
+        };
+
+        final byte[] modifier = {0};
+
+        for (short key : keys) {
+            conn.sendKeyboardInput(key, KeyboardPacket.KEY_DOWN, modifier[0], (byte) 0);
+            modifier[0] |= getModBit(key);
+        }
+
+        handler.postDelayed(() -> {
+            for (int i = keys.length - 1; i >= 0; i--) {
+                short key = keys[i];
+                modifier[0] &= ~getModBit(key);
+                conn.sendKeyboardInput(key, KeyboardPacket.KEY_UP, modifier[0], (byte) 0);
+            }
+        }, 25L);
+    }
+
+    private byte getModBit(short key) {
+        switch (key) {
+            case KeyboardTranslator.VK_LSHIFT:   return KeyboardPacket.MODIFIER_SHIFT;
+            case KeyboardTranslator.VK_LCONTROL: return KeyboardPacket.MODIFIER_CTRL;
+            case KeyboardTranslator.VK_LWIN:     return KeyboardPacket.MODIFIER_META;
+            case KeyboardTranslator.VK_MENU:     return KeyboardPacket.MODIFIER_ALT;
+            default: return 0;
+        }
+    }
+
     // Returns true if the key stroke was consumed
     private boolean handleSpecialKeys(int androidKeyCode, boolean down) {
         int modifierMask = 0;
@@ -2035,10 +2130,17 @@ private boolean handleSpecialKeys(int androidKeyCode, boolean down) {
                             grabbedInput = true;
                         }
                         cursorVisible = !cursorVisible;
-                        if (cursorVisible) {
-                            inputCaptureProvider.showCursor();
-                        } else {
-                            inputCaptureProvider.hideCursor();
+                        // 切换本地光标时自动切换远程鼠标可见性
+                        if (prefConfig.cursorAutoShow && conn != null && connected) {
+                            switchRemoteCursorShow();
+                        }
+                        if (inputCaptureProvider.isCapturingEnabled()){
+                            Toast.makeText(this, "切换为本地鼠标模式", Toast.LENGTH_SHORT).show();
+                            inputCaptureProvider.disableCapture();
+                        }
+                        else {
+                            Toast.makeText(this, "切换为远程鼠标模式", Toast.LENGTH_SHORT).show();
+                            inputCaptureProvider.enableCapture();
                         }
                         break;
 
@@ -2556,11 +2658,17 @@ public void toggleKeyboard() {
     /**
      * 启用或禁用安卓本地鼠标指针
      */
-    public void enableNativeMousePointer(boolean enable) {
+    public void enableNativeMousePointer(boolean enable, boolean autoSwitch) {
         LimeLog.info("Setting native mouse pointer: " + enable);
 
         prefConfig.enableNativeMousePointer = enable;
 
+        if (autoSwitch && cursorVisible != enable) {
+            if (prefConfig.cursorAutoShow && conn != null && connected) {
+                switchRemoteCursorShow();
+            }
+        }
+
         if (enable) {
             // 启用本地鼠标指针：释放鼠标捕获但保持键盘捕获
             inputCaptureProvider.disableCapture();
@@ -3123,7 +3231,7 @@ else if (eventSource == InputDevice.SOURCE_MOUSE_RELATIVE &&
         int deviceSources = event.getDevice() != null ? event.getDevice().getSources() : 0;
 
         // 本地鼠标指针模式的特殊处理
-        if (prefConfig.enableNativeMousePointer && (eventSource & InputDevice.SOURCE_CLASS_POINTER) != 0) {
+        if (cursorVisible && (eventSource & InputDevice.SOURCE_CLASS_POINTER) != 0) {
             // 检查是否为真正的鼠标设备（而不是触摸屏）
             boolean isActualMouse = (eventSource == InputDevice.SOURCE_MOUSE) ||
                     (eventSource == InputDevice.SOURCE_MOUSE_RELATIVE) ||
@@ -3887,9 +3995,25 @@ public void connectionStarted() {
             Handler h = new Handler();
             h.postDelayed(() -> {
                 // 根据配置决定是否启用原生鼠标指针
+                int state = getCursorState();
                 if (prefConfig.enableNativeMousePointer) {
-                    enableNativeMousePointer(true);
+                    // 使用本地鼠标时，连接开始自动关闭远程光标显示
+                    if (state == 1) {
+                        // 状态为 1，说明上次退出或暂停时重新打开了远程光标显示，现在需要关闭
+                        if (prefConfig.cursorAutoShow) {
+                            switchRemoteCursorShow();
+                            saveCursorState(0); // 恢复后重置状态为 0
+                        }
+                    }
+                    enableNativeMousePointer(true, false);
                 } else {
+                    if (state == 0) {
+                        // 状态为 0，说明上次意外退出，已经是关闭状态，现在因为设置改变需要开启
+                        if (prefConfig.cursorAutoShow) {
+                            switchRemoteCursorShow();
+                        }
+                        saveCursorState(1);
+                    }
                     setInputGrabState(true);
                 }
             }, 500);
@@ -3955,8 +4079,13 @@ public void onPermissionRequested() {
             });
         }
 
-        // 记录游戏流媒体开始事件
+        // 初始化串流时长统计
         streamStartTime = System.currentTimeMillis();
+        accumulatedStreamTime = 0;
+        lastActiveTime = streamStartTime;
+        isStreamingActive = true;
+        
+        // 记录游戏流媒体开始事件
         if (analyticsManager != null && pcName != null) {
             analyticsManager.logGameStreamStart(pcName, appName);
         }
@@ -3972,6 +4101,13 @@ public void onPermissionRequested() {
     protected void onStart() {
         super.onStart();
 
+        // 恢复串流时长计时（从后台恢复时）
+        if (!isStreamingActive && streamStartTime > 0) {
+            lastActiveTime = System.currentTimeMillis();
+            isStreamingActive = true;
+            LimeLog.info("串流时长计时恢复，之前累计: " + (accumulatedStreamTime / 1000) + " 秒");
+        }
+
         if (shouldResumeSession) {
             LimeLog.info("从后台恢复，正在快速重连...");
 
@@ -4308,7 +4444,7 @@ private void initializeLocalCursorRenderers(int width, int height) {
                 // 3. 必须没开启原生鼠标 (防止冲突)
                 boolean shouldShow = prefConfig.enableLocalCursorRendering
                         && prefConfig.touchscreenTrackpad
-                        && !prefConfig.enableNativeMousePointer;
+                        && !cursorVisible;
 
                 relativeContext.setEnableLocalCursorRendering(shouldShow);
             }
@@ -4329,7 +4465,7 @@ private void destroyLocalCursorRenderers() {
     }
 
     public void refreshLocalCursorState(boolean enabled) {
-        boolean shouldRender = enabled && !prefConfig.enableNativeMousePointer;
+        boolean shouldRender = enabled && !cursorVisible;
 
         for (TouchContext context : relativeTouchContextMap) {
             if (context instanceof RelativeTouchContext) {
@@ -4508,7 +4644,7 @@ private void startCursorService(String hostIp) {
                             if (targetBitmap != null) {
                                 final android.graphics.Bitmap finalBmp = targetBitmap;
                                 runOnUiThread(() -> {
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && prefConfig.enableNativeMousePointer) {
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && cursorVisible) {
                                         // 方案B：当启用了原生指针且API版本符合时，使用 PointerIcon
                                         PointerIcon pointerIcon = PointerIcon.create(finalBmp, hotX, hotY);
                                         streamView.setPointerIcon(pointerIcon);
@@ -4537,7 +4673,7 @@ private void startCursorService(String hostIp) {
                             lastReceiveTime = System.currentTimeMillis(); // 重置计时，避免疯狂触发
 
                             runOnUiThread(() -> {
-                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && prefConfig.enableNativeMousePointer) {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && cursorVisible) {
                                     // 恢复为默认箭头
                                     streamView.setPointerIcon(PointerIcon.getSystemIcon(Game.this, PointerIcon.TYPE_ARROW));
                                 } else {