diff --git a/assets/audio/session_complete.wav b/assets/audio/session_complete.wav new file mode 100644 index 0000000..295ed0e Binary files /dev/null and b/assets/audio/session_complete.wav differ diff --git a/assets/audio/step_complete.wav b/assets/audio/step_complete.wav new file mode 100644 index 0000000..d9e97b3 Binary files /dev/null and b/assets/audio/step_complete.wav differ diff --git a/lib/main.dart b/lib/main.dart index e859442..2837a4f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,12 +1,14 @@ import 'package:flutter/material.dart'; import 'services/storage_service.dart'; import 'services/tts_service.dart'; +import 'services/audio_service.dart'; import 'screens/home_screen.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); final storageService = await StorageService.init(); TtsService().init(); + AudioService().init(); runApp(AeroTrackApp(storageService: storageService)); } diff --git a/lib/screens/lan_sync_screen.dart b/lib/screens/lan_sync_screen.dart index 71baa1a..769d518 100644 --- a/lib/screens/lan_sync_screen.dart +++ b/lib/screens/lan_sync_screen.dart @@ -218,15 +218,20 @@ class _LanSyncScreenState extends State { ), const SizedBox(height: 8), // 快捷预设按钮 - Row( + Wrap( + spacing: 8, + runSpacing: 8, children: [ ActionChip( - label: const Text('填入 192.168.21.200:8090', style: TextStyle(fontSize: 11)), + visualDensity: VisualDensity.compact, + avatar: const Icon(Icons.flash_on, size: 14, color: Color(0xFF2563EB)), + label: const Text('192.168.21.200:8090', style: TextStyle(fontSize: 11)), onPressed: () => setState(() => _urlController.text = 'http://192.168.21.200:8090'), ), - const SizedBox(width: 8), ActionChip( - label: const Text('填入 localhost:8090', style: TextStyle(fontSize: 11)), + visualDensity: VisualDensity.compact, + avatar: const Icon(Icons.computer, size: 14, color: Color(0xFF475569)), + label: const Text('localhost:8090', style: TextStyle(fontSize: 11)), onPressed: () => setState(() => _urlController.text = 'http://localhost:8090'), ), ], diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dart index adac120..e2e7c58 100644 --- a/lib/screens/session_screen.dart +++ b/lib/screens/session_screen.dart @@ -8,6 +8,7 @@ import '../models/dose_record.dart'; import '../services/storage_service.dart'; import '../services/tts_service.dart'; import '../services/sync_service.dart'; +import '../services/audio_service.dart'; enum StepType { inhale, // 正在吸入某药某喷 @@ -139,12 +140,16 @@ class _SessionScreenState extends State { super.dispose(); } - void _triggerFeedback() { + void _triggerFeedback({bool isFinished = false}) { if (_settings.enableVibration) { HapticFeedback.heavyImpact(); } if (_settings.enableSound) { - SystemSound.play(SystemSoundType.alert); + if (isFinished) { + AudioService().playSessionComplete(); + } else { + AudioService().playStepComplete(); + } } } @@ -202,9 +207,13 @@ class _SessionScreenState extends State { void _finishSession() { _timer?.cancel(); _sessionEndTime = DateTime.now(); - _triggerFeedback(); + _triggerFeedback(isFinished: true); if (_settings.enableVoicePrompt) { - TtsService().speak('本次雾化吸入已全部完成,请及时用清水漱口并洗脸!'); + Future.delayed(const Duration(milliseconds: 1000), () { + if (mounted) { + TtsService().speak('本次雾化吸入已全部完成,请及时用清水漱口并洗脸!'); + } + }); } setState(() { _currentStepIndex = _steps.length; // 进入完成态 diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 2a05353..64bbf79 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import '../models/app_settings.dart'; import '../services/storage_service.dart'; import '../services/tts_service.dart'; +import '../services/audio_service.dart'; import 'plan_config_screen.dart'; import 'lan_sync_screen.dart'; @@ -181,7 +182,7 @@ class _SettingsScreenState extends State { children: [ SwitchListTile( title: const Text('提示音效', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), - subtitle: const Text('倒计时结束时发出提示音', style: TextStyle(fontSize: 12)), + subtitle: const Text('各阶段完成及全部做完时的提示音(清脆铃声)', style: TextStyle(fontSize: 12)), value: _settings.enableSound, activeTrackColor: const Color(0xFF2563EB), onChanged: (val) { @@ -189,6 +190,26 @@ class _SettingsScreenState extends State { _save(); }, ), + Padding( + padding: const EdgeInsets.only(left: 16, right: 16, bottom: 8), + child: Align( + alignment: Alignment.centerLeft, + child: OutlinedButton.icon( + onPressed: () { + AudioService().playSessionComplete(); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('已播放用药完成提示铃声 🔔'), duration: Duration(seconds: 1)), + ); + }, + style: OutlinedButton.styleFrom( + visualDensity: VisualDensity.compact, + side: const BorderSide(color: Color(0xFFBFDBFE)), + ), + icon: const Icon(Icons.music_note, size: 16, color: Color(0xFF2563EB)), + label: const Text('🔔 点击试听用药完成提示音', style: TextStyle(fontSize: 12, color: Color(0xFF2563EB))), + ), + ), + ), const Divider(height: 1), SwitchListTile( title: const Text('触觉震动', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), diff --git a/lib/services/audio_service.dart b/lib/services/audio_service.dart new file mode 100644 index 0000000..2d532f5 --- /dev/null +++ b/lib/services/audio_service.dart @@ -0,0 +1,42 @@ +import 'package:audioplayers/audioplayers.dart'; +import 'package:flutter/foundation.dart'; + +class AudioService { + static final AudioService _instance = AudioService._internal(); + factory AudioService() => _instance; + AudioService._internal(); + + final AudioPlayer _player = AudioPlayer(); + + Future init() async { + try { + await _player.setReleaseMode(ReleaseMode.stop); + } catch (e) { + debugPrint('AudioService init error: $e'); + } + } + + Future playStepComplete() async { + try { + await _player.stop(); + await _player.play(AssetSource('audio/step_complete.wav')); + } catch (e) { + debugPrint('Error playing step_complete: $e'); + } + } + + Future playSessionComplete() async { + try { + await _player.stop(); + await _player.play(AssetSource('audio/session_complete.wav')); + } catch (e) { + debugPrint('Error playing session_complete: $e'); + } + } + + Future dispose() async { + try { + await _player.dispose(); + } catch (_) {} + } +} diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index e71a16d..1830e5c 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,6 +6,10 @@ #include "generated_plugin_registrant.h" +#include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) audioplayers_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "AudioplayersLinuxPlugin"); + audioplayers_linux_plugin_register_with_registrar(audioplayers_linux_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 2e1de87..f4bf1dc 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,9 +3,11 @@ # list(APPEND FLUTTER_PLUGIN_LIST + audioplayers_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index d9031b3..b1491df 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,10 +5,12 @@ import FlutterMacOS import Foundation +import audioplayers_darwin import flutter_tts import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin")) FlutterTtsPlugin.register(with: registry.registrar(forPlugin: "FlutterTtsPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 46e7734..8b29c23 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" async: dependency: transitive description: @@ -9,6 +17,62 @@ packages: url: "https://pub.dev" source: hosted version: "2.13.1" + audioplayers: + dependency: "direct main" + description: + name: audioplayers + sha256: f16640453cc47487b7de72a2b28d37c7df1ac97999849f4a46d92b1d2b0f093d + url: "https://pub.dev" + source: hosted + version: "6.7.1" + audioplayers_android: + dependency: transitive + description: + name: audioplayers_android + sha256: "60a6728277228413a85755bd3ffd6fab98f6555608923813ce383b190a360605" + url: "https://pub.dev" + source: hosted + version: "5.2.1" + audioplayers_darwin: + dependency: transitive + description: + name: audioplayers_darwin + sha256: c994b3bb3a921e4904ac40e013fbc94488e824fd7c1de6326f549943b0b44a91 + url: "https://pub.dev" + source: hosted + version: "6.4.0" + audioplayers_linux: + dependency: transitive + description: + name: audioplayers_linux + sha256: f75bce1ce864170ef5e6a2c6a61cd3339e1a17ce11e99a25bae4474ea491d001 + url: "https://pub.dev" + source: hosted + version: "4.2.1" + audioplayers_platform_interface: + dependency: transitive + description: + name: audioplayers_platform_interface + sha256: "0e2f6a919ab56d0fec272e801abc07b26ae7f31980f912f24af4748763e5a656" + url: "https://pub.dev" + source: hosted + version: "7.1.1" + audioplayers_web: + dependency: transitive + description: + name: audioplayers_web + sha256: "24a6f258062bd7da8cb2157e83fccb9816a08dd306cbaaa24f9813d071470545" + url: "https://pub.dev" + source: hosted + version: "5.2.1" + audioplayers_windows: + dependency: transitive + description: + name: audioplayers_windows + sha256: "95f875a96c88c3dbbcb608d4f8288e300b0113d256a81d0b3197fcc18f0dc91a" + url: "https://pub.dev" + source: hosted + version: "4.3.1" boolean_selector: dependency: transitive description: @@ -33,6 +97,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2" + code_assets: + dependency: transitive + description: + name: code_assets + sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8 + url: "https://pub.dev" + source: hosted + version: "1.2.1" collection: dependency: transitive description: @@ -120,6 +192,14 @@ packages: description: flutter source: sdk version: "0.0.0" + hooks: + dependency: transitive + description: + name: hooks + sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" + url: "https://pub.dev" + source: hosted + version: "2.0.2" http: dependency: "direct main" description: @@ -144,6 +224,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.20.3" + jni: + dependency: transitive + description: + name: jni + sha256: d8df6dab6847855512fe44dd9032b0bbe34dda7bf7597e41d30750879779813f + url: "https://pub.dev" + source: hosted + version: "1.1.1" + jni_flutter: + dependency: transitive + description: + name: jni_flutter + sha256: "0dd33d67797560f66e961a6053882d4df54bd345bf063b8fe7ea133f7ad8b191" + url: "https://pub.dev" + source: hosted + version: "1.0.4+1" + jni_util: + dependency: transitive + description: + name: jni_util + sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f" + url: "https://pub.dev" + source: hosted + version: "1.0.0" leak_tracker: dependency: transitive description: @@ -176,6 +280,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" matcher: dependency: transitive description: @@ -200,6 +312,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.17.0" + objective_c: + dependency: transitive + description: + name: objective_c + sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e + url: "https://pub.dev" + source: hosted + version: "9.5.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d + url: "https://pub.dev" + source: hosted + version: "3.0.0" path: dependency: transitive description: @@ -208,6 +336,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825 + url: "https://pub.dev" + source: hosted + version: "2.1.6" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" + url: "https://pub.dev" + source: hosted + version: "2.6.0" path_provider_linux: dependency: transitive description: @@ -248,6 +400,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + record_use: + dependency: transitive + description: + name: record_use + sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed" + url: "https://pub.dev" + source: hosted + version: "0.6.0" shared_preferences: dependency: "direct main" description: @@ -341,6 +509,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5" + url: "https://pub.dev" + source: hosted + version: "3.4.0+1" term_glyph: dependency: transitive description: @@ -405,6 +581,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea + url: "https://pub.dev" + source: hosted + version: "3.1.4" sdks: dart: ">=3.11.1 <4.0.0" flutter: ">=3.41.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2e8a4dd..350402f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,7 @@ dependencies: uuid: ^4.6.0 flutter_tts: ^4.2.5 http: ^1.6.0 + audioplayers: ^6.7.1 dev_dependencies: flutter_test: @@ -62,10 +63,9 @@ flutter: # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg + assets: + - assets/audio/ + - assets/icon/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 63d4407..6dfdf77 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,9 +6,12 @@ #include "generated_plugin_registrant.h" +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + AudioplayersWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin")); FlutterTtsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterTtsPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 26bfe68..e9ee6df 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,10 +3,12 @@ # list(APPEND FLUTTER_PLUGIN_LIST + audioplayers_windows flutter_tts ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni ) set(PLUGIN_BUNDLED_LIBRARIES)