diff --git a/lib/data/providers/sqlite_provider.dart b/lib/data/providers/sqlite_provider.dart index 6eb2a95..5031d9d 100644 --- a/lib/data/providers/sqlite_provider.dart +++ b/lib/data/providers/sqlite_provider.dart @@ -136,14 +136,9 @@ class SQLiteProvider extends GetxService { /// 更新问题记录，并设置同步状态为未同步 Future updateProblem(Problem problem) async { try { - // 确保更新后同步状态为未同步 - final problemToUpdate = problem.copyWith( - syncStatus: SyncStatus.notSynced, - ); - final result = await _database.update( _tableName, - problemToUpdate.toMap(), + problem.toMap(), where: 'id = ?', whereArgs: [problem.id], ); diff --git a/lib/modules/problem/controllers/problem_controller.dart b/lib/modules/problem/controllers/problem_controller.dart index 8f742d8..525713c 100644 --- a/lib/modules/problem/controllers/problem_controller.dart +++ b/lib/modules/problem/controllers/problem_controller.dart @@ -331,7 +331,15 @@ class ProblemController extends GetxController if (picked != null) { // 处理用户选择的日期范围 historyStartTime.value = picked.start; - historyEndTime.value = picked.end; + historyEndTime.value = DateTime( + picked.end.year, + picked.end.month, + picked.end.day, + 23, + 59, + 59, + 999, + ); loadProblems(); log('选择的日期范围是: ${picked.start} 到 ${picked.end}'); } @@ -394,6 +402,7 @@ class ProblemController extends GetxController /// 显示上传页面 void showUploadPage() { Get.toNamed(AppRoutes.problemUpload); + clearSelection(); loadUnUploadedProblems(); } diff --git a/lib/modules/problem/views/problem_page.dart b/lib/modules/problem/views/problem_page.dart index b6550f3..fc16c9b 100644 --- a/lib/modules/problem/views/problem_page.dart +++ b/lib/modules/problem/views/problem_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:problem_check_system/app/routes/app_routes.dart'; import 'package:problem_check_system/modules/problem/controllers/problem_controller.dart'; import 'package:problem_check_system/modules/problem/views/problem_list_page.dart'; // 导入修正后的 ProblemListPage import 'package:problem_check_system/modules/problem/views/widgets/current_filter_bar.dart'; diff --git a/lib/modules/problem/views/problem_upload_page.dart b/lib/modules/problem/views/problem_upload_page.dart index f53c55e..7553fd4 100644 --- a/lib/modules/problem/views/problem_upload_page.dart +++ b/lib/modules/problem/views/problem_upload_page.dart @@ -24,7 +24,13 @@ class ProblemUploadPage extends GetView { return Text('已选择$selectedCount项'); }), centerTitle: true, - leading: IconButton(icon: Icon(Icons.close), onPressed: () => Get.back()), + // leading: IconButton( + // icon: Icon(Icons.close), + // onPressed: () { + // Get.back(); + // controller.clearSelection(); + // }, + // ), actions: [ Obx( () => TextButton( diff --git a/lib/modules/problem/views/widgets/problem_card.dart b/lib/modules/problem/views/widgets/problem_card.dart index 96e3e46..f3975e3 100644 --- a/lib/modules/problem/views/widgets/problem_card.dart +++ b/lib/modules/problem/views/widgets/problem_card.dart @@ -6,8 +6,8 @@ import 'package:problem_check_system/app/routes/app_routes.dart'; import 'package:problem_check_system/data/models/sync_status.dart'; import 'package:problem_check_system/data/models/problem_model.dart'; import 'package:problem_check_system/modules/problem/views/widgets/custom_button.dart'; -import 'package:problem_check_system/modules/problem/views/problem_form_page.dart'; import 'package:tdesign_flutter/tdesign_flutter.dart'; +import 'dart:io'; // 添加文件操作支持 // 定义枚举类型 enum ProblemCardViewType { buttons, checkbox } @@ -28,11 +28,20 @@ class ProblemCard extends StatelessWidget { @override Widget build(BuildContext context) { + // 根据是否已删除决定卡片的颜色 + final bool isDeleted = problem.isDeleted; + final Color cardColor = isDeleted + ? Colors.grey[300]! + : Theme.of(context).cardColor; + final Color contentColor = isDeleted + ? Colors.grey[600]! + : Theme.of(context).textTheme.bodyMedium!.color!; + return Card( + color: cardColor, child: InkWell( onTap: viewType == ProblemCardViewType.checkbox ? () { - // 点击卡片时切换选中状态 onChanged?.call(problem, !isSelected); } : null, @@ -40,18 +49,18 @@ class ProblemCard extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ ListTile( - leading: Image.asset( - 'assets/images/problem_preview.png', - fit: BoxFit.contain, + leading: _buildImageWidget(isDeleted), // 使用新的图片构建方法 + title: Text( + '问题描述', + style: TextStyle(fontSize: 16.sp, color: contentColor), ), - title: Text('问题描述', style: TextStyle(fontSize: 16.sp)), subtitle: LayoutBuilder( builder: (context, constraints) { return Text( problem.description, maxLines: 2, overflow: TextOverflow.ellipsis, - style: TextStyle(fontSize: 14.sp), + style: TextStyle(fontSize: 14.sp, color: contentColor), ); }, ), @@ -60,27 +69,26 @@ class ProblemCard extends StatelessWidget { Row( children: [ SizedBox(width: 16.w), - Icon(Icons.location_on, color: Colors.grey, size: 16.h), + Icon(Icons.location_on, color: contentColor, size: 16.h), SizedBox(width: 8.w), SizedBox( width: 100.w, child: Text( problem.location, - style: TextStyle(fontSize: 12.sp), + style: TextStyle(fontSize: 12.sp, color: contentColor), overflow: TextOverflow.ellipsis, maxLines: 1, ), ), SizedBox(width: 16.w), - Icon(Icons.access_time, color: Colors.grey, size: 16.h), + Icon(Icons.access_time, color: contentColor, size: 16.h), SizedBox(width: 8.w), Expanded( child: Text( DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(problem.creationTime), - style: TextStyle(fontSize: 12.sp), - // overflow: TextOverflow.ellipsis, + style: TextStyle(fontSize: 12.sp, color: contentColor), ), ), ], @@ -93,20 +101,46 @@ class ProblemCard extends StatelessWidget { Wrap( spacing: 8, children: [ - problem.syncStatus == SyncStatus.synced - ? TDTag('已上传', isLight: true, theme: TDTagTheme.success) - : TDTag('未上传', isLight: true, theme: TDTagTheme.danger), - problem.bindData != null && problem.bindData!.isNotEmpty - ? TDTag('已绑定', isLight: true, theme: TDTagTheme.primary) - : TDTag( - '未绑定', - isLight: true, - theme: TDTagTheme.warning, - ), + ...problem.isDeleted + ? [ + TDTag( + '已删除', + theme: TDTagTheme.danger, + textColor: isDeleted ? Colors.grey[700] : null, + backgroundColor: isDeleted + ? Colors.grey[400] + : null, + ), + ] + : [ + problem.syncStatus == SyncStatus.synced + ? TDTag( + '已上传', + isLight: true, + theme: TDTagTheme.success, + ) + : TDTag( + '未上传', + isLight: true, + theme: TDTagTheme.danger, + ), + problem.bindData != null && + problem.bindData!.isNotEmpty + ? TDTag( + '已绑定', + isLight: true, + theme: TDTagTheme.primary, + ) + : TDTag( + '未绑定', + isLight: true, + theme: TDTagTheme.warning, + ), + ], ], ), const Spacer(), - _buildBottomActions(), // 移除参数 + _buildBottomActions(isDeleted), ], ), SizedBox(height: 8.h), @@ -116,18 +150,70 @@ class ProblemCard extends StatelessWidget { ); } - Widget _buildBottomActions() { + Widget _buildImageWidget(bool isDeleted) { + return AspectRatio( + aspectRatio: 1, // 强制正方形 + child: _buildImageContent(isDeleted), + ); + } + + Widget _buildImageContent(bool isDeleted) { + // 检查是否有图片路径 + if (problem.imageUrls.isEmpty || problem.imageUrls[0].localPath.isEmpty) { + // 如果没有图片，显示默认占位图 + return Image.asset( + 'assets/images/problem_preview.png', + fit: BoxFit.cover, // 使用 cover 来填充正方形区域 + color: isDeleted ? Colors.grey[500] : null, + colorBlendMode: isDeleted ? BlendMode.saturation : null, + ); + } + + final String imagePath = problem.imageUrls[0].localPath; + + // 检查文件是否存在 + final File imageFile = File(imagePath); + if (!imageFile.existsSync()) { + // 如果文件不存在，显示默认占位图 + return Image.asset( + 'assets/images/problem_preview.png', + fit: BoxFit.cover, + color: isDeleted ? Colors.grey[500] : null, + colorBlendMode: isDeleted ? BlendMode.saturation : null, + ); + } + + // 如果文件存在，使用 Image.file 加载 + return Image.file( + imageFile, + fit: BoxFit.cover, // 使用 cover 来填充正方形区域 + color: isDeleted ? Colors.grey[500] : null, + colorBlendMode: isDeleted ? BlendMode.saturation : null, + errorBuilder: (context, error, stackTrace) { + // 如果加载失败，显示默认图片 + return Image.asset( + 'assets/images/problem_preview.png', + fit: BoxFit.cover, + color: isDeleted ? Colors.grey[500] : null, + colorBlendMode: isDeleted ? BlendMode.saturation : null, + ); + }, + ); + } + + Widget _buildBottomActions(bool isDeleted) { switch (viewType) { case ProblemCardViewType.buttons: return Row( children: [ - CustomButton( - text: '修改', - onTap: () { - Get.toNamed(AppRoutes.problemForm, arguments: problem); - }, - ), - SizedBox(width: 8.w), + if (!isDeleted) + CustomButton( + text: '修改', + onTap: () { + Get.toNamed(AppRoutes.problemForm, arguments: problem); + }, + ), + if (!isDeleted) SizedBox(width: 8.w), CustomButton( text: '查看', onTap: () { @@ -145,12 +231,14 @@ class ProblemCard extends StatelessWidget { return Padding( padding: EdgeInsets.only(right: 16.w), child: Checkbox( - value: isSelected, // 使用组件的选中状态 - onChanged: (bool? value) { - if (value != null) { - onChanged?.call(problem, value); - } - }, + value: isSelected, + onChanged: isDeleted + ? null + : (bool? value) { + if (value != null) { + onChanged?.call(problem, value); + } + }, ), ); }