fix: voice call, select audio input device (#7922)

Signed-off-by: fufesou <shuanglongchen@yeah.net>
2025-10-29 17:00:05 +00:00 · 2024-05-07 16:18:48 +08:00
parent f08933f93c
commit 2c1595d0d5
50 changed files with 305 additions and 79 deletions
--- a/flutter/lib/common/widgets/audio_input.dart
+++ b/flutter/lib/common/widgets/audio_input.dart
@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
+
+typedef AudioINputSetDevice = void Function(String device);
+typedef AudioInputBuilder = Widget Function(
+    List<String> devices, String currentDevice, AudioINputSetDevice setDevice);
+
+class AudioInput extends StatelessWidget {
+  final AudioInputBuilder builder;
+
+  const AudioInput({Key? key, required this.builder}) : super(key: key);
+
+  static String getDefault() {
+    if (isWindows) return translate('System Sound');
+    return '';
+  }
+
+  static Future<String> getValue() async {
+    String device = await bind.mainGetOption(key: 'audio-input');
+    if (device.isNotEmpty) {
+      return device;
+    } else {
+      return getDefault();
+    }
+  }
+
+  static Future<void> setDevice(String device) async {
+    if (device == getDefault()) device = '';
+    await bind.mainSetOption(key: 'audio-input', value: device);
+  }
+
+  static Future<Map<String, Object>> getDevicesInfo() async {
+    List<String> devices = (await bind.mainGetSoundInputs()).toList();
+    if (isWindows) {
+      devices.insert(0, translate('System Sound'));
+    }
+    String current = await getValue();
+    return {'devices': devices, 'current': current};
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return futureBuilder(
+      future: getDevicesInfo(),
+      hasData: (data) {
+        String currentDevice = data['current'];
+        List<String> devices = data['devices'] as List<String>;
+        if (devices.isEmpty) {
+          return const Offstage();
+        }
+        return builder(devices, currentDevice, setDevice);
+      },
+    );
+  }
+}
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -6,6 +6,7 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/common/widgets/audio_input.dart';
 import 'package:flutter_hbb/common/widgets/setting_widgets.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
@@ -469,38 +470,7 @@ class _GeneralState extends State<_General> {
      return const Offstage();
    }

-    String getDefault() {
-      if (isWindows) return translate('System Sound');
-      return '';
-    }
-
-    Future<String> getValue() async {
-      String device = await bind.mainGetOption(key: 'audio-input');
-      if (device.isNotEmpty) {
-        return device;
-      } else {
-        return getDefault();
-      }
-    }
-
-    setDevice(String device) {
-      if (device == getDefault()) device = '';
-      bind.mainSetOption(key: 'audio-input', value: device);
-    }
-
-    return futureBuilder(future: () async {
-      List<String> devices = (await bind.mainGetSoundInputs()).toList();
-      if (isWindows) {
-        devices.insert(0, translate('System Sound'));
-      }
-      String current = await getValue();
-      return {'devices': devices, 'current': current};
-    }(), hasData: (data) {
-      String currentDevice = data['current'];
-      List<String> devices = data['devices'] as List<String>;
-      if (devices.isEmpty) {
-        return const Offstage();
-      }
+    return AudioInput(builder: (devices, currentDevice, setDevice) {
      return _Card(title: 'Audio Input Device', children: [
        ...devices.map((device) => _Radio<String>(context,
                value: device,
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:math';

 import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common/widgets/audio_input.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
@@ -701,17 +702,86 @@ class _CmControlPanel extends StatelessWidget {
      children: [
        Offstage(
          offstage: !client.inVoiceCall,
-          child: buildButton(
-            context,
-            color: Colors.red,
-            onClick: () => closeVoiceCall(),
-            icon: Icon(
-              Icons.call_end_rounded,
-              color: Colors.white,
-              size: 14,
-            ),
-            text: "Stop voice call",
-            textColor: Colors.white,
+          child: Row(
+            children: [
+              Expanded(
+                child: buildButton(context,
+                    color: MyTheme.accent,
+                    onClick: null, onTapDown: (details) async {
+                  final devicesInfo = await AudioInput.getDevicesInfo();
+                  List<String> devices = devicesInfo['devices'] as List<String>;
+                  if (devices.isEmpty) {
+                    msgBox(
+                      gFFI.sessionId,
+                      'custom-nocancel-info',
+                      'Prompt',
+                      'no_audio_input_device_tip',
+                      '',
+                      gFFI.dialogManager,
+                    );
+                    return;
+                  }
+
+                  String currentDevice = devicesInfo['current'] as String;
+                  final x = details.globalPosition.dx;
+                  final y = details.globalPosition.dy;
+                  final position = RelativeRect.fromLTRB(x, y, x, y);
+                  showMenu(
+                    context: context,
+                    position: position,
+                    items: devices
+                        .map((d) => PopupMenuItem<String>(
+                              value: d,
+                              height: 18,
+                              padding: EdgeInsets.zero,
+                              onTap: () => AudioInput.setDevice(d),
+                              child: IgnorePointer(
+                                  child: RadioMenuButton(
+                                value: d,
+                                groupValue: currentDevice,
+                                onChanged: (v) {
+                                  if (v != null) AudioInput.setDevice(v);
+                                },
+                                child: Container(
+                                  child: Text(
+                                    d,
+                                    overflow: TextOverflow.ellipsis,
+                                    maxLines: 1,
+                                  ),
+                                  constraints: BoxConstraints(
+                                      maxWidth:
+                                          kConnectionManagerWindowSizeClosedChat
+                                                  .width -
+                                              80),
+                                ),
+                              )),
+                            ))
+                        .toList(),
+                  );
+                },
+                    icon: Icon(
+                      Icons.call_rounded,
+                      color: Colors.white,
+                      size: 14,
+                    ),
+                    text: "Audio input",
+                    textColor: Colors.white),
+              ),
+              Expanded(
+                child: buildButton(
+                  context,
+                  color: Colors.red,
+                  onClick: () => closeVoiceCall(),
+                  icon: Icon(
+                    Icons.call_end_rounded,
+                    color: Colors.white,
+                    size: 14,
+                  ),
+                  text: "Stop voice call",
+                  textColor: Colors.white,
+                ),
+              )
+            ],
          ),
        ),
        Offstage(
@@ -872,12 +942,14 @@ class _CmControlPanel extends StatelessWidget {

  Widget buildButton(BuildContext context,
      {required Color? color,
-      required Function() onClick,
-      Icon? icon,
+      GestureTapCallback? onClick,
+      Widget? icon,
      BoxBorder? border,
      required String text,
      required Color? textColor,
-      String? tooltip}) {
+      String? tooltip,
+      GestureTapDownCallback? onTapDown}) {
+    assert(!(onClick == null && onTapDown == null));
    Widget textWidget;
    if (icon != null) {
      textWidget = Text(
@@ -901,7 +973,16 @@ class _CmControlPanel extends StatelessWidget {
          color: color, borderRadius: borderRadius, border: border),
      child: InkWell(
        borderRadius: borderRadius,
-        onTap: () => checkClickTime(client.id, onClick),
+        onTap: () {
+          if (onClick == null) return;
+          checkClickTime(client.id, onClick);
+        },
+        onTapDown: (details) {
+          if (onTapDown == null) return;
+          checkClickTime(client.id, () {
+            onTapDown.call(details);
+          });
+        },
        child: Row(
          mainAxisAlignment: MainAxisAlignment.center,
          children: [
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -3,6 +3,7 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_hbb/common/widgets/audio_input.dart';
 import 'package:flutter_hbb/common/widgets/toolbar.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
@@ -1953,34 +1954,71 @@ class _VoiceCallMenu extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    menuChildrenGetter() {
+      final audioInput =
+          AudioInput(builder: (devices, currentDevice, setDevice) {
+        return Column(
+          children: devices
+              .map((d) => RdoMenuButton<String>(
+                    child: Container(
+                      child: Text(
+                        d,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                      constraints: BoxConstraints(maxWidth: 250),
+                    ),
+                    value: d,
+                    groupValue: currentDevice,
+                    onChanged: (v) {
+                      if (v != null) setDevice(v);
+                    },
+                    ffi: ffi,
+                  ))
+              .toList(),
+        );
+      });
+      return [
+        audioInput,
+        Divider(),
+        MenuButton(
+          child: Text(translate('End call')),
+          onPressed: () => bind.sessionCloseVoiceCall(sessionId: ffi.sessionId),
+          ffi: ffi,
+        ),
+      ];
+    }
+
    return Obx(
      () {
-        final String tooltip;
-        final String icon;
        switch (ffi.chatModel.voiceCallStatus.value) {
          case VoiceCallStatus.waitingForResponse:
-            tooltip = "Waiting";
-            icon = "assets/call_wait.svg";
-            break;
+            return buildCallWaiting(context);
          case VoiceCallStatus.connected:
-            tooltip = "Disconnect";
-            icon = "assets/call_end.svg";
-            break;
+            return _IconSubmenuButton(
+              tooltip: 'Voice call',
+              svg: 'assets/voice_call.svg',
+              color: _ToolbarTheme.blueColor,
+              hoverColor: _ToolbarTheme.hoverBlueColor,
+              menuChildrenGetter: menuChildrenGetter,
+              ffi: ffi,
+            );
          default:
            return Offstage();
        }
-        return _IconMenuButton(
-            assetName: icon,
-            tooltip: tooltip,
-            onPressed: () =>
-                bind.sessionCloseVoiceCall(sessionId: ffi.sessionId),
-            color: _ToolbarTheme.redColor,
-            hoverColor: _ToolbarTheme.hoverRedColor);
      },
    );
  }
-}

+  Widget buildCallWaiting(BuildContext context) {
+    return _IconMenuButton(
+      assetName: "assets/call_wait.svg",
+      tooltip: "Waiting",
+      onPressed: () => bind.sessionCloseVoiceCall(sessionId: ffi.sessionId),
+      color: _ToolbarTheme.redColor,
+      hoverColor: _ToolbarTheme.hoverRedColor,
+    );
+  }
+}
 class _RecordMenu extends StatelessWidget {
  const _RecordMenu({Key? key}) : super(key: key);

@@ -2115,7 +2153,7 @@ class _IconSubmenuButton extends StatefulWidget {
  final Color hoverColor;
  final List<Widget> Function() menuChildrenGetter;
  final MenuStyle? menuStyle;
-  final FFI ffi;
+  final FFI? ffi;
  final double? width;

  _IconSubmenuButton({
@@ -2126,7 +2164,7 @@ class _IconSubmenuButton extends StatefulWidget {
    required this.color,
    required this.hoverColor,
    required this.menuChildrenGetter,
-    required this.ffi,
+    this.ffi,
    this.menuStyle,
    this.width,
  }) : super(key: key);
@@ -2208,13 +2246,13 @@ class MenuButton extends StatelessWidget {
  final VoidCallback? onPressed;
  final Widget? trailingIcon;
  final Widget? child;
-  final FFI ffi;
+  final FFI? ffi;
  MenuButton(
      {Key? key,
      this.onPressed,
      this.trailingIcon,
      required this.child,
-      required this.ffi})
+      this.ffi})
      : super(key: key);

  @override
@@ -2223,7 +2261,9 @@ class MenuButton extends StatelessWidget {
        key: key,
        onPressed: onPressed != null
            ? () {
-                _menuDismissCallback(ffi);
+                if (ffi != null) {
+                  _menuDismissCallback(ffi!);
+                }
                onPressed?.call();
              }
            : null,
@@ -2236,13 +2276,13 @@ class CkbMenuButton extends StatelessWidget {
  final bool? value;
  final ValueChanged<bool?>? onChanged;
  final Widget? child;
-  final FFI ffi;
+  final FFI? ffi;
  const CkbMenuButton(
      {Key? key,
      required this.value,
      required this.onChanged,
      required this.child,
-      required this.ffi})
+      this.ffi})
      : super(key: key);

  @override
@@ -2253,7 +2293,9 @@ class CkbMenuButton extends StatelessWidget {
      child: child,
      onChanged: onChanged != null
          ? (bool? value) {
-              _menuDismissCallback(ffi);
+              if (ffi != null) {
+                _menuDismissCallback(ffi!);
+              }
              onChanged?.call(value);
            }
          : null,
@@ -2266,13 +2308,13 @@ class RdoMenuButton<T> extends StatelessWidget {
  final T? groupValue;
  final ValueChanged<T?>? onChanged;
  final Widget? child;
-  final FFI ffi;
+  final FFI? ffi;
  const RdoMenuButton({
    Key? key,
    required this.value,
    required this.groupValue,
    required this.child,
-    required this.ffi,
+    this.ffi,
    this.onChanged,
  }) : super(key: key);

@@ -2284,7 +2326,9 @@ class RdoMenuButton<T> extends StatelessWidget {
      child: child,
      onChanged: onChanged != null
          ? (T? value) {
-              _menuDismissCallback(ffi);
+              if (ffi != null) {
+                _menuDismissCallback(ffi!);
+              }
              onChanged?.call(value);
            }
          : null,
@@ -2471,10 +2515,11 @@ class InputModeMenu {

 _menuDismissCallback(FFI ffi) => ffi.inputModel.refreshMousePos();

-Widget _buildPointerTrackWidget(Widget child, FFI ffi) {
+Widget _buildPointerTrackWidget(Widget child, FFI? ffi) {
  return Listener(
-    onPointerHover: (PointerHoverEvent e) =>
-        ffi.inputModel.lastMousePos = e.position,
+    onPointerHover: (PointerHoverEvent e) => {
+      if (ffi != null) {ffi.inputModel.lastMousePos = e.position}
+    },
    child: MouseRegion(
      child: child,
    ),