From 0fd3a610fb6d42a80557c48d2717f410a31c56e1 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Fri, 26 Apr 2024 15:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BA=91=E5=AD=98=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doorLockLog/doorLockLog_logic.dart | 2 +- .../doorLockLog/doorLockLog_page.dart | 1 - .../editVideoLog/editVideoLog_page.dart | 19 +++++++---- .../editVideoLog/editVideoLog_state.dart | 4 +-- .../videoLogDownLoad_page.dart | 32 +++++++++++++++---- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart index fd4077d2..2a512829 100644 --- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart +++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart @@ -200,7 +200,7 @@ class DoorLockLogLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { state.lockLogItemList.value = entity.data!.itemList!; - } else {} + } } /// 刷新门锁日志列表 diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index 84a97d61..64d7f612 100644 --- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -10,7 +10,6 @@ import 'package:star_lock/tools/noData.dart'; import 'package:timelines/timelines.dart'; import '../../../app_settings/app_colors.dart'; -import '../../../tools/storage.dart'; import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; diff --git a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart index 6e5fbb72..9ba5e6b1 100644 --- a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart +++ b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart @@ -36,25 +36,30 @@ class _EditVideoLogPageState extends State { ), onPressed: () async { state.isSelectAll.value = !state.isSelectAll.value; - if (state.selectVideoLogList.value.isEmpty) { + + if (state.selectVideoLogList.isEmpty) { state.isSelectAll.value = true; } + if (state.selectVideoLogList.length == + state.videoLogList.length) { + state.isSelectAll.value = false; + } if (state.isSelectAll.value == true) { - state.selectVideoLogList.value.clear(); - state.videoLogList.forEach((element) { + state.selectVideoLogList.clear(); + for (var element in state.videoLogList) { element.recordList!.forEach((element) { element.isSelect = true; state.selectVideoLogList.add(element); }); - }); + } } else { - state.selectVideoLogList.value.clear(); - state.videoLogList.forEach((element) { + state.selectVideoLogList.clear(); + for (var element in state.videoLogList) { element.recordList!.forEach((element) { element.isSelect = false; state.selectVideoLogList.remove(element); }); - }); + } } setState(() {}); }, diff --git a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart index d83405a9..83d561e6 100644 --- a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart +++ b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart @@ -2,9 +2,9 @@ import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/videoLog/videoLog/videoLog_entity.dart'; class EditVideoLogState { - var selectVideoLogList = [].obs; + var selectVideoLogList = [].obs; //选中的视频列表 var isSelectAll = false.obs; - var videoLogList = [].obs; + var videoLogList = [].obs; //全部的视频列表 var getLockId = 0.obs; EditVideoLogState() { diff --git a/star_lock/lib/main/lockDetail/videoLog/videoLogDownLoad/videoLogDownLoad_page.dart b/star_lock/lib/main/lockDetail/videoLog/videoLogDownLoad/videoLogDownLoad_page.dart index 5bd84efe..43b426f3 100644 --- a/star_lock/lib/main/lockDetail/videoLog/videoLogDownLoad/videoLogDownLoad_page.dart +++ b/star_lock/lib/main/lockDetail/videoLog/videoLogDownLoad/videoLogDownLoad_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/main/lockDetail/videoLog/videoLog/videoLog_entity.dart'; import 'package:star_lock/tools/dateTool.dart'; @@ -82,17 +83,34 @@ class _VideoLogDownLoadPageState extends State { .image), ), SizedBox(width: 15.w), - Text(DateTool().dateToYMDHNString(recordData.operateDate.toString()), - style: TextStyle(fontSize: 20.sp)), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + DateTool() + .dateToYMDHNString(recordData.operateDate.toString()), + style: TextStyle(fontSize: 20.sp)), + ], + ), Expanded( child: SizedBox( width: 20.w, )), - TextButton( - onPressed: () {}, - child: Text('下载'.tr, - style: - TextStyle(fontSize: 22.sp, color: AppColors.mainColor))) + GestureDetector( + onTap: () {}, + child: Container( + width: 120.w, + height: 50.h, + decoration: BoxDecoration( + border: Border.all(color: AppColors.mainColor), + borderRadius: BorderRadius.circular(8.w)), + child: Center( + child: Text('下载'.tr, + style: TextStyle( + fontSize: 20.sp, color: AppColors.mainColor)), + )), + ) ], ), );