and so on
This commit is contained in:
@@ -1,18 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// 全局颜色常量
|
||||
class AppColors {
|
||||
static const Color primary = Color(0xFF165DFF);
|
||||
static const Color danger = Color(0xFFF53F3F);
|
||||
static const Color warning = Color(0xFFFF7D00);
|
||||
static const Color textPrimary = Color(0xFF1D2129);
|
||||
static const Color textSecondary = Color(0xFF4E5969);
|
||||
static const Color textHint = Color(0xFF86909C);
|
||||
static const Color background = Color(0xFFFFFFFF);
|
||||
static const Color cardBackground = Color(0xFFF8F9FA);
|
||||
static const Color borderColor = Color(0xFFE5E6EB);
|
||||
}
|
||||
|
||||
/// 全局尺寸常量
|
||||
class AppDimensions {
|
||||
static const double borderRadius = 16.0;
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:image_picker/image_picker.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import '../cubit/report_cubit.dart';
|
||||
import '../states/report_state.dart';
|
||||
import '../constants/report_constants.dart';
|
||||
@@ -30,10 +31,11 @@ class _ReportPageContent extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
return AnnotatedRegion<SystemUiOverlayStyle>(
|
||||
value: SystemUiOverlayStyle.dark,
|
||||
value: isDark ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark,
|
||||
child: Scaffold(
|
||||
backgroundColor: AppColors.cardBackground,
|
||||
backgroundColor: context.appColors.pageBackground,
|
||||
body: BlocConsumer<ReportCubit, ReportState>(
|
||||
listener: (context, state) {
|
||||
if (state is ReportFormState) {
|
||||
@@ -60,8 +62,8 @@ class _ReportPageContent extends StatelessWidget {
|
||||
},
|
||||
builder: (context, state) {
|
||||
if (state is ReportSubmitting || state is ReportDevicesLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.primary),
|
||||
return Center(
|
||||
child: CircularProgressIndicator(color: context.appColors.primary),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -90,7 +92,7 @@ class _ReportPageContent extends StatelessWidget {
|
||||
return PreferredSize(
|
||||
preferredSize: const Size.fromHeight(100),
|
||||
child: Container(
|
||||
color: AppColors.background,
|
||||
color: context.appColors.cardBackground,
|
||||
child: SafeArea(
|
||||
bottom: false,
|
||||
child: Padding(
|
||||
@@ -102,22 +104,22 @@ class _ReportPageContent extends StatelessWidget {
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
const Text(
|
||||
Text(
|
||||
'现场上报',
|
||||
style: TextStyle(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: AppColors.textPrimary,
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
context.read<ReportCubit>().submitReport();
|
||||
},
|
||||
child: const Text(
|
||||
child: Text(
|
||||
'提交',
|
||||
style: TextStyle(
|
||||
color: AppColors.primary,
|
||||
color: context.appColors.primary,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
@@ -132,9 +134,9 @@ class _ReportPageContent extends StatelessWidget {
|
||||
},
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(
|
||||
Icon(
|
||||
Icons.location_on,
|
||||
color: AppColors.primary,
|
||||
color: context.appColors.primary,
|
||||
size: 16,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
@@ -143,7 +145,7 @@ class _ReportPageContent extends StatelessWidget {
|
||||
state.location,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: AppColors.textSecondary,
|
||||
color: context.appColors.textSecondary,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
@@ -153,7 +155,7 @@ class _ReportPageContent extends StatelessWidget {
|
||||
Icon(
|
||||
Icons.arrow_drop_down,
|
||||
size: 20,
|
||||
color: AppColors.textHint,
|
||||
color: context.appColors.textTertiary,
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -327,7 +329,7 @@ class _ReportPageContent extends StatelessWidget {
|
||||
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
backgroundColor: Colors.white,
|
||||
backgroundColor: context.appColors.cardBackground,
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
|
||||
),
|
||||
@@ -340,12 +342,12 @@ class _ReportPageContent extends StatelessWidget {
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Text(
|
||||
Text(
|
||||
'选择场站',
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Color(0xFF1D2129),
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
@@ -364,7 +366,7 @@ class _ReportPageContent extends StatelessWidget {
|
||||
? Text('站点编码: ${site.siteCode}')
|
||||
: null,
|
||||
trailing: isSelected
|
||||
? const Icon(Icons.check, color: Color(0xFF165DFF))
|
||||
? Icon(Icons.check, color: context.appColors.primary)
|
||||
: null,
|
||||
onTap: () {
|
||||
cubit.selectSite(site);
|
||||
@@ -462,12 +464,15 @@ class _ReportPageContent extends StatelessWidget {
|
||||
if (isRobotType) {
|
||||
if (newState.robots.isEmpty) {
|
||||
deviceList = [
|
||||
const Center(
|
||||
Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(32),
|
||||
child: Text(
|
||||
'暂无机器人数据',
|
||||
style: TextStyle(fontSize: 14, color: Color(0xFF86909C)),
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: context.appColors.textTertiary,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -492,12 +497,15 @@ class _ReportPageContent extends StatelessWidget {
|
||||
} else if (isDroneType) {
|
||||
if (newState.drones.isEmpty) {
|
||||
deviceList = [
|
||||
const Center(
|
||||
Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(32),
|
||||
child: Text(
|
||||
'暂无无人机数据',
|
||||
style: TextStyle(fontSize: 14, color: Color(0xFF86909C)),
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: context.appColors.textTertiary,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -520,7 +528,7 @@ class _ReportPageContent extends StatelessWidget {
|
||||
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
backgroundColor: Colors.white,
|
||||
backgroundColor: context.appColors.cardBackground,
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
|
||||
),
|
||||
@@ -535,10 +543,10 @@ class _ReportPageContent extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
isRobotType ? '选择机器人' : '选择无人机',
|
||||
style: const TextStyle(
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Color(0xFF1D2129),
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import '../constants/report_constants.dart';
|
||||
|
||||
/// 问题描述输入模块
|
||||
@@ -22,11 +23,11 @@ class DescriptionInput extends StatelessWidget {
|
||||
),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.background,
|
||||
color: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(AppDimensions.borderRadius),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: const Color(0x0D000000),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: AppDimensions.cardShadowBlur,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
@@ -37,10 +38,10 @@ class DescriptionInput extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
loc.translate('report.problem_description'),
|
||||
style: const TextStyle(
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.textPrimary,
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
@@ -50,37 +51,37 @@ class DescriptionInput extends StatelessWidget {
|
||||
onChanged: onChanged,
|
||||
decoration: InputDecoration(
|
||||
hintText: loc.translate('report.description_hint'),
|
||||
hintStyle: const TextStyle(color: AppColors.textHint),
|
||||
hintStyle: TextStyle(color: context.appColors.textTertiary),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppDimensions.borderRadiusSmall,
|
||||
),
|
||||
borderSide: const BorderSide(color: AppColors.borderColor),
|
||||
borderSide: BorderSide(color: context.appColors.divider),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppDimensions.borderRadiusSmall,
|
||||
),
|
||||
borderSide: const BorderSide(color: AppColors.borderColor),
|
||||
borderSide: BorderSide(color: context.appColors.divider),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppDimensions.borderRadiusSmall,
|
||||
),
|
||||
borderSide: const BorderSide(
|
||||
color: AppColors.primary,
|
||||
borderSide: BorderSide(
|
||||
color: context.appColors.primary,
|
||||
width: 2,
|
||||
),
|
||||
),
|
||||
counterText: '',
|
||||
),
|
||||
style: const TextStyle(fontSize: 14, color: AppColors.textPrimary),
|
||||
style: TextStyle(fontSize: 14, color: context.appColors.textPrimary),
|
||||
),
|
||||
Align(
|
||||
alignment: Alignment.centerRight,
|
||||
child: Text(
|
||||
'${description?.length ?? 0}/200',
|
||||
style: const TextStyle(fontSize: 12, color: AppColors.textHint),
|
||||
style: TextStyle(fontSize: 12, color: context.appColors.textTertiary),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import '../constants/report_constants.dart';
|
||||
|
||||
/// 设备选择器
|
||||
@@ -19,11 +20,11 @@ class DeviceSelector extends StatelessWidget {
|
||||
),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.background,
|
||||
color: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(AppDimensions.borderRadius),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: const Color(0x0D000000),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: AppDimensions.cardShadowBlur,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
@@ -34,10 +35,10 @@ class DeviceSelector extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).translate('report.select_device'),
|
||||
style: const TextStyle(
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.textPrimary,
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
@@ -53,8 +54,8 @@ class DeviceSelector extends StatelessWidget {
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: selectedDevice != null
|
||||
? AppColors.textPrimary
|
||||
: AppColors.textHint,
|
||||
? context.appColors.textPrimary
|
||||
: context.appColors.textTertiary,
|
||||
),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
@@ -65,7 +66,7 @@ class DeviceSelector extends StatelessWidget {
|
||||
Icon(
|
||||
Icons.arrow_drop_down,
|
||||
size: 20,
|
||||
color: AppColors.textHint,
|
||||
color: context.appColors.textTertiary,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import '../constants/report_constants.dart';
|
||||
|
||||
class LevelSelector extends StatelessWidget {
|
||||
@@ -19,11 +20,11 @@ class LevelSelector extends StatelessWidget {
|
||||
),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.background,
|
||||
color: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(AppDimensions.borderRadius),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: const Color(0x0D000000),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: AppDimensions.cardShadowBlur,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
@@ -32,12 +33,12 @@ class LevelSelector extends StatelessWidget {
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text(
|
||||
Text(
|
||||
'问题等级',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.textPrimary,
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
@@ -53,14 +54,14 @@ class LevelSelector extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
color: isSelected
|
||||
? level.textColor.withOpacity(0.1)
|
||||
: AppColors.background,
|
||||
: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppDimensions.borderRadiusSmall,
|
||||
),
|
||||
border: Border.all(
|
||||
color: isSelected
|
||||
? level.borderColor
|
||||
: AppColors.borderColor,
|
||||
: context.appColors.divider,
|
||||
width: isSelected ? 2 : 1,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import '../constants/report_constants.dart';
|
||||
|
||||
/// 媒体上传模块
|
||||
@@ -31,11 +32,11 @@ class MediaUploader extends StatelessWidget {
|
||||
),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.background,
|
||||
color: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(AppDimensions.borderRadius),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: const Color(0x0D000000),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: AppDimensions.cardShadowBlur,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
@@ -46,10 +47,10 @@ class MediaUploader extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
loc.translate('report.upload_media'),
|
||||
style: const TextStyle(
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.textPrimary,
|
||||
color: context.appColors.textPrimary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
@@ -62,6 +63,7 @@ class MediaUploader extends StatelessWidget {
|
||||
children: [
|
||||
// 拍照按钮
|
||||
_buildUploadButton(
|
||||
context,
|
||||
icon: Icons.camera_alt,
|
||||
label: loc.translate('report.take_photo'),
|
||||
onTap: onCameraTap,
|
||||
@@ -69,6 +71,7 @@ class MediaUploader extends StatelessWidget {
|
||||
const SizedBox(width: 8),
|
||||
// 录像按钮
|
||||
_buildUploadButton(
|
||||
context,
|
||||
icon: Icons.videocam,
|
||||
label: loc.translate('report.record_video'),
|
||||
onTap: onVideoTap,
|
||||
@@ -92,7 +95,7 @@ class MediaUploader extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppDimensions.borderRadiusSmall,
|
||||
),
|
||||
color: AppColors.cardBackground,
|
||||
color: context.appColors.fillBackground,
|
||||
),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(
|
||||
@@ -171,6 +174,7 @@ class MediaUploader extends StatelessWidget {
|
||||
}).toList(),
|
||||
// 添加按钮
|
||||
_buildUploadButton(
|
||||
context,
|
||||
icon: Icons.add,
|
||||
label: '',
|
||||
onTap: onAddFromGallery,
|
||||
@@ -185,7 +189,8 @@ class MediaUploader extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildUploadButton({
|
||||
Widget _buildUploadButton(
|
||||
BuildContext context, {
|
||||
required IconData icon,
|
||||
required String label,
|
||||
required VoidCallback onTap,
|
||||
@@ -197,10 +202,14 @@ class MediaUploader extends StatelessWidget {
|
||||
width: 80,
|
||||
height: 80,
|
||||
decoration: BoxDecoration(
|
||||
color: isAddButton ? AppColors.cardBackground : AppColors.background,
|
||||
color: isAddButton
|
||||
? context.appColors.fillBackground
|
||||
: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(AppDimensions.borderRadiusMedium),
|
||||
border: Border.all(
|
||||
color: isAddButton ? AppColors.borderColor : AppColors.primary,
|
||||
color: isAddButton
|
||||
? context.appColors.divider
|
||||
: context.appColors.primary,
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
@@ -208,7 +217,9 @@ class MediaUploader extends StatelessWidget {
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
color: isAddButton ? AppColors.textHint : AppColors.primary,
|
||||
color: isAddButton
|
||||
? context.appColors.textTertiary
|
||||
: context.appColors.primary,
|
||||
size: 24,
|
||||
),
|
||||
if (label.isNotEmpty) ...[
|
||||
@@ -217,7 +228,9 @@ class MediaUploader extends StatelessWidget {
|
||||
label,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: isAddButton ? AppColors.textHint : AppColors.primary,
|
||||
color: isAddButton
|
||||
? context.appColors.textTertiary
|
||||
: context.appColors.primary,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import '../constants/report_constants.dart';
|
||||
|
||||
class ReportTypeSelector extends StatelessWidget {
|
||||
@@ -33,20 +34,20 @@ class ReportTypeSelector extends StatelessWidget {
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: isSelected
|
||||
? AppColors.primary.withOpacity(0.1)
|
||||
: AppColors.background,
|
||||
? context.appColors.primary.withOpacity(0.1)
|
||||
: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppDimensions.borderRadiusSmall,
|
||||
),
|
||||
border: Border.all(
|
||||
color: isSelected
|
||||
? AppColors.primary
|
||||
: AppColors.borderColor,
|
||||
? context.appColors.primary
|
||||
: context.appColors.divider,
|
||||
width: isSelected ? 2 : 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: const Color(0x0D000000),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: AppDimensions.cardShadowBlur,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
@@ -58,8 +59,8 @@ class ReportTypeSelector extends StatelessWidget {
|
||||
Icon(
|
||||
type.icon,
|
||||
color: isSelected
|
||||
? AppColors.primary
|
||||
: AppColors.textHint,
|
||||
? context.appColors.primary
|
||||
: context.appColors.textTertiary,
|
||||
size: 24,
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
@@ -69,8 +70,8 @@ class ReportTypeSelector extends StatelessWidget {
|
||||
fontSize: 12,
|
||||
height: 1.2,
|
||||
color: isSelected
|
||||
? AppColors.primary
|
||||
: AppColors.textSecondary,
|
||||
? context.appColors.primary
|
||||
: context.appColors.textSecondary,
|
||||
fontWeight: isSelected
|
||||
? FontWeight.w600
|
||||
: FontWeight.normal,
|
||||
|
||||
Reference in New Issue
Block a user