From 17738ff29e24922f603dc73ecc99a53c82b00a70 Mon Sep 17 00:00:00 2001
From: "1147192855@qq.com" <1147192855@qq.com>
Date: Thu, 25 Apr 2024 14:33:06 +0800
Subject: [PATCH] no message

---
 .../homework_correction/do_papers_job.dart    | 19 ++++++------
 .../widget/answer_handwriting.dart            | 31 +++++++++++--------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/marking_app/lib/pages/homework_correction/do_papers_job.dart b/marking_app/lib/pages/homework_correction/do_papers_job.dart
index 46b95c3..703ae3c 100644
--- a/marking_app/lib/pages/homework_correction/do_papers_job.dart
+++ b/marking_app/lib/pages/homework_correction/do_papers_job.dart
@@ -859,16 +859,15 @@ Widget $examPaperAndScoringKeyboardView(
                               ],
                             ),
                           ),
-                          if (question.accuracy > 0)
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 1.5.h),
-                              child: quickText(
-                                '正确率：${getDoubleRemoveZero(question.accuracy, question.accuracy.toString())}%',
-                                size: 8.sp,
-                                color: Colors.white,
-                                align: TextAlign.end,
-                              ),
-                            )
+                          Padding(
+                            padding: EdgeInsets.only(bottom: 1.5.h),
+                            child: quickText(
+                              '正确率：${getDoubleRemoveZero(question.accuracy, question.accuracy.toString())}%',
+                              size: 8.sp,
+                              color: Colors.white,
+                              align: TextAlign.end,
+                            ),
+                          )
                         ],
                       ),
                     ),
diff --git a/marking_app/lib/pages/homework_correction/widget/answer_handwriting.dart b/marking_app/lib/pages/homework_correction/widget/answer_handwriting.dart
index ac61356..289579a 100644
--- a/marking_app/lib/pages/homework_correction/widget/answer_handwriting.dart
+++ b/marking_app/lib/pages/homework_correction/widget/answer_handwriting.dart
@@ -124,7 +124,7 @@ class AnswerHandwritingMainBox extends HookWidget {
               _dataDetail,
               key: _useStateModel.handwritingKey,
             ),
-            $PageNumberBox(_data.pageNum),
+            $PageNumberBox(_data.pageNum, _data.pageCount),
             // 上一页按钮
             $PreviousNutton(
               _useStateModel.pageNum.value,
@@ -471,6 +471,7 @@ class _HandwritingDrawBoxState extends ConsumerState<HandwritingDrawBox> with Ev
   /// @param startTime 起始时间 单位秒
   Future<void> dragProgressBarInitData(int startTime, int totalDuration) async {
     eventFire(model: JobHandwritingPlaybarBus(false, false));
+
     timers.forEach((e) {
       if (e.isActive) e.cancel();
     });
@@ -485,7 +486,6 @@ class _HandwritingDrawBoxState extends ConsumerState<HandwritingDrawBox> with Ev
       startTime = startTime * 1000; // 转为毫秒
       List<GestureHandwritingRecording> executeImmediately = []; // 立即执行数据
       List<GestureHandwritingRecording> waitingExecution = []; // 等待执行数据
-
       for (var i = 0; i < _packagedHandwritingDataAll.length; i++) {
         var item = _packagedHandwritingDataAll[i];
 
@@ -515,14 +515,12 @@ class _HandwritingDrawBoxState extends ConsumerState<HandwritingDrawBox> with Ev
       List<GestureHandwritingRecording> trajectorys = ref.read(jobHandwritingDrawingTrajectoryProvider)..add(e);
       ref.read(jobHandwritingDrawingTrajectoryProvider.notifier).setVal(List.from(trajectorys));
       pendingData.remove(e); // 执行后删除容器中的当前动作
-      print('正在执行播放.............');
     }
   }
 
   /// 开始播放
   Future<void> toGoPlay() async {
     try {
-      handwritingTime = 0;
       var executableData = _packagedHandwritingDataAll;
       if (pendingData.isNotEmpty) {
         // 待执行的数据没有执行完成 就继续执行待执行数据
@@ -642,18 +640,25 @@ class DrawingPainter extends CustomPainter {
 }
 
 @swidget
-Widget $pageNumberBox(int pageNum) {
+Widget $pageNumberBox(int pageNum, int totalNum) {
   return Positioned(
     top: 6.h,
     right: 4.w,
     child: Container(
-      padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 2.h),
-      decoration: BoxDecoration(
-        color: Color.fromRGBO(0, 0, 0, 0.47),
-        borderRadius: BorderRadius.circular(5.r),
-      ),
-      child: quickText('第$pageNum页', color: Colors.white, size: 10.sp),
-    ),
+        padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 2.h),
+        decoration: BoxDecoration(
+          color: Color.fromRGBO(0, 0, 0, 0.47),
+          borderRadius: BorderRadius.circular(5.r),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            quickText('$pageNum', color: Colors.white, size: 11.sp, align: TextAlign.end),
+            quickText('/', color: Colors.white, size: 10.sp, align: TextAlign.end),
+            quickText('$totalNum', color: Colors.white, size: 8.sp, align: TextAlign.end),
+          ],
+        )),
   );
 }
 
@@ -840,7 +845,7 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
               theIndex = -1;
             }
             usePlaybar.constantFastSpeed.value = PlaybackSpeed.values[theIndex + 1];
-          }),
+          }, duration: Duration(milliseconds: 500)),
           child: Container(
             // alignment: Alignment.,
             padding: EdgeInsets.symmetric(horizontal: 3.w, vertical: 1.5.h),