Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 linfeng
|
13ecb2fccc | ||
|
linfeng
|
e3f9c8ebc0 | ||
|
linfeng
|
6790ea41b2 |
Binary file not shown.
|
After Width: | Height: | Size: 833 KiB |
@@ -275,12 +275,12 @@ class _EventTeamMatchPageState extends ConsumerState<EventTeamMatchPage> {
|
||||
top: false,
|
||||
child: Column(
|
||||
children: [
|
||||
SizedBox(height: 10.h),
|
||||
// SizedBox(height: 10.h),
|
||||
_MatchMetadata(detail: _detail),
|
||||
SizedBox(height: 12.h),
|
||||
// SizedBox(height: 12.h),
|
||||
Expanded(
|
||||
child: SingleChildScrollView(
|
||||
padding: EdgeInsets.fromLTRB(8.w, 0, 8.w, 20.h),
|
||||
padding: EdgeInsets.symmetric(horizontal: 0.w, vertical: 20.h),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@@ -288,7 +288,7 @@ class _EventTeamMatchPageState extends ConsumerState<EventTeamMatchPage> {
|
||||
sideLabel: '红方',
|
||||
team: redTeam,
|
||||
members: _redMembers,
|
||||
backgroundImage: 'assets/images/image_red_team.png',
|
||||
backgroundImage: Assets.images.imageRedTeam.path,
|
||||
accentColor: const Color(0xFFE84B5B),
|
||||
verifiedUserIds: _verifiedUserIds,
|
||||
winner: _winnerSideIndex == 0,
|
||||
@@ -298,7 +298,7 @@ class _EventTeamMatchPageState extends ConsumerState<EventTeamMatchPage> {
|
||||
sideLabel: '蓝方',
|
||||
team: blueTeam,
|
||||
members: _blueMembers,
|
||||
backgroundImage: 'assets/images/image_blue_team.png',
|
||||
backgroundImage: Assets.images.imageBlueTeam.path,
|
||||
accentColor: const Color(0xFF287FDD),
|
||||
verifiedUserIds: _verifiedUserIds,
|
||||
winner: _winnerSideIndex == 1,
|
||||
@@ -451,6 +451,7 @@ class _TeamCard extends StatelessWidget {
|
||||
image: AssetImage(backgroundImage),
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
color: Colors.white,
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
@@ -460,7 +461,7 @@ class _TeamCard extends StatelessWidget {
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
'$sideLabel队伍名称：${team.name}',
|
||||
'$sideLabel队伍名称：${team.name}队伍',
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
@@ -509,15 +510,55 @@ class _TeamCard extends StatelessWidget {
|
||||
_TeamTextLine(
|
||||
label: '队长',
|
||||
text: _formatMember(leader),
|
||||
showOk: leaderVerified || leader.isLeader,
|
||||
showOk: verifiedUserIds.contains(leader.userId),
|
||||
),
|
||||
if (players.isNotEmpty)
|
||||
_TeamTextLine(
|
||||
label: '选手',
|
||||
text: players.map(_formatMember).join('、'),
|
||||
showOk: players.any(
|
||||
(member) => verifiedUserIds.contains(member.userId),
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
'选手：',
|
||||
style: TextStyle(
|
||||
fontSize: 13.sp,
|
||||
height: 1.35,
|
||||
color: const Color(0xFF747B86),
|
||||
fontWeight: FontWeight.w500,
|
||||
fontFamily: 'PingFang SC',
|
||||
),
|
||||
),
|
||||
...players.map(
|
||||
(member) => Row(
|
||||
children: [
|
||||
Text(
|
||||
_formatMember(member),
|
||||
|
||||
style: TextStyle(
|
||||
fontSize: 13.sp,
|
||||
height: 1.35,
|
||||
color: const Color(0xFF4D545F),
|
||||
),
|
||||
),
|
||||
if (verifiedUserIds.contains(member.userId))
|
||||
Padding(
|
||||
padding: EdgeInsets.only(left: 6.w),
|
||||
child: Image.asset(
|
||||
Assets.images.imageOk.path,
|
||||
width: 18.w,
|
||||
height: 14.h,
|
||||
fit: BoxFit.contain,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
(member != players.last ? '、' : ''),
|
||||
style: TextStyle(
|
||||
fontSize: 13.sp,
|
||||
height: 1.35,
|
||||
color: const Color(0xFF4D545F),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
],
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:recording_tool/features/competition_teams/model/model_competition_team_detail.dart';
|
||||
import 'package:recording_tool/shared/widgets/app_button.dart';
|
||||
import 'package:recording_tool/gen/assets.gen.dart';
|
||||
|
||||
/// 弹窗回传选中侧索引：0 = teamA（红队），1 = teamB（蓝队）
|
||||
class ManualWinnerDialog extends StatefulWidget {
|
||||
@@ -62,84 +62,109 @@ class _ManualWinnerDialogState extends State<ManualWinnerDialog> {
|
||||
Widget build(BuildContext context) {
|
||||
final teamA = _teamA;
|
||||
final teamB = _teamB;
|
||||
final maxHeight = MediaQuery.sizeOf(context).height * 0.78;
|
||||
|
||||
return AlertDialog(
|
||||
insetPadding: EdgeInsets.symmetric(horizontal: 22.w),
|
||||
contentPadding: EdgeInsets.zero,
|
||||
clipBehavior: Clip.antiAlias,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.r)),
|
||||
content: SizedBox(
|
||||
width: 320.w,
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Image.asset(
|
||||
'assets/images/image_dialog_bg.png',
|
||||
width: 320.w,
|
||||
height: 112.h,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.fromLTRB(20.w, 8.h, 20.w, 20.h),
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
'请在比赛结束前处理',
|
||||
key: const ValueKey('manual-winner-dialog-title'),
|
||||
style: TextStyle(
|
||||
fontSize: 20.sp,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: const Color(0xFF20242B),
|
||||
return Dialog(
|
||||
insetPadding: EdgeInsets.symmetric(horizontal: 48.w),
|
||||
backgroundColor: Colors.transparent,
|
||||
elevation: 0,
|
||||
child: ConstrainedBox(
|
||||
constraints: BoxConstraints(maxWidth: 380.w, maxHeight: maxHeight),
|
||||
child: Stack(
|
||||
clipBehavior: Clip.none,
|
||||
children: [
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(16.r),
|
||||
child: Material(
|
||||
color: Colors.white,
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Padding(
|
||||
padding: EdgeInsets.fromLTRB(18.w, 18.h, 18.w, 18.h),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
SizedBox(height: 26.h),
|
||||
Text(
|
||||
'请在比赛结束前处理',
|
||||
key: const ValueKey('manual-winner-dialog-title'),
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 18.sp,
|
||||
height: 1.3,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: const Color(0xFF20242B),
|
||||
fontFamily: 'PingFang SC',
|
||||
),
|
||||
),
|
||||
SizedBox(height: 16.h),
|
||||
if (teamA != null) ...[
|
||||
_TeamChoice(
|
||||
team: teamA,
|
||||
sideIndex: 0,
|
||||
color: const Color(0xFFFF6575),
|
||||
selected: _selectedSideIndex == 0,
|
||||
onTap: () =>
|
||||
setState(() => _selectedSideIndex = 0),
|
||||
),
|
||||
SizedBox(height: 10.h),
|
||||
],
|
||||
if (teamB != null)
|
||||
_TeamChoice(
|
||||
team: teamB,
|
||||
sideIndex: 1,
|
||||
color: const Color(0xFF21C5AC),
|
||||
selected: _selectedSideIndex == 1,
|
||||
onTap: () =>
|
||||
setState(() => _selectedSideIndex = 1),
|
||||
),
|
||||
SizedBox(height: 18.h),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: _DialogActionButton(
|
||||
label: '取消',
|
||||
onPressed: () =>
|
||||
Navigator.of(context).pop(),
|
||||
),
|
||||
),
|
||||
SizedBox(width: 14.w),
|
||||
Expanded(
|
||||
child: _DialogActionButton(
|
||||
label: '确定',
|
||||
filled: true,
|
||||
onPressed: _selectedSideIndex == null
|
||||
? null
|
||||
: () => Navigator.of(
|
||||
context,
|
||||
).pop(_selectedSideIndex),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 16.h),
|
||||
if (teamA != null) ...[
|
||||
_TeamChoice(
|
||||
team: teamA,
|
||||
sideIndex: 0,
|
||||
color: const Color(0xFFFF6B75),
|
||||
selected: _selectedSideIndex == 0,
|
||||
onTap: () => setState(() => _selectedSideIndex = 0),
|
||||
),
|
||||
SizedBox(height: 10.h),
|
||||
],
|
||||
if (teamB != null)
|
||||
_TeamChoice(
|
||||
team: teamB,
|
||||
sideIndex: 1,
|
||||
color: const Color(0xFF20BFA9),
|
||||
selected: _selectedSideIndex == 1,
|
||||
onTap: () => setState(() => _selectedSideIndex = 1),
|
||||
),
|
||||
SizedBox(height: 20.h),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: AppButton(
|
||||
label: '取消',
|
||||
variant: AppButtonVariant.secondary,
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
),
|
||||
),
|
||||
SizedBox(width: 14.w),
|
||||
Expanded(
|
||||
child: AppButton(
|
||||
label: '确定',
|
||||
onPressed: _selectedSideIndex == null
|
||||
? null
|
||||
: () => Navigator.of(
|
||||
context,
|
||||
).pop(_selectedSideIndex),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
top: -90.h,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: Image.asset(
|
||||
Assets.images.imageDialogBg.path,
|
||||
width: double.infinity,
|
||||
height: 112.h,
|
||||
fit: BoxFit.cover,
|
||||
alignment: Alignment.topCenter,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -167,12 +192,15 @@ class _TeamChoice extends StatelessWidget {
|
||||
? team.teamName!
|
||||
: '未命名队伍';
|
||||
final players = team.playerNames;
|
||||
final backgroundColor = selected
|
||||
? color.withValues(alpha: 0.13)
|
||||
: color.withValues(alpha: 0.07);
|
||||
return Semantics(
|
||||
selected: selected,
|
||||
button: true,
|
||||
label: '选择$name直接获胜',
|
||||
child: Material(
|
||||
color: color.withValues(alpha: selected ? 0.16 : 0.08),
|
||||
color: backgroundColor,
|
||||
borderRadius: BorderRadius.circular(12.r),
|
||||
child: InkWell(
|
||||
key: ValueKey('winner-choice-side-$sideIndex'),
|
||||
@@ -180,12 +208,12 @@ class _TeamChoice extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(12.r),
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 12.h),
|
||||
padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12.r),
|
||||
border: Border.all(
|
||||
color: selected ? color : color.withValues(alpha: 0.35),
|
||||
width: selected ? 2 : 1,
|
||||
color: selected ? color : color.withValues(alpha: 0.32),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
@@ -196,11 +224,23 @@ class _TeamChoice extends StatelessWidget {
|
||||
height: 22.r,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(color: selected ? color : Colors.grey),
|
||||
color: selected ? color : Colors.transparent,
|
||||
border: Border.all(
|
||||
color: selected ? color : const Color(0xFFB0B4BB),
|
||||
width: 1.2.r,
|
||||
),
|
||||
color: Colors.transparent,
|
||||
),
|
||||
child: selected
|
||||
? Icon(Icons.check, size: 15.r, color: Colors.white)
|
||||
? Center(
|
||||
child: Container(
|
||||
width: 10.r,
|
||||
height: 10.r,
|
||||
decoration: BoxDecoration(
|
||||
color: color,
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
),
|
||||
)
|
||||
: null,
|
||||
),
|
||||
SizedBox(width: 12.w),
|
||||
@@ -210,19 +250,27 @@ class _TeamChoice extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 17.sp,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.25,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: const Color(0xFF20242B),
|
||||
fontFamily: 'PingFang SC',
|
||||
),
|
||||
),
|
||||
if (players.isNotEmpty) ...[
|
||||
SizedBox(height: 4.h),
|
||||
Text(
|
||||
players,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
color: const Color(0xFF606874),
|
||||
fontSize: 15.sp,
|
||||
height: 1.25,
|
||||
color: const Color(0xFF69717E),
|
||||
fontFamily: 'PingFang SC',
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -232,10 +280,12 @@ class _TeamChoice extends StatelessWidget {
|
||||
SizedBox(width: 8.w),
|
||||
Text(
|
||||
'直接获胜',
|
||||
maxLines: 1,
|
||||
style: TextStyle(
|
||||
fontSize: 13.sp,
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 15.sp,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: color,
|
||||
fontFamily: 'PingFang SC',
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -246,3 +296,58 @@ class _TeamChoice extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _DialogActionButton extends StatelessWidget {
|
||||
const _DialogActionButton({
|
||||
required this.label,
|
||||
required this.onPressed,
|
||||
this.filled = false,
|
||||
});
|
||||
|
||||
final String label;
|
||||
final VoidCallback? onPressed;
|
||||
final bool filled;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final enabled = onPressed != null;
|
||||
final radius = BorderRadius.circular(24.r);
|
||||
final backgroundColor = filled
|
||||
? (enabled ? null : const Color(0xFFD2D3D8))
|
||||
: const Color(0xFFF1F1F1);
|
||||
final gradient = filled && enabled
|
||||
? const LinearGradient(colors: [Color(0xFF2F8DFF), Color(0xFF58D1EE)])
|
||||
: null;
|
||||
|
||||
return SizedBox(
|
||||
height: 40.h,
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
color: backgroundColor,
|
||||
gradient: gradient,
|
||||
borderRadius: radius,
|
||||
),
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: onPressed,
|
||||
borderRadius: radius,
|
||||
child: Center(
|
||||
child: Text(
|
||||
label,
|
||||
style: TextStyle(
|
||||
fontSize: 15.sp,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: filled
|
||||
? (enabled ? Colors.white : const Color(0xFF8D9098))
|
||||
: const Color(0xFF343941),
|
||||
fontFamily: 'PingFang SC',
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import 'package:recording_tool/features/competition_teams/server/server_competit
|
||||
import 'package:recording_tool/features/events/model/model_event_info.dart';
|
||||
import 'package:recording_tool/features/events/state/state_event_info.dart';
|
||||
import 'package:recording_tool/features/events/view_model/view_model_event_info.dart';
|
||||
import 'package:recording_tool/gen/assets.gen.dart';
|
||||
import 'package:recording_tool/shared/widgets/app_webview.dart';
|
||||
import 'package:recording_tool/shared/widgets/widgets.dart';
|
||||
|
||||
@@ -117,21 +118,14 @@ class _TopGradientHeader extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SizedBox(
|
||||
height: 219.h,
|
||||
width: double.infinity,
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.only(
|
||||
bottomLeft: Radius.circular(36.r),
|
||||
bottomRight: Radius.circular(36.r),
|
||||
),
|
||||
gradient: const LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: [Color(0xFF5EC9FF), Color(0xFF178BFF)],
|
||||
),
|
||||
),
|
||||
return Positioned(
|
||||
top: -10.h,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: SizedBox(
|
||||
height: 219.h,
|
||||
width: double.infinity,
|
||||
child: Image.asset(Assets.images.imageEventInfoBarBg.path),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -194,27 +188,6 @@ class _ProfileSection extends StatelessWidget {
|
||||
),
|
||||
child: Stack(
|
||||
children: [
|
||||
// Positioned(
|
||||
// top: -28.h,
|
||||
// right: -14.w,
|
||||
// child: Transform.rotate(
|
||||
// angle: 0.68,
|
||||
// child: Container(
|
||||
// width: 110.w,
|
||||
// height: 138.h,
|
||||
// decoration: BoxDecoration(
|
||||
// gradient: LinearGradient(
|
||||
// begin: Alignment.topCenter,
|
||||
// end: Alignment.bottomCenter,
|
||||
// colors: [
|
||||
// const Color(0xFF53D7FF).withValues(alpha: 0.12),
|
||||
// const Color(0xFFFF85C8).withValues(alpha: 0.13),
|
||||
// ],
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
|
||||
@@ -44,6 +44,10 @@ class $AssetsImagesGen {
|
||||
AssetGenImage get imageDialogBg =>
|
||||
const AssetGenImage('assets/images/image_dialog_bg.png');
|
||||
|
||||
/// File path: assets/images/image_event_info_bar_bg.png
|
||||
AssetGenImage get imageEventInfoBarBg =>
|
||||
const AssetGenImage('assets/images/image_event_info_bar_bg.png');
|
||||
|
||||
/// File path: assets/images/image_logo.png
|
||||
AssetGenImage get imageLogo =>
|
||||
const AssetGenImage('assets/images/image_logo.png');
|
||||
@@ -83,6 +87,7 @@ class $AssetsImagesGen {
|
||||
imageAppNameText,
|
||||
imageBlueTeam,
|
||||
imageDialogBg,
|
||||
imageEventInfoBarBg,
|
||||
imageLogo,
|
||||
imageOk,
|
||||
imagePageBg,
|
||||
|
||||
Reference in New Issue
Block a user