feat(remote): 修复键盘输入映射并重构连接流程
- Android端注入按键时显式设置SOURCE_KEYBOARD，修复IME丢弃事件导致输入框无法输入文字的问题 - Flutter端新增Flutter逻辑键到Android keyCode的转换映射，避免功能键误触发 - 重构RemoteController，分离信令连接与远程控制逻辑，支持设备列表选择与配对码兑换 - AuthRepository接口新增getBindings、getOnlineDevices、redeemPairingCode方法 - DioAuthRepository实现401自动刷新token重试机制 - ConnectionSessionState扩展设备列表、在线状态、配对码等状态字段
This commit is contained in:
TongTongStudio
@@ -8,6 +8,7 @@ import '../../auth/data/auth_providers.dart';
|
||||
import '../data/remote_controller.dart';
|
||||
import '../data/self_codec_decoder.dart';
|
||||
import '../data/video_recorder.dart';
|
||||
import '../domain/binding_device.dart';
|
||||
import '../domain/connection_session_state.dart';
|
||||
|
||||
part 'connection_controller.g.dart';
|
||||
@@ -40,32 +41,159 @@ class ConnectionController extends _$ConnectionController {
|
||||
|
||||
void _clearAlert() => state = state.copyWith(alert: null);
|
||||
|
||||
/// 发起连接：先确保已登录，携带 Bearer 建立信令，成功后建立 WebRTC。
|
||||
Future<void> connect({
|
||||
required String serverUrl,
|
||||
required String targetDeviceId,
|
||||
required String authType,
|
||||
required String authValue,
|
||||
}) async {
|
||||
if (serverUrl.isEmpty || targetDeviceId.isEmpty) {
|
||||
_alert('请填写服务器地址和目标设备ID');
|
||||
/// 仅建立信令（WebSocket）连接，**不**发起远程控制。
|
||||
///
|
||||
/// 进入设置页即可调用；重复调用会被忽略。
|
||||
Future<void> connectSignaling({required String serverUrl}) async {
|
||||
if (serverUrl.isEmpty) {
|
||||
_alert('信令服务器地址为空');
|
||||
return;
|
||||
}
|
||||
if (_remote != null || state.signalingConnected) return;
|
||||
|
||||
final authRepository = ref.read(authRepositoryProvider);
|
||||
state = state.copyWith(connecting: true, status: '状态: 正在连接信令服务器...');
|
||||
|
||||
_remote = RemoteController(
|
||||
serverUrl: serverUrl,
|
||||
targetDeviceId: targetDeviceId,
|
||||
authRepository: authRepository,
|
||||
);
|
||||
_wireRemoteCallbacks();
|
||||
await _remote!.connect(authType: authType, authValue: authValue);
|
||||
await _remote!.connectSignaling();
|
||||
}
|
||||
|
||||
/// 发起远程控制：需信令已就绪，向目标设备创建 Offer。
|
||||
Future<void> startControl({
|
||||
required String targetDeviceId,
|
||||
required String authType,
|
||||
required String authValue,
|
||||
}) async {
|
||||
if (targetDeviceId.isEmpty) {
|
||||
_alert('请填写目标设备ID');
|
||||
return;
|
||||
}
|
||||
if (!state.signalingConnected || _remote == null) {
|
||||
_alert('信令未就绪，请稍后重试');
|
||||
return;
|
||||
}
|
||||
state = state.copyWith(connecting: true, status: '状态: 正在发起连接...');
|
||||
_remote!.startControl(
|
||||
target: targetDeviceId,
|
||||
authType: authType,
|
||||
authValue: authValue,
|
||||
);
|
||||
}
|
||||
|
||||
/// 拉取已绑定设备列表，并合并在线设备状态。
|
||||
///
|
||||
/// 参考 Android 控制端的 [MainViewModel.loadBindings] / [getOnlineDevices]，
|
||||
/// 用在线列表标记绑定设备是否可立即连接。
|
||||
Future<void> loadDevices() async {
|
||||
final authRepository = ref.read(authRepositoryProvider);
|
||||
state = state.copyWith(deviceRefreshing: true, deviceError: null);
|
||||
try {
|
||||
final bindings = await authRepository.getBindings();
|
||||
List<BindingDevice> online = const [];
|
||||
try {
|
||||
online = await authRepository.getOnlineDevices();
|
||||
} on Object {
|
||||
// 在线列表接口失败时，仍展示全部绑定（仅不标记在线）。
|
||||
}
|
||||
final onlineUids = {for (final d in online) d.deviceUid};
|
||||
final merged = [
|
||||
for (final b in bindings)
|
||||
b.copyWith(online: onlineUids.contains(b.deviceUid)),
|
||||
];
|
||||
final stillSelected = merged
|
||||
.where((b) => b.deviceUid == state.selectedDeviceUid)
|
||||
.isNotEmpty;
|
||||
state = state.copyWith(
|
||||
bindings: merged,
|
||||
onlineUids: onlineUids,
|
||||
deviceRefreshing: false,
|
||||
selectedDeviceUid: stillSelected ? state.selectedDeviceUid : null,
|
||||
);
|
||||
} on Object catch (e) {
|
||||
debugPrint(e.toString());
|
||||
state = state.copyWith(
|
||||
deviceRefreshing: false,
|
||||
deviceError: '加载绑定设备失败：$e',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 在绑定设备列表中选择一个目标设备（仅记录选择，不下发连接）。
|
||||
void selectDevice(String uid) {
|
||||
if (state.selectedDeviceUid == uid) return;
|
||||
state = state.copyWith(selectedDeviceUid: uid);
|
||||
}
|
||||
|
||||
/// 当前选中的绑定设备（无则返回 null）。
|
||||
BindingDevice? get selectedDevice {
|
||||
final uid = state.selectedDeviceUid;
|
||||
if (uid == null) return null;
|
||||
for (final b in state.bindings) {
|
||||
if (b.deviceUid == uid) return b;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// 向选中的绑定设备发起远程控制。
|
||||
///
|
||||
/// 鉴权方式取自 [BindingDevice.authType]，凭据由 UI 的鉴权对话框收集后传入。
|
||||
Future<void> connectSelectedDevice({
|
||||
required String authType,
|
||||
required String authValue,
|
||||
}) async {
|
||||
final target = selectedDevice;
|
||||
if (target == null) {
|
||||
_alert('请先选择一个绑定的设备');
|
||||
return;
|
||||
}
|
||||
if (!target.online) {
|
||||
_alert('设备「${target.name}」当前不在线，无法连接');
|
||||
return;
|
||||
}
|
||||
await startControl(
|
||||
targetDeviceId: target.deviceUid,
|
||||
authType: authType,
|
||||
authValue: authValue,
|
||||
);
|
||||
}
|
||||
|
||||
/// 使用被控端展示的配对码建立绑定关系，并刷新绑定设备列表。
|
||||
Future<bool> redeemPairingCode(String code) async {
|
||||
final trimmed = code.trim();
|
||||
if (trimmed.isEmpty) {
|
||||
state = state.copyWith(redeemError: '请输入配对码');
|
||||
return false;
|
||||
}
|
||||
final authRepository = ref.read(authRepositoryProvider);
|
||||
state = state.copyWith(redeeming: true, redeemError: null);
|
||||
try {
|
||||
await authRepository.redeemPairingCode(trimmed);
|
||||
state = state.copyWith(redeeming: false);
|
||||
await loadDevices();
|
||||
return true;
|
||||
} on Object catch (e) {
|
||||
state = state.copyWith(redeeming: false, redeemError: '绑定失败：$e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// 清除配对码兑换错误提示。
|
||||
void clearRedeemError() => state.copyWith(redeemError: null);
|
||||
|
||||
void _wireRemoteCallbacks() {
|
||||
final remote = _remote!;
|
||||
remote.onStatusChanged = _setStatus;
|
||||
remote.onRegistered = (myDeviceId) {
|
||||
state = state.copyWith(
|
||||
signalingConnected: true,
|
||||
connecting: false,
|
||||
myDeviceId: myDeviceId,
|
||||
);
|
||||
};
|
||||
remote.onConnectionEstablished = () {
|
||||
state = state.copyWith(
|
||||
connected: true,
|
||||
@@ -78,20 +206,26 @@ class ConnectionController extends _$ConnectionController {
|
||||
_alert('连接失败：$error');
|
||||
};
|
||||
remote.onDisconnected = () {
|
||||
state = state.copyWith(connected: false, connecting: false);
|
||||
state = state.copyWith(
|
||||
connected: false,
|
||||
connecting: false,
|
||||
signalingConnected: false,
|
||||
myDeviceId: null,
|
||||
);
|
||||
_setStatus('状态: 远端已断开');
|
||||
};
|
||||
// 以下三种情况仅结束远程控制，保留信令连接以便重新发起。
|
||||
remote.onIceDisconnected = (message) {
|
||||
_alert(message);
|
||||
disconnect();
|
||||
stopControl();
|
||||
};
|
||||
remote.onTargetOffline = (message) {
|
||||
_alert(message);
|
||||
state = state.copyWith(connected: false, connecting: false);
|
||||
stopControl();
|
||||
};
|
||||
remote.onConnectionRejected = (message) {
|
||||
_alert(message);
|
||||
state = state.copyWith(connected: false, connecting: false);
|
||||
stopControl();
|
||||
};
|
||||
remote.onRemoteStream = (renderer) {
|
||||
_renderer = renderer;
|
||||
@@ -114,7 +248,8 @@ class ConnectionController extends _$ConnectionController {
|
||||
};
|
||||
remote.onStreamModeReport = (mode) {
|
||||
state = state.copyWith(streamMode: mode);
|
||||
if (mode == SelfCodecDecoder.streamModeWebRtc && state.pendingRecordStart) {
|
||||
if (mode == SelfCodecDecoder.streamModeWebRtc &&
|
||||
state.pendingRecordStart) {
|
||||
state = state.copyWith(pendingRecordStart: false);
|
||||
_startRecording();
|
||||
}
|
||||
@@ -261,7 +396,23 @@ class ConnectionController extends _$ConnectionController {
|
||||
_remote?.sendControlCommand(command);
|
||||
}
|
||||
|
||||
/// 断开连接并复位全部 UI 状态。
|
||||
/// 结束远程控制但保持信令连接，便于重新选择设备发起连接。
|
||||
Future<void> stopControl() async {
|
||||
await _videoRecorder.dispose();
|
||||
await _remote?.stopControl();
|
||||
_renderer?.removeListener(_onRendererUpdate);
|
||||
_renderer = null;
|
||||
_lastResizedAspect = 0;
|
||||
final signalingAlive = state.signalingConnected;
|
||||
state = ConnectionSessionState(
|
||||
status: signalingAlive ? '状态: 已连接信令服务器' : '状态: 已停止',
|
||||
signalingConnected: signalingAlive,
|
||||
myDeviceId: state.myDeviceId,
|
||||
alert: state.alert,
|
||||
);
|
||||
}
|
||||
|
||||
/// 断开全部连接（含信令）并复位 UI 状态。
|
||||
Future<void> disconnect() async {
|
||||
await _videoRecorder.dispose();
|
||||
await _remote?.disconnect();
|
||||
@@ -269,7 +420,7 @@ class ConnectionController extends _$ConnectionController {
|
||||
_renderer?.removeListener(_onRendererUpdate);
|
||||
_renderer = null;
|
||||
_lastResizedAspect = 0;
|
||||
state = const ConnectionSessionState(status: '状态: 已停止');
|
||||
state = ConnectionSessionState(status: '状态: 已停止', alert: state.alert);
|
||||
}
|
||||
|
||||
/// 消费一次性提示消息（UI 展示后调用）。
|
||||
|
||||
Reference in New Issue
Block a user