diff --git a/lib/features/events/pages/page_event_info.dart b/lib/features/events/pages/page_event_info.dart index 9db5125..199b98f 100644 --- a/lib/features/events/pages/page_event_info.dart +++ b/lib/features/events/pages/page_event_info.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:recording_tool/app/config/app_config.dart'; import 'package:recording_tool/app/router/app_navigator.dart'; import 'package:recording_tool/core/utils/util_search_nasIp.dart'; import 'package:recording_tool/features/events/model/model_event_info.dart'; @@ -54,6 +53,14 @@ class _EventInfoPageState extends ConsumerState { time: item.scheduleTime, playerName: item.playerName, playerPhone: item.playerPhone, + isTeam: item.opponentId != '0', + opponentName: item.opponentName, + teamLeaderName: item.teamMembers.isNotEmpty + ? item.teamMembers + .firstWhere((member) => member.isLeader) + .name + .trim() + : '', ), streamUrl: streamUrl, ), @@ -483,9 +490,10 @@ String _formatTitle(EventRegistrationItem item) { } String _formatVenue(EventRegistrationItem item, int scheduleIndex) { - final place = item.matchPlace.trim(); - if (place.isEmpty) return '$scheduleIndex号场馆$scheduleIndex区'; - return '$place号场馆$scheduleIndex区'; + return item.matchPlace.trim(); + // final place = item.matchPlace.trim(); + // if (place.isEmpty) return '$scheduleIndex号场馆$scheduleIndex区'; + // return '$place号场馆$scheduleIndex区'; } String _formatScheduleTime(EventRegistrationItem item) { diff --git a/lib/features/recording/model/model_recording_context.dart b/lib/features/recording/model/model_recording_context.dart index f36f78c..257685b 100644 --- a/lib/features/recording/model/model_recording_context.dart +++ b/lib/features/recording/model/model_recording_context.dart @@ -9,6 +9,11 @@ class RecordingContext { required this.playerPhone, this.laneNo, this.status, + this.isTeam = false, + + /// 对方队长 + this.opponentName = '', + this.teamLeaderName = '', }); const RecordingContext.empty() @@ -20,7 +25,10 @@ class RecordingContext { playerName = '', playerPhone = '', laneNo = null, - status = null; + status = null, + isTeam = false, + opponentName = '', + teamLeaderName = ''; final String eventTitle; final String matchName; @@ -31,8 +39,12 @@ class RecordingContext { final String playerPhone; final String? laneNo; final String? status; + final bool isTeam; + final String opponentName; + final String teamLeaderName; - String get title => '$matchName $group'; + String get title => + isTeam ? '$teamLeaderName 队伍 vs $opponentName 队伍' : '$playerName $group'; String get address => venue; diff --git a/lib/features/recording/widgets/widget_recording_saved_dialog.dart b/lib/features/recording/widgets/widget_recording_saved_dialog.dart index 7997645..0bb17b0 100644 --- a/lib/features/recording/widgets/widget_recording_saved_dialog.dart +++ b/lib/features/recording/widgets/widget_recording_saved_dialog.dart @@ -11,8 +11,8 @@ Future showRecordingSavedDialog( return RecordDialog.showDouble( context, title: '本轮比赛视频已保存\n请选择后续录制信息', - leftText: '继续本轮', - rightText: '录制新轮', + leftText: '继当前选手', + rightText: '录新选手', onLeftPressed: onContinueRound, onRightPressed: onRecordNewRound, barrierDismissible: false,