feat: M1.1 完成 + M1.2 启动 — 全量更新
M1.1 收尾: - 24项 P0/P1/P2 bug 修复 (Rust 107 tests + Flutter 15 tests) - Flutter App v0.3: cupertino_icons 修复, 单元测试, 调试面板, APK 52.6MB - 示例插件完善: manifest.json + 请求/响应示范 + 7个测试 - API 文档重写 (以 routes.rs 为唯一权威) - MILESTONES.md 更新至 100% M1.2 启动: - P0: 插件管理 API 闭环 (handle_manager_message Custom 分支 + broadcast_plugin_states) - ServiceManager 集成测试 8/8 (tests/m1_2_service_manager.rs) - M1.2 测试计划 (docs/M1.2_TEST_PLAN.md, 18个E2E场景) - 动态插件系统: auto_rollback + version_manager GC + 路径穿越防护 总计: Rust 115/115 测试, Flutter 15/15 测试, 零 warning Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
showen
@@ -4,11 +4,15 @@ import 'package:flutter/foundation.dart';
|
||||
|
||||
import '../models/ble_models.dart';
|
||||
import '../services/ble_service.dart';
|
||||
import 'debug_provider.dart';
|
||||
|
||||
class BleProvider extends ChangeNotifier {
|
||||
BleProvider({BleService? bleService}) : _bleService = bleService ?? BleService();
|
||||
BleProvider({BleService? bleService, required DebugProvider debugProvider})
|
||||
: _bleService = bleService ?? BleService(),
|
||||
_debugProvider = debugProvider;
|
||||
|
||||
final BleService _bleService;
|
||||
final DebugProvider _debugProvider;
|
||||
|
||||
StreamSubscription<List<BleDevice>>? _scanSubscription;
|
||||
StreamSubscription<BleStatus>? _statusSubscription;
|
||||
@@ -21,6 +25,7 @@ class BleProvider extends ChangeNotifier {
|
||||
bool _isScanning = false;
|
||||
bool _isConnecting = false;
|
||||
bool _isProvisioning = false;
|
||||
bool _isSendingCommand = false;
|
||||
bool _isConnected = false;
|
||||
bool _isDisposed = false;
|
||||
|
||||
@@ -32,9 +37,11 @@ class BleProvider extends ChangeNotifier {
|
||||
bool get isScanning => _isScanning;
|
||||
bool get isConnecting => _isConnecting;
|
||||
bool get isProvisioning => _isProvisioning;
|
||||
bool get isSendingCommand => _isSendingCommand;
|
||||
bool get isConnected => _isConnected;
|
||||
|
||||
Future<void> startScan() async {
|
||||
_debugProvider.addBleLog('Start BLE scan');
|
||||
_errorMessage = null;
|
||||
_selectedDevice = null;
|
||||
_isConnected = false;
|
||||
@@ -47,23 +54,31 @@ class BleProvider extends ChangeNotifier {
|
||||
.scanForShowenDevices()
|
||||
.listen((List<BleDevice> scannedDevices) {
|
||||
_devices = scannedDevices;
|
||||
_debugProvider.addBleLog(
|
||||
'BLE scan update (${scannedDevices.length} devices)',
|
||||
);
|
||||
_notifySafely();
|
||||
}, onError: (Object error, StackTrace stackTrace) {
|
||||
_errorMessage = error.toString();
|
||||
_isScanning = false;
|
||||
_provisioningState = ProvisioningState.failed;
|
||||
_debugProvider.addBleLog('BLE scan failed', details: error);
|
||||
_notifySafely();
|
||||
});
|
||||
|
||||
Future<void>.delayed(const Duration(seconds: 6), () {
|
||||
if (_isScanning) {
|
||||
_isScanning = false;
|
||||
_debugProvider.addBleLog('BLE scan completed');
|
||||
_notifySafely();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> connectToDevice(BleDevice device) async {
|
||||
_debugProvider.addBleLog(
|
||||
'Connect BLE device ${device.name.isNotEmpty ? device.name : device.id}',
|
||||
);
|
||||
_selectedDevice = device;
|
||||
_errorMessage = null;
|
||||
_isConnecting = true;
|
||||
@@ -75,10 +90,12 @@ class BleProvider extends ChangeNotifier {
|
||||
await _bleService.connectToDevice(device);
|
||||
await _subscribeToStatus();
|
||||
_isConnected = true;
|
||||
_debugProvider.addBleLog('BLE device connected');
|
||||
} catch (error) {
|
||||
_isConnected = false;
|
||||
_errorMessage = error.toString();
|
||||
_provisioningState = ProvisioningState.failed;
|
||||
_debugProvider.addBleLog('BLE connect failed', details: error);
|
||||
rethrow;
|
||||
} finally {
|
||||
_isConnecting = false;
|
||||
@@ -87,6 +104,10 @@ class BleProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
Future<void> provisionWifi(String ssid, String password) async {
|
||||
_debugProvider.addBleLog(
|
||||
'Provision WiFi over BLE',
|
||||
details: <String, Object>{'ssid': ssid},
|
||||
);
|
||||
_errorMessage = null;
|
||||
_latestStatus = null;
|
||||
_isProvisioning = true;
|
||||
@@ -115,14 +136,19 @@ class BleProvider extends ChangeNotifier {
|
||||
: ProvisioningState.failed;
|
||||
if (!result.ok) {
|
||||
_errorMessage = result.error ?? 'WiFi provisioning failed';
|
||||
_debugProvider.addBleLog('BLE provisioning returned failure', details: result.error);
|
||||
} else {
|
||||
_debugProvider.addBleLog('BLE provisioning succeeded');
|
||||
}
|
||||
} on TimeoutException {
|
||||
_errorMessage = 'BLE 配网超时（30 秒）';
|
||||
_provisioningState = ProvisioningState.failed;
|
||||
_debugProvider.addBleLog('BLE provisioning timed out');
|
||||
rethrow;
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_provisioningState = ProvisioningState.failed;
|
||||
_debugProvider.addBleLog('BLE provisioning failed', details: error);
|
||||
rethrow;
|
||||
} finally {
|
||||
_isProvisioning = false;
|
||||
@@ -140,10 +166,31 @@ class BleProvider extends ChangeNotifier {
|
||||
_isConnecting = false;
|
||||
_isProvisioning = false;
|
||||
_selectedDevice = null;
|
||||
_debugProvider.addBleLog('BLE disconnected');
|
||||
_notifySafely();
|
||||
}
|
||||
|
||||
Future<void> sendCommand(String command) async {
|
||||
_debugProvider.addBleLog('Send BLE command', details: command);
|
||||
_errorMessage = null;
|
||||
_isSendingCommand = true;
|
||||
_notifySafely();
|
||||
|
||||
try {
|
||||
await _bleService.sendCommand(command);
|
||||
_debugProvider.addBleLog('BLE command sent', details: command);
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addBleLog('BLE command failed', details: error);
|
||||
rethrow;
|
||||
} finally {
|
||||
_isSendingCommand = false;
|
||||
_notifySafely();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> retryScan() async {
|
||||
_debugProvider.addBleLog('Retry BLE scan');
|
||||
await disconnect();
|
||||
_devices = const <BleDevice>[];
|
||||
_latestStatus = null;
|
||||
@@ -158,6 +205,15 @@ class BleProvider extends ChangeNotifier {
|
||||
final Stream<BleStatus> stream = await _bleService.subscribeToStatus();
|
||||
_statusSubscription = stream.listen((BleStatus status) {
|
||||
_latestStatus = status;
|
||||
_debugProvider.addBleLog(
|
||||
'BLE status update',
|
||||
details: <String, Object?>{
|
||||
'ok': status.ok,
|
||||
'action': status.action,
|
||||
'state': status.state,
|
||||
'error': status.error,
|
||||
},
|
||||
);
|
||||
if (!status.ok) {
|
||||
_errorMessage = status.error ?? 'BLE status returned an error';
|
||||
}
|
||||
@@ -174,6 +230,7 @@ class BleProvider extends ChangeNotifier {
|
||||
}, onError: (Object error, StackTrace stackTrace) {
|
||||
_errorMessage = error.toString();
|
||||
_provisioningState = ProvisioningState.failed;
|
||||
_debugProvider.addBleLog('BLE status stream failed', details: error);
|
||||
_notifySafely();
|
||||
});
|
||||
}
|
||||
|
||||
214
clients/flutter/lib/providers/debug_provider.dart
Normal file
214
clients/flutter/lib/providers/debug_provider.dart
Normal file
@@ -0,0 +1,214 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import '../models/app_event.dart';
|
||||
import '../services/web_socket_service.dart';
|
||||
|
||||
enum DebugLogType { ble, ws, http }
|
||||
|
||||
enum DebugLogFilter { all, ble, ws, http }
|
||||
|
||||
class DebugLogEntry {
|
||||
const DebugLogEntry({
|
||||
required this.timestamp,
|
||||
required this.type,
|
||||
required this.summary,
|
||||
this.details,
|
||||
});
|
||||
|
||||
final DateTime timestamp;
|
||||
final DebugLogType type;
|
||||
final String summary;
|
||||
final String? details;
|
||||
|
||||
String get label {
|
||||
switch (type) {
|
||||
case DebugLogType.ble:
|
||||
return 'BLE';
|
||||
case DebugLogType.ws:
|
||||
return 'WS';
|
||||
case DebugLogType.http:
|
||||
return 'HTTP';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class DebugProvider extends ChangeNotifier {
|
||||
DebugProvider({required WebSocketService webSocketService}) {
|
||||
_eventSubscription = webSocketService.events.listen(_handleEvent);
|
||||
_connectionSubscription = webSocketService.connectionStateStream.listen(
|
||||
_handleConnectionState,
|
||||
);
|
||||
}
|
||||
|
||||
static const int maxEntries = 500;
|
||||
|
||||
final List<DebugLogEntry> _entries = <DebugLogEntry>[];
|
||||
late final StreamSubscription<AppEvent> _eventSubscription;
|
||||
late final StreamSubscription<WsConnectionState> _connectionSubscription;
|
||||
|
||||
DebugLogFilter _filter = DebugLogFilter.all;
|
||||
|
||||
List<DebugLogEntry> get entries => List<DebugLogEntry>.unmodifiable(_entries);
|
||||
DebugLogFilter get filter => _filter;
|
||||
|
||||
List<DebugLogEntry> get filteredEntries {
|
||||
switch (_filter) {
|
||||
case DebugLogFilter.all:
|
||||
return entries.reversed.toList(growable: false);
|
||||
case DebugLogFilter.ble:
|
||||
return _entries
|
||||
.where((entry) => entry.type == DebugLogType.ble)
|
||||
.toList(growable: false)
|
||||
.reversed
|
||||
.toList(growable: false);
|
||||
case DebugLogFilter.ws:
|
||||
return _entries
|
||||
.where((entry) => entry.type == DebugLogType.ws)
|
||||
.toList(growable: false)
|
||||
.reversed
|
||||
.toList(growable: false);
|
||||
case DebugLogFilter.http:
|
||||
return _entries
|
||||
.where((entry) => entry.type == DebugLogType.http)
|
||||
.toList(growable: false)
|
||||
.reversed
|
||||
.toList(growable: false);
|
||||
}
|
||||
}
|
||||
|
||||
void setFilter(DebugLogFilter value) {
|
||||
if (_filter == value) {
|
||||
return;
|
||||
}
|
||||
_filter = value;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void clearLogs() {
|
||||
if (_entries.isEmpty) {
|
||||
return;
|
||||
}
|
||||
_entries.clear();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void addHttpLog(String summary, {Object? details}) {
|
||||
_addEntry(DebugLogType.http, summary, details: details);
|
||||
}
|
||||
|
||||
void addBleLog(String summary, {Object? details}) {
|
||||
_addEntry(DebugLogType.ble, summary, details: details);
|
||||
}
|
||||
|
||||
void addWsLog(String summary, {Object? details}) {
|
||||
_addEntry(DebugLogType.ws, summary, details: details);
|
||||
}
|
||||
|
||||
void _handleEvent(AppEvent event) {
|
||||
final logType = _inferType(event);
|
||||
_addEntry(
|
||||
logType,
|
||||
_buildEventSummary(event, logType),
|
||||
details: <String, dynamic>{
|
||||
'type': event.type,
|
||||
'payload': event.payload,
|
||||
},
|
||||
notify: true,
|
||||
);
|
||||
}
|
||||
|
||||
void _handleConnectionState(WsConnectionState state) {
|
||||
final String summary;
|
||||
switch (state) {
|
||||
case WsConnectionState.connected:
|
||||
summary = 'WebSocket connected';
|
||||
break;
|
||||
case WsConnectionState.connecting:
|
||||
summary = 'WebSocket reconnecting';
|
||||
break;
|
||||
case WsConnectionState.disconnected:
|
||||
summary = 'WebSocket disconnected';
|
||||
break;
|
||||
}
|
||||
_addEntry(DebugLogType.ws, summary, notify: true);
|
||||
}
|
||||
|
||||
DebugLogType _inferType(AppEvent event) {
|
||||
if (event.type.contains('ble')) {
|
||||
return DebugLogType.ble;
|
||||
}
|
||||
return DebugLogType.ws;
|
||||
}
|
||||
|
||||
String _buildEventSummary(AppEvent event, DebugLogType type) {
|
||||
final payload = event.payload;
|
||||
switch (event.type) {
|
||||
case 'ble_update':
|
||||
final ready = payload['ready'] ?? payload['running'];
|
||||
final name = payload['device_name'] ?? payload['name'];
|
||||
return 'BLE update${name != null ? ' - $name' : ''}${ready != null ? ' (ready: $ready)' : ''}';
|
||||
case 'wifi_update':
|
||||
final ssid = payload['ssid']?.toString();
|
||||
final connected = payload['connected'];
|
||||
return 'WS wifi update${ssid != null && ssid.isNotEmpty ? ' - $ssid' : ''}${connected != null ? ' (connected: $connected)' : ''}';
|
||||
case 'status_update':
|
||||
final current = payload['current_video']?.toString();
|
||||
final running = payload['running'];
|
||||
return 'WS playback status${current != null && current.isNotEmpty ? ' - $current' : ''}${running != null ? ' (running: $running)' : ''}';
|
||||
case 'state_update':
|
||||
final previous = payload['old_state']?.toString();
|
||||
final next = payload['new_state']?.toString();
|
||||
return 'WS state change${previous != null ? ' $previous ->' : ''} ${next ?? 'unknown'}'.trim();
|
||||
case 'config_update':
|
||||
return 'WS config update';
|
||||
default:
|
||||
final prefix = type == DebugLogType.ble ? 'BLE' : 'WS';
|
||||
final compactPayload = _stringify(details: payload);
|
||||
return '$prefix ${event.type}: $compactPayload';
|
||||
}
|
||||
}
|
||||
|
||||
void _addEntry(
|
||||
DebugLogType type,
|
||||
String summary, {
|
||||
Object? details,
|
||||
bool notify = true,
|
||||
}) {
|
||||
_entries.add(
|
||||
DebugLogEntry(
|
||||
timestamp: DateTime.now(),
|
||||
type: type,
|
||||
summary: summary,
|
||||
details: details == null ? null : _stringify(details: details),
|
||||
),
|
||||
);
|
||||
|
||||
if (_entries.length > maxEntries) {
|
||||
_entries.removeRange(0, _entries.length - maxEntries);
|
||||
}
|
||||
|
||||
if (notify) {
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
String _stringify({required Object details}) {
|
||||
try {
|
||||
final encoded = details is String ? details : jsonEncode(details);
|
||||
return encoded.length > 220 ? '${encoded.substring(0, 217)}...' : encoded;
|
||||
} catch (_) {
|
||||
final value = details.toString();
|
||||
return value.length > 220 ? '${value.substring(0, 217)}...' : value;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
unawaited(_eventSubscription.cancel());
|
||||
unawaited(_connectionSubscription.cancel());
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -6,28 +6,43 @@ import '../models/ble_status.dart';
|
||||
import '../models/device_status.dart';
|
||||
import '../models/player_status.dart';
|
||||
import '../models/wifi_status.dart';
|
||||
import '../services/device_storage_service.dart';
|
||||
import '../services/http_api_service.dart';
|
||||
import '../services/web_socket_service.dart';
|
||||
import 'debug_provider.dart';
|
||||
|
||||
class DeviceProvider extends ChangeNotifier {
|
||||
DeviceProvider({
|
||||
required HttpApiService httpApiService,
|
||||
required WebSocketService webSocketService,
|
||||
required DeviceStorageService deviceStorageService,
|
||||
required DebugProvider debugProvider,
|
||||
String initialDeviceIp = '127.0.0.1',
|
||||
int initialDevicePort = 5000,
|
||||
String? initialDeviceName,
|
||||
}) : _httpApiService = httpApiService,
|
||||
_webSocketService = webSocketService,
|
||||
_deviceIp = _normalizeDeviceIp(initialDeviceIp) {
|
||||
_httpApiService.baseUrl = 'http://$_deviceIp:8080';
|
||||
_debugProvider = debugProvider,
|
||||
_deviceStorageService = deviceStorageService,
|
||||
_deviceIp = _normalizeDeviceIp(initialDeviceIp),
|
||||
_devicePort = _normalizePort(initialDevicePort),
|
||||
_deviceName = _normalizeDeviceName(initialDeviceName) {
|
||||
_httpApiService.baseUrl = _buildBaseUrl(_deviceIp, _devicePort);
|
||||
_connectionSubscription = _webSocketService.onConnectionChanged.listen(
|
||||
_handleConnectionChanged,
|
||||
);
|
||||
_statusSubscription = _webSocketService.onStatusUpdate.listen(_handleStatusUpdate);
|
||||
_wifiSubscription = _webSocketService.onWifiUpdate.listen(_handleWifiUpdate);
|
||||
_statusSubscription = _webSocketService.onStatusUpdate.listen(
|
||||
_handleStatusUpdate,
|
||||
);
|
||||
_wifiSubscription =
|
||||
_webSocketService.onWifiUpdate.listen(_handleWifiUpdate);
|
||||
_bleSubscription = _webSocketService.onBleUpdate.listen(_handleBleUpdate);
|
||||
}
|
||||
|
||||
final HttpApiService _httpApiService;
|
||||
final WebSocketService _webSocketService;
|
||||
final DebugProvider _debugProvider;
|
||||
final DeviceStorageService _deviceStorageService;
|
||||
|
||||
late final StreamSubscription<SocketConnectionStatus> _connectionSubscription;
|
||||
late final StreamSubscription<Map<String, dynamic>> _statusSubscription;
|
||||
@@ -39,21 +54,41 @@ class DeviceProvider extends ChangeNotifier {
|
||||
String? _errorMessage;
|
||||
bool _webSocketConnected = false;
|
||||
String _deviceIp;
|
||||
int _devicePort;
|
||||
String _deviceName;
|
||||
List<SavedDevice> _deviceList = const <SavedDevice>[];
|
||||
|
||||
DeviceStatus get status => _status;
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
bool get webSocketConnected => _webSocketConnected;
|
||||
String get deviceIp => _deviceIp;
|
||||
int get devicePort => _devicePort;
|
||||
List<SavedDevice> get deviceList =>
|
||||
List<SavedDevice>.unmodifiable(_deviceList);
|
||||
HttpApiService get httpApiService => _httpApiService;
|
||||
|
||||
Future<void> initialize() async {
|
||||
_debugProvider.addHttpLog(
|
||||
'Initialize device provider',
|
||||
details: <String, Object>{'device': '$_deviceIp:$_devicePort'},
|
||||
);
|
||||
final lastDevice = await _deviceStorageService.getLastDevice();
|
||||
if (lastDevice != null) {
|
||||
_applyDevice(
|
||||
ip: lastDevice.ip, port: lastDevice.port, name: lastDevice.name);
|
||||
}
|
||||
await _refreshDeviceList();
|
||||
await refresh();
|
||||
await connect();
|
||||
}
|
||||
|
||||
Future<void> refresh() async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog(
|
||||
'Refresh device overview',
|
||||
details: <String, Object>{'device': '$_deviceIp:$_devicePort'},
|
||||
);
|
||||
try {
|
||||
final results = await Future.wait<dynamic>([
|
||||
_httpApiService.getPlaybackStatus(),
|
||||
@@ -67,12 +102,18 @@ class DeviceProvider extends ChangeNotifier {
|
||||
bleStatus: results[2] as BleServiceStatus,
|
||||
);
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog('Device overview refreshed');
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog(
|
||||
'Refresh device overview failed',
|
||||
details: error,
|
||||
);
|
||||
_status = _status.copyWith(
|
||||
connected: false,
|
||||
connectionType: 'offline',
|
||||
ipAddress: _deviceIp,
|
||||
deviceName: _deviceName,
|
||||
ipAddress: '$_deviceIp:$_devicePort',
|
||||
);
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
@@ -82,36 +123,98 @@ class DeviceProvider extends ChangeNotifier {
|
||||
Future<void> loadDeviceOverview() => refresh();
|
||||
|
||||
Future<void> connect() async {
|
||||
_debugProvider.addWsLog(
|
||||
'Connect WebSocket',
|
||||
details: <String, Object>{'device': '$_deviceIp:$_devicePort'},
|
||||
);
|
||||
try {
|
||||
await _webSocketService.connect(_deviceIp);
|
||||
await _webSocketService.connect(_deviceIp, port: _devicePort);
|
||||
_webSocketConnected = _webSocketService.isConnected;
|
||||
_errorMessage = null;
|
||||
_debugProvider.addWsLog('WebSocket connect request completed');
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
_webSocketConnected = false;
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addWsLog('WebSocket connect failed', details: error);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> updateDeviceIp(String ip) async {
|
||||
final normalized = _normalizeDeviceIp(ip);
|
||||
_deviceIp = normalized;
|
||||
_httpApiService.baseUrl = 'http://$_deviceIp:8080';
|
||||
_status = _status.copyWith(ipAddress: normalized, updatedAt: DateTime.now());
|
||||
notifyListeners();
|
||||
Future<void> switchDevice(String input, {String? name}) async {
|
||||
final nextDevice = _parseDeviceInput(input, fallbackPort: _devicePort);
|
||||
final nextName =
|
||||
_normalizeDeviceName(name ?? _status.deviceName ?? _deviceName);
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog(
|
||||
'Switch device to ${nextDevice.ip}:${nextDevice.port}',
|
||||
details: <String, Object>{'name': nextName},
|
||||
);
|
||||
try {
|
||||
await _validateDeviceReachable(nextDevice.ip, nextDevice.port);
|
||||
|
||||
await _webSocketService.disconnect();
|
||||
await initialize();
|
||||
await _webSocketService.disconnect();
|
||||
_applyDevice(ip: nextDevice.ip, port: nextDevice.port, name: nextName);
|
||||
notifyListeners();
|
||||
|
||||
await _deviceStorageService.saveDevice(
|
||||
nextDevice.ip, nextDevice.port, nextName);
|
||||
await _refreshDeviceList();
|
||||
await refresh();
|
||||
await connect();
|
||||
|
||||
final resolvedName = _normalizeDeviceName(_status.deviceName ?? nextName);
|
||||
if (resolvedName != nextName) {
|
||||
_deviceName = resolvedName;
|
||||
await _deviceStorageService.saveDevice(
|
||||
nextDevice.ip,
|
||||
nextDevice.port,
|
||||
resolvedName,
|
||||
);
|
||||
await _refreshDeviceList();
|
||||
notifyListeners();
|
||||
}
|
||||
_debugProvider.addHttpLog(
|
||||
'Device switched successfully',
|
||||
details: <String, Object>{'device': '${nextDevice.ip}:${nextDevice.port}'},
|
||||
);
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Switch device failed', details: error);
|
||||
notifyListeners();
|
||||
rethrow;
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> updateDeviceIp(String ip) async {
|
||||
await switchDevice(ip);
|
||||
}
|
||||
|
||||
Future<void> removeStoredDevice(SavedDevice device) async {
|
||||
await _deviceStorageService.removeDevice(device.ip, device.port);
|
||||
await _refreshDeviceList();
|
||||
_debugProvider.addHttpLog(
|
||||
'Removed saved device ${device.address}',
|
||||
details: <String, Object>{'name': device.name},
|
||||
);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> startBle({String? deviceName}) async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog(
|
||||
'Start BLE service',
|
||||
details: <String, Object?>{'deviceName': deviceName},
|
||||
);
|
||||
try {
|
||||
await _httpApiService.startBle(deviceName);
|
||||
await refresh();
|
||||
_debugProvider.addHttpLog('BLE service started');
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Start BLE service failed', details: error);
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
@@ -120,11 +223,14 @@ class DeviceProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> stopBle() async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog('Stop BLE service');
|
||||
try {
|
||||
await _httpApiService.stopBle();
|
||||
await refresh();
|
||||
_debugProvider.addHttpLog('BLE service stopped');
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Stop BLE service failed', details: error);
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
@@ -133,6 +239,9 @@ class DeviceProvider extends ChangeNotifier {
|
||||
|
||||
void _handleConnectionChanged(SocketConnectionStatus connectionStatus) {
|
||||
_webSocketConnected = connectionStatus == SocketConnectionStatus.connected;
|
||||
_debugProvider.addWsLog(
|
||||
'Device provider connection state: ${connectionStatus.name}',
|
||||
);
|
||||
if (!_webSocketConnected) {
|
||||
_status = _status.copyWith(connectionType: _status.connectionType);
|
||||
}
|
||||
@@ -140,6 +249,7 @@ class DeviceProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
void _handleStatusUpdate(Map<String, dynamic> payload) {
|
||||
_debugProvider.addWsLog('Received status update', details: payload);
|
||||
final playerStatus = PlayerStatus.fromJson(payload);
|
||||
_status = _buildStatus(
|
||||
playerStatus: playerStatus,
|
||||
@@ -150,6 +260,7 @@ class DeviceProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
void _handleWifiUpdate(Map<String, dynamic> payload) {
|
||||
_debugProvider.addWsLog('Received wifi update', details: payload);
|
||||
final wifiStatus = WifiStatus.fromJson(payload);
|
||||
_status = _buildStatus(
|
||||
playerStatus: _status.playerStatus ?? PlayerStatus.initial(),
|
||||
@@ -160,6 +271,7 @@ class DeviceProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
void _handleBleUpdate(Map<String, dynamic> payload) {
|
||||
_debugProvider.addBleLog('Received BLE update', details: payload);
|
||||
final normalized = <String, dynamic>{
|
||||
'running': payload['running'] ?? payload['ready'] ?? false,
|
||||
'embedded': payload['embedded'] ?? false,
|
||||
@@ -186,10 +298,11 @@ class DeviceProvider extends ChangeNotifier {
|
||||
: 'offline';
|
||||
|
||||
return DeviceStatus(
|
||||
connected: wifiStatus.connected || bleStatus.running || _webSocketConnected,
|
||||
connected:
|
||||
wifiStatus.connected || bleStatus.running || _webSocketConnected,
|
||||
connectionType: connectionType,
|
||||
deviceName: bleStatus.deviceName ?? 'ShowenV2',
|
||||
ipAddress: wifiStatus.ip ?? _deviceIp,
|
||||
deviceName: bleStatus.deviceName ?? _deviceName,
|
||||
ipAddress: wifiStatus.ip ?? '$_deviceIp:$_devicePort',
|
||||
playerStatus: playerStatus,
|
||||
wifiStatus: wifiStatus,
|
||||
bleStatus: bleStatus,
|
||||
@@ -197,11 +310,46 @@ class DeviceProvider extends ChangeNotifier {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _refreshDeviceList() async {
|
||||
_deviceList = await _deviceStorageService.getDevices();
|
||||
}
|
||||
|
||||
Future<void> _validateDeviceReachable(String ip, int port) async {
|
||||
final probeService = HttpApiService(baseUrl: _buildBaseUrl(ip, port));
|
||||
try {
|
||||
await probeService.getStatus().timeout(const Duration(seconds: 3));
|
||||
} on TimeoutException {
|
||||
throw Exception('设备不可达：连接超时（3 秒）');
|
||||
} on Exception catch (error) {
|
||||
throw Exception('设备不可达：$error');
|
||||
} finally {
|
||||
probeService.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
void _applyDevice({
|
||||
required String ip,
|
||||
required int port,
|
||||
String? name,
|
||||
}) {
|
||||
_deviceIp = _normalizeDeviceIp(ip);
|
||||
_devicePort = _normalizePort(port);
|
||||
_deviceName = _normalizeDeviceName(name);
|
||||
_httpApiService.baseUrl = _buildBaseUrl(_deviceIp, _devicePort);
|
||||
_status = _status.copyWith(
|
||||
deviceName: _deviceName,
|
||||
ipAddress: '$_deviceIp:$_devicePort',
|
||||
updatedAt: DateTime.now(),
|
||||
);
|
||||
}
|
||||
|
||||
void _setLoading(bool value) {
|
||||
_isLoading = value;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
static String _buildBaseUrl(String ip, int port) => 'http://$ip:$port';
|
||||
|
||||
static String _normalizeDeviceIp(String input) {
|
||||
var value = input.trim();
|
||||
if (value.startsWith('http://')) {
|
||||
@@ -210,6 +358,8 @@ class DeviceProvider extends ChangeNotifier {
|
||||
value = value.substring(8);
|
||||
} else if (value.startsWith('ws://')) {
|
||||
value = value.substring(5);
|
||||
} else if (value.startsWith('wss://')) {
|
||||
value = value.substring(6);
|
||||
}
|
||||
final slashIndex = value.indexOf('/');
|
||||
if (slashIndex >= 0) {
|
||||
@@ -222,6 +372,53 @@ class DeviceProvider extends ChangeNotifier {
|
||||
return value.isEmpty ? '127.0.0.1' : value;
|
||||
}
|
||||
|
||||
static int _normalizePort(int input) {
|
||||
if (input <= 0 || input > 65535) {
|
||||
return 5000;
|
||||
}
|
||||
return input;
|
||||
}
|
||||
|
||||
static String _normalizeDeviceName(String? input) {
|
||||
final value = input?.trim() ?? '';
|
||||
return value.isEmpty ? 'Showen' : value;
|
||||
}
|
||||
|
||||
static SavedDevice _parseDeviceInput(String input,
|
||||
{int fallbackPort = 5000}) {
|
||||
var value = input.trim();
|
||||
if (value.startsWith('http://')) {
|
||||
value = value.substring(7);
|
||||
} else if (value.startsWith('https://')) {
|
||||
value = value.substring(8);
|
||||
} else if (value.startsWith('ws://')) {
|
||||
value = value.substring(5);
|
||||
} else if (value.startsWith('wss://')) {
|
||||
value = value.substring(6);
|
||||
}
|
||||
|
||||
final slashIndex = value.indexOf('/');
|
||||
if (slashIndex >= 0) {
|
||||
value = value.substring(0, slashIndex);
|
||||
}
|
||||
|
||||
final colonIndex = value.lastIndexOf(':');
|
||||
final hasPort = colonIndex > 0 && colonIndex < value.length - 1;
|
||||
final ip =
|
||||
_normalizeDeviceIp(hasPort ? value.substring(0, colonIndex) : value);
|
||||
final port = hasPort
|
||||
? _normalizePort(
|
||||
int.tryParse(value.substring(colonIndex + 1)) ?? fallbackPort)
|
||||
: _normalizePort(fallbackPort);
|
||||
|
||||
return SavedDevice(
|
||||
ip: ip,
|
||||
port: port,
|
||||
name: 'Showen',
|
||||
lastUsedAt: DateTime.now(),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
unawaited(_connectionSubscription.cancel());
|
||||
|
||||
@@ -5,29 +5,36 @@ import 'package:flutter/foundation.dart';
|
||||
import '../models/player_status.dart';
|
||||
import '../services/http_api_service.dart';
|
||||
import '../services/web_socket_service.dart';
|
||||
import 'debug_provider.dart';
|
||||
|
||||
class PlayerProvider extends ChangeNotifier {
|
||||
PlayerProvider({
|
||||
required HttpApiService httpApiService,
|
||||
required WebSocketService webSocketService,
|
||||
required DebugProvider debugProvider,
|
||||
}) : _httpApiService = httpApiService,
|
||||
_webSocketService = webSocketService {
|
||||
_webSocketService = webSocketService,
|
||||
_debugProvider = debugProvider {
|
||||
_statusSubscription = _webSocketService.onStatusUpdate.listen((payload) {
|
||||
_status = PlayerStatus.fromJson(payload);
|
||||
_debugProvider.addWsLog('Player status update', details: payload);
|
||||
notifyListeners();
|
||||
});
|
||||
_stateSubscription = _webSocketService.onStateUpdate.listen((payload) {
|
||||
_currentState = payload['new_state']?.toString() ?? _currentState;
|
||||
_debugProvider.addWsLog('Player state update', details: payload);
|
||||
notifyListeners();
|
||||
});
|
||||
_configSubscription = _webSocketService.onConfigUpdate.listen((payload) {
|
||||
_updateSceneOptions(payload);
|
||||
_debugProvider.addWsLog('Player config update', details: payload);
|
||||
notifyListeners();
|
||||
});
|
||||
}
|
||||
|
||||
final HttpApiService _httpApiService;
|
||||
final WebSocketService _webSocketService;
|
||||
final DebugProvider _debugProvider;
|
||||
late final StreamSubscription<Map<String, dynamic>> _statusSubscription;
|
||||
late final StreamSubscription<Map<String, dynamic>> _stateSubscription;
|
||||
late final StreamSubscription<Map<String, dynamic>> _configSubscription;
|
||||
@@ -48,6 +55,7 @@ class PlayerProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> bootstrap() async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog('Bootstrap player provider');
|
||||
try {
|
||||
final results = await Future.wait<dynamic>([
|
||||
_httpApiService.getPlaybackStatus(),
|
||||
@@ -58,31 +66,45 @@ class PlayerProvider extends ChangeNotifier {
|
||||
_playlist = results[1] as List<String>;
|
||||
_updateSceneOptions(results[2] as Map<String, dynamic>);
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog(
|
||||
'Player provider bootstrapped',
|
||||
details: <String, Object>{'playlist': _playlist.length},
|
||||
);
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Bootstrap player provider failed', details: error);
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> fetchStatus() async {
|
||||
_debugProvider.addHttpLog('Fetch playback status');
|
||||
try {
|
||||
_status = await _httpApiService.getPlaybackStatus();
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog('Playback status fetched');
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Fetch playback status failed', details: error);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> fetchPlaylist() async {
|
||||
_debugProvider.addHttpLog('Fetch playlist');
|
||||
try {
|
||||
_playlist = await _httpApiService.getPlaylist();
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog(
|
||||
'Playlist fetched',
|
||||
details: <String, Object>{'items': _playlist.length},
|
||||
);
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Fetch playlist failed', details: error);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
@@ -119,6 +141,7 @@ class PlayerProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> _runCommand(Future<dynamic> Function() action) async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog('Run player command');
|
||||
try {
|
||||
await action();
|
||||
await Future.wait<void>([
|
||||
@@ -126,8 +149,10 @@ class PlayerProvider extends ChangeNotifier {
|
||||
fetchPlaylist(),
|
||||
]);
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog('Player command completed');
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Player command failed', details: error);
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
|
||||
@@ -6,21 +6,26 @@ import '../models/wifi_network.dart';
|
||||
import '../models/wifi_status.dart';
|
||||
import '../services/http_api_service.dart';
|
||||
import '../services/web_socket_service.dart';
|
||||
import 'debug_provider.dart';
|
||||
|
||||
class WifiProvider extends ChangeNotifier {
|
||||
WifiProvider({
|
||||
required HttpApiService httpApiService,
|
||||
required WebSocketService webSocketService,
|
||||
required DebugProvider debugProvider,
|
||||
}) : _httpApiService = httpApiService,
|
||||
_webSocketService = webSocketService {
|
||||
_webSocketService = webSocketService,
|
||||
_debugProvider = debugProvider {
|
||||
_wifiSubscription = _webSocketService.onWifiUpdate.listen((payload) {
|
||||
_status = WifiStatus.fromJson(payload);
|
||||
_debugProvider.addWsLog('Wifi provider update', details: payload);
|
||||
notifyListeners();
|
||||
});
|
||||
}
|
||||
|
||||
final HttpApiService _httpApiService;
|
||||
final WebSocketService _webSocketService;
|
||||
final DebugProvider _debugProvider;
|
||||
late final StreamSubscription<Map<String, dynamic>> _wifiSubscription;
|
||||
|
||||
WifiStatus _status = WifiStatus.disconnected();
|
||||
@@ -37,6 +42,7 @@ class WifiProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> bootstrap() async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog('Bootstrap WiFi provider');
|
||||
try {
|
||||
final results = await Future.wait<dynamic>([
|
||||
_httpApiService.getWifiStatus(),
|
||||
@@ -45,30 +51,44 @@ class WifiProvider extends ChangeNotifier {
|
||||
_status = results[0] as WifiStatus;
|
||||
_networks = results[1] as List<WifiNetwork>;
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog(
|
||||
'WiFi provider bootstrapped',
|
||||
details: <String, Object>{'networks': _networks.length},
|
||||
);
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Bootstrap WiFi provider failed', details: error);
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> refreshStatus() async {
|
||||
_debugProvider.addHttpLog('Refresh WiFi status');
|
||||
try {
|
||||
_status = await _httpApiService.getWifiStatus();
|
||||
_debugProvider.addHttpLog('WiFi status refreshed');
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Refresh WiFi status failed', details: error);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> scanNetworks() async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog('Scan WiFi networks');
|
||||
try {
|
||||
_networks = await _httpApiService.scanWifi();
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog(
|
||||
'WiFi scan completed',
|
||||
details: <String, Object>{'networks': _networks.length},
|
||||
);
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('WiFi scan failed', details: error);
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
}
|
||||
@@ -76,13 +96,19 @@ class WifiProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> connect({required String ssid, required String password}) async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog(
|
||||
'Connect WiFi network',
|
||||
details: <String, Object>{'ssid': ssid},
|
||||
);
|
||||
try {
|
||||
await _httpApiService.connectWifi(ssid, password);
|
||||
await refreshStatus();
|
||||
_hotspotEnabled = false;
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog('WiFi connected', details: <String, Object>{'ssid': ssid});
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Connect WiFi failed', details: error);
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
@@ -91,13 +117,19 @@ class WifiProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> startHotspot({String? ssid, String? password}) async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog(
|
||||
'Start hotspot',
|
||||
details: <String, Object?>{'ssid': ssid},
|
||||
);
|
||||
try {
|
||||
await _httpApiService.startAP(ssid, password);
|
||||
_hotspotEnabled = true;
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog('Hotspot started');
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Start hotspot failed', details: error);
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
@@ -106,13 +138,16 @@ class WifiProvider extends ChangeNotifier {
|
||||
|
||||
Future<void> stopHotspot() async {
|
||||
_setLoading(true);
|
||||
_debugProvider.addHttpLog('Stop hotspot');
|
||||
try {
|
||||
await _httpApiService.stopAP();
|
||||
_hotspotEnabled = false;
|
||||
_errorMessage = null;
|
||||
_debugProvider.addHttpLog('Hotspot stopped');
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
_errorMessage = error.toString();
|
||||
_debugProvider.addHttpLog('Stop hotspot failed', details: error);
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_setLoading(false);
|
||||
|
||||
Reference in New Issue
Block a user