重构录制页面,优化 UI 组件,简化状态管理,移除不必要的参数,提升代码可读性和维护性。

This commit is contained in:
2026-06-08 11:23:45 +08:00
parent 29cfbdf8c4
commit 7ab03dd912
5 changed files with 248 additions and 78 deletions

View File

@@ -239,32 +239,13 @@ class _RecordingPageState extends ConsumerState<RecordingPage> {
@override @override
/// 构建录制页 UI /// 构建录制页 UI
Widget build(BuildContext context) { Widget build(BuildContext context) {
final recordingInfo = ref.watch(recordingViewModelProvider); return _RecordingPopScope(
final state = recordingInfo.session; onExitRecordingMode: _exitRecordingMode,
final viewModel = ref.read(recordingViewModelProvider.notifier);
final clipboard = recordingInfo.clipboardRecordingModel;
final showClipboardInfo = recordingInfo.hasValidClipboardInfo;
return PopScope(
canPop: !state.isRecording,
onPopInvokedWithResult: (didPop, result) async {
if (didPop) {
await _exitRecordingMode();
return;
}
if (state.isRecording) {
AppToast.show('录制中无法返回,请先停止录制');
}
},
child: Scaffold( child: Scaffold(
backgroundColor: Colors.black, backgroundColor: Colors.black,
body: Column( body: Column(
children: [ children: [
RecordHeaderWidget( _RecordHeaderSection(
hasValidClipboardInfo: showClipboardInfo,
eventTitle: showClipboardInfo ? clipboard.title : null,
isRecording: state.isRecording,
elapsedLabel: state.elapsedLabel,
onPasteEventInfo: _pasteEventInfo, onPasteEventInfo: _pasteEventInfo,
onClearEventInfo: _clearClipboardForNewRound, onClearEventInfo: _clearClipboardForNewRound,
), ),
@@ -272,43 +253,16 @@ class _RecordingPageState extends ConsumerState<RecordingPage> {
child: Stack( child: Stack(
children: [ children: [
const CameraPreviewWidget(), const CameraPreviewWidget(),
if (!state.isPreviewReady && state.errorMessage == null) const _PreviewLoadingLayer(),
const RecordingLoadingOverlayWidget(message: '正在启动相机…'),
const RecordTimerWidget(), const RecordTimerWidget(),
RecordingHudWidget( _RecordingHudLayer(
state: state,
showClipboardHint: showClipboardInfo,
clipboardAddress: clipboard.address.trim(),
onStart: _onStartRecording, onStart: _onStartRecording,
onStop: _stopRecordingAndShowResult, onStop: _stopRecordingAndShowResult,
onOpenDnd: () async {
await viewModel.openDndSettings();
await viewModel.refreshDndAccess();
},
onOpenBattery: () async {
await viewModel.openBatterySettings();
await viewModel.refreshBatteryOptimization();
},
onToggleTouchLock: () {
viewModel.setTouchLocked(!state.isTouchLocked);
},
), ),
if (state.isTouchLocked && state.isRecording) _TouchLockOverlayLayer(
RecordingTouchLockOverlayWidget( onStopRecording: _stopRecordingAndShowResult,
enabled: true,
onUnlocked: (intent) async {
viewModel.setTouchLocked(false);
if (intent ==
RecordingTouchLockUnlockIntent.stopRecording) {
await _stopRecordingAndShowResult();
}
},
),
if (state.isStartingRecording)
RecordingLoadingOverlayWidget(
message: '正在开始录制…',
backgroundColor: Colors.black.withValues(alpha: 0.24),
), ),
const _StartingRecordingOverlay(),
], ],
), ),
), ),
@@ -319,3 +273,207 @@ class _RecordingPageState extends ConsumerState<RecordingPage> {
); );
} }
} }
class _RecordingPopScope extends ConsumerWidget {
const _RecordingPopScope({
required this.onExitRecordingMode,
required this.child,
});
final Future<void> Function() onExitRecordingMode;
final Widget child;
@override
Widget build(BuildContext context, WidgetRef ref) {
final isRecording = ref.watch(
recordingViewModelProvider.select((m) => m.session.isRecording),
);
return PopScope(
canPop: !isRecording,
onPopInvokedWithResult: (didPop, result) async {
if (didPop) {
await onExitRecordingMode();
return;
}
if (isRecording) {
AppToast.show('录制中无法返回,请先停止录制');
}
},
child: child,
);
}
}
class _RecordHeaderSection extends ConsumerWidget {
const _RecordHeaderSection({
required this.onPasteEventInfo,
required this.onClearEventInfo,
});
final Future<void> Function() onPasteEventInfo;
final VoidCallback onClearEventInfo;
@override
Widget build(BuildContext context, WidgetRef ref) {
final headerState = ref.watch(
recordingViewModelProvider.select(
(m) => (
m.hasValidClipboardInfo,
m.hasValidClipboardInfo ? m.clipboardRecordingModel.title : null,
m.session.isRecording,
),
),
);
final (hasValidClipboardInfo, eventTitle, isRecording) = headerState;
return RecordHeaderWidget(
hasValidClipboardInfo: hasValidClipboardInfo,
eventTitle: eventTitle,
isRecording: isRecording,
onPasteEventInfo: onPasteEventInfo,
onClearEventInfo: onClearEventInfo,
);
}
}
class _PreviewLoadingLayer extends ConsumerWidget {
const _PreviewLoadingLayer();
@override
Widget build(BuildContext context, WidgetRef ref) {
final showLoading = ref.watch(
recordingViewModelProvider.select(
(m) => !m.session.isPreviewReady && m.session.errorMessage == null,
),
);
if (!showLoading) {
return const SizedBox.shrink();
}
return const RecordingLoadingOverlayWidget(message: '正在启动相机…');
}
}
class _RecordingHudLayer extends ConsumerWidget {
const _RecordingHudLayer({
required this.onStart,
required this.onStop,
});
final Future<void> Function() onStart;
final Future<void> Function() onStop;
@override
Widget build(BuildContext context, WidgetRef ref) {
final hudState = ref.watch(
recordingViewModelProvider.select(
(m) => (
m.session.errorMessage,
m.session.permissionWarning,
m.session.hasDndAccess,
m.session.isBatteryOptimizedIgnored,
m.session.notificationsGranted,
m.session.isRecording,
m.session.isStartingRecording,
m.session.isTouchLocked,
m.hasValidClipboardInfo,
m.clipboardRecordingModel.address.trim(),
),
),
);
final (
errorMessage,
permissionWarning,
hasDndAccess,
isBatteryOptimizedIgnored,
notificationsGranted,
isRecording,
isStartingRecording,
isTouchLocked,
showClipboardHint,
clipboardAddress,
) = hudState;
final viewModel = ref.read(recordingViewModelProvider.notifier);
return RecordingHudWidget(
errorMessage: errorMessage,
permissionWarning: permissionWarning,
hasDndAccess: hasDndAccess,
isBatteryOptimizedIgnored: isBatteryOptimizedIgnored,
notificationsGranted: notificationsGranted,
isRecording: isRecording,
isStartingRecording: isStartingRecording,
isTouchLocked: isTouchLocked,
showClipboardHint: showClipboardHint,
clipboardAddress: clipboardAddress,
onStart: onStart,
onStop: onStop,
onOpenDnd: () async {
await viewModel.openDndSettings();
await viewModel.refreshDndAccess();
},
onOpenBattery: () async {
await viewModel.openBatterySettings();
await viewModel.refreshBatteryOptimization();
},
onToggleTouchLock: () {
final locked = ref.read(recordingViewModelProvider).session.isTouchLocked;
viewModel.setTouchLocked(!locked);
},
);
}
}
class _TouchLockOverlayLayer extends ConsumerWidget {
const _TouchLockOverlayLayer({required this.onStopRecording});
final Future<void> Function() onStopRecording;
@override
Widget build(BuildContext context, WidgetRef ref) {
final overlayState = ref.watch(
recordingViewModelProvider.select(
(m) => (m.session.isTouchLocked, m.session.isRecording),
),
);
final (isTouchLocked, isRecording) = overlayState;
if (!isTouchLocked || !isRecording) {
return const SizedBox.shrink();
}
final viewModel = ref.read(recordingViewModelProvider.notifier);
return RecordingTouchLockOverlayWidget(
enabled: true,
onUnlocked: (intent) async {
viewModel.setTouchLocked(false);
if (intent == RecordingTouchLockUnlockIntent.stopRecording) {
await onStopRecording();
}
},
);
}
}
class _StartingRecordingOverlay extends ConsumerWidget {
const _StartingRecordingOverlay();
@override
Widget build(BuildContext context, WidgetRef ref) {
final isStartingRecording = ref.watch(
recordingViewModelProvider.select((m) => m.session.isStartingRecording),
);
if (!isStartingRecording) {
return const SizedBox.shrink();
}
return RecordingLoadingOverlayWidget(
message: '正在开始录制…',
backgroundColor: Colors.black.withValues(alpha: 0.24),
);
}
}

View File

@@ -12,7 +12,6 @@ class RecordHeaderWidget extends StatelessWidget {
required this.hasValidClipboardInfo, required this.hasValidClipboardInfo,
this.eventTitle, this.eventTitle,
required this.isRecording, required this.isRecording,
required this.elapsedLabel,
required this.onPasteEventInfo, required this.onPasteEventInfo,
required this.onClearEventInfo, required this.onClearEventInfo,
}); });
@@ -20,7 +19,6 @@ class RecordHeaderWidget extends StatelessWidget {
final bool hasValidClipboardInfo; final bool hasValidClipboardInfo;
final String? eventTitle; final String? eventTitle;
final bool isRecording; final bool isRecording;
final String elapsedLabel;
final Future<void> Function() onPasteEventInfo; final Future<void> Function() onPasteEventInfo;
final VoidCallback onClearEventInfo; final VoidCallback onClearEventInfo;

View File

@@ -13,11 +13,13 @@ class RecordTimerWidget extends ConsumerStatefulWidget {
class _RecordTimerWidgetState extends ConsumerState<RecordTimerWidget> { class _RecordTimerWidgetState extends ConsumerState<RecordTimerWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final session = ref.watch( final timerState = ref.watch(
recordingViewModelProvider.select((value) => value.session), recordingViewModelProvider.select(
(m) => (m.session.isRecording, m.session.elapsedLabel),
),
); );
final isRecording = session.isRecording; final (isRecording, elapsedLabel) = timerState;
final displayTime = isRecording ? session.elapsedLabel : '00:00:00'; final displayTime = isRecording ? elapsedLabel : '00:00:00';
return Positioned( return Positioned(
top: 13.r, top: 13.r,

View File

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:recording_tool/core/utils/rate_limiter.dart'; import 'package:recording_tool/core/utils/rate_limiter.dart';
import 'package:recording_tool/features/recording/model/model_recording_session.dart';
import 'package:recording_tool/features/recording/widgets/record_content_transition.dart'; import 'package:recording_tool/features/recording/widgets/record_content_transition.dart';
import 'package:recording_tool/features/recording/widgets/widget_clipboard_address_clock_chip.dart'; import 'package:recording_tool/features/recording/widgets/widget_clipboard_address_clock_chip.dart';
import 'package:recording_tool/features/recording/widgets/widget_recording_button.dart'; import 'package:recording_tool/features/recording/widgets/widget_recording_button.dart';
@@ -12,7 +11,14 @@ import 'package:recording_tool/features/recording/widgets/widget_recording_setup
class RecordingHudWidget extends StatelessWidget { class RecordingHudWidget extends StatelessWidget {
const RecordingHudWidget({ const RecordingHudWidget({
super.key, super.key,
required this.state, this.errorMessage,
this.permissionWarning,
required this.hasDndAccess,
required this.isBatteryOptimizedIgnored,
required this.notificationsGranted,
required this.isRecording,
required this.isStartingRecording,
required this.isTouchLocked,
this.showClipboardHint = false, this.showClipboardHint = false,
this.clipboardAddress = '', this.clipboardAddress = '',
required this.onStart, required this.onStart,
@@ -22,7 +28,14 @@ class RecordingHudWidget extends StatelessWidget {
required this.onToggleTouchLock, required this.onToggleTouchLock,
}); });
final RecordingSessionState state; final String? errorMessage;
final String? permissionWarning;
final bool hasDndAccess;
final bool isBatteryOptimizedIgnored;
final bool notificationsGranted;
final bool isRecording;
final bool isStartingRecording;
final bool isTouchLocked;
final bool showClipboardHint; final bool showClipboardHint;
final String clipboardAddress; final String clipboardAddress;
final Future<void> Function() onStart; final Future<void> Function() onStart;
@@ -50,23 +63,23 @@ class RecordingHudWidget extends StatelessWidget {
children: [ children: [
SizedBox(height: 8.h), SizedBox(height: 8.h),
const Spacer(), const Spacer(),
if (state.errorMessage != null) if (errorMessage != null)
Padding( Padding(
padding: EdgeInsets.all(12.r), padding: EdgeInsets.all(12.r),
child: Text( child: Text(
state.errorMessage!, errorMessage!,
style: const TextStyle(color: Colors.amber), style: const TextStyle(color: Colors.amber),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
if (state.permissionWarning != null) if (permissionWarning != null)
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 16.r, horizontal: 16.r,
vertical: 8.r, vertical: 8.r,
), ),
child: Text( child: Text(
state.permissionWarning!, permissionWarning!,
style: TextStyle( style: TextStyle(
color: Colors.orangeAccent, color: Colors.orangeAccent,
fontSize: 12.sp, fontSize: 12.sp,
@@ -75,9 +88,9 @@ class RecordingHudWidget extends StatelessWidget {
), ),
), ),
RecordingSetupHintsWidget( RecordingSetupHintsWidget(
hasDndAccess: state.hasDndAccess, hasDndAccess: hasDndAccess,
isBatteryIgnored: state.isBatteryOptimizedIgnored, isBatteryIgnored: isBatteryOptimizedIgnored,
notificationsGranted: state.notificationsGranted, notificationsGranted: notificationsGranted,
onOpenDnd: onOpenDnd, onOpenDnd: onOpenDnd,
onOpenBattery: onOpenBattery, onOpenBattery: onOpenBattery,
onOpenNotificationSettings: openAppSettings, onOpenNotificationSettings: openAppSettings,
@@ -102,7 +115,7 @@ class RecordingHudWidget extends StatelessWidget {
: const SizedBox.shrink(key: ValueKey('clipboard-info-hidden')), : const SizedBox.shrink(key: ValueKey('clipboard-info-hidden')),
), ),
), ),
if (state.isRecording) if (isRecording)
Positioned( Positioned(
left: 16.r, left: 16.r,
bottom: _recordButtonBottom, bottom: _recordButtonBottom,
@@ -112,7 +125,7 @@ class RecordingHudWidget extends StatelessWidget {
child: IconButton( child: IconButton(
onPressed: onToggleTouchLock, onPressed: onToggleTouchLock,
icon: Icon( icon: Icon(
state.isTouchLocked ? Icons.lock : Icons.lock_open, isTouchLocked ? Icons.lock : Icons.lock_open,
color: Colors.white, color: Colors.white,
size: 28.r, size: 28.r,
), ),
@@ -126,12 +139,12 @@ class RecordingHudWidget extends StatelessWidget {
bottom: _recordButtonBottom, bottom: _recordButtonBottom,
child: Center( child: Center(
child: RecordingControlButton( child: RecordingControlButton(
isRecording: state.isRecording, isRecording: isRecording,
isStartingRecording: state.isStartingRecording, isStartingRecording: isStartingRecording,
enabled: !state.isStartingRecording, enabled: !isStartingRecording,
size: _recordButtonSize, size: _recordButtonSize,
onTap: () { onTap: () {
if (state.isRecording) { if (isRecording) {
RateLimit.instance.debounce<void>( RateLimit.instance.debounce<void>(
key: 'recording.session.stop', key: 'recording.session.stop',
value: null, value: null,

View File

@@ -20,7 +20,6 @@ void main() {
hasValidClipboardInfo: hasValidClipboardInfo, hasValidClipboardInfo: hasValidClipboardInfo,
eventTitle: eventTitle, eventTitle: eventTitle,
isRecording: false, isRecording: false,
elapsedLabel: '00:00',
onPasteEventInfo: () async {}, onPasteEventInfo: () async {},
onClearEventInfo: () {}, onClearEventInfo: () {},
), ),