no message

making_school_asignment_app/lib/common/job/marking_models/do_paper_bus.dart

@@ -0,0 +1,22 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'do_paper_bus.g.dart';
+
+// 批阅页面底部操作栏BUG
+@JsonSerializable()
+class BottomOperationBar extends Object {
+  @JsonKey(name: 'revoke_pre_step') // 撤销上一步
+  bool revokePreStep;
+
+  @JsonKey(name: 'revoke_all') // 撤销全部
+  bool revokeAll;
+
+  BottomOperationBar({
+    required this.revokePreStep,
+    required this.revokeAll,
+  });
+
+  factory BottomOperationBar.fromJson(Map<String, dynamic> srcJson) => _$BottomOperationBarFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$BottomOperationBarToJson(this);
+}

making_school_asignment_app/lib/common/job/marking_models/do_test_questions_image_info.dart

@@ -4,6 +4,9 @@ part 'do_test_questions_image_info.g.dart';
 
 @JsonSerializable()
 class TestQuestionsImageInfo extends Object {
+  @JsonKey(name: 'templateId')
+  int? templateId;
+
   @JsonKey(name: 'boxHeight')
   double boxHeight;
 
@@ -28,6 +31,12 @@ class TestQuestionsImageInfo extends Object {
   @JsonKey(name: 'remainingHeight') // 视图剩余高度 实际展示图片展示高度下 剩余高度.(若伟负数就是超出视图的高度值)
   double remainingHeight;
 
+  @JsonKey(name: 'imageHeightOffsetStart') // 顶部坐标Y
+  double imageHeightOffsetStart;
+
+  @JsonKey(name: 'imageHeightOffsetend') // 底部坐标Y
+  double imageHeightOffsetend;
+
   // 基准
   @JsonKey(name: 'scaleRatio')
   double scaleRatio;
@@ -42,17 +51,22 @@ class TestQuestionsImageInfo extends Object {
     required this.boxHeight,
     required this.imageWidth,
     required this.imageHeight,
+    this.templateId,
     this.scaleRatio = 1,
     this.zoom = 1,
     this.actualImgWidth = 0,
     this.actualImgHeight = 0,
     this.remainingHeight = 0,
+    this.imageHeightOffsetStart = 0,
+    this.imageHeightOffsetend = 0,
   }) {
     // 图片已视图宽为基准，高度自适应可滑动   图片的实际宽高都需要乘此基准值
     scaleRatio = boxWidth / imageWidth;
     actualImgWidth = imageWidth * scaleRatio;
     actualImgHeight = imageHeight * scaleRatio;
     remainingHeight = boxHeight - actualImgHeight;
+    imageHeightOffsetStart = remainingHeight / 2;
+    imageHeightOffsetend = imageHeightOffsetStart + actualImgHeight;
   }
 
   factory TestQuestionsImageInfo.fromJson(Map<String, dynamic> srcJson) => _$TestQuestionsImageInfoFromJson(srcJson);

making_school_asignment_app/lib/common/mixins/event_bus_mixin.dart

@@ -0,0 +1,31 @@
+// event_bus 混入类
+import 'dart:async';
+
+import 'package:event_bus/event_bus.dart';
+import 'package:making_school_asignment_app/common/utils/event_bus_utils.dart';
+
+mixin EventBusMixin<T> {
+  StreamSubscription? _subscription;
+  static final EventBusUtils _exampleUtil = EventBusUtils();
+  static final EventBus _eBus = _exampleUtil.getEventBus();
+
+  /*
+   * 发起事件总线监听
+   * @param {Function} callback 回调函数
+  */
+  /// 发起事件总线监听 @param {Function} callback 回调函数
+  StreamSubscription eventOn<T>({required void Function(T) callback}) {
+    _subscription = _eBus.on<T>().listen(callback);
+    return _subscription!;
+  }
+
+  // 触发事件总线
+  void eventFire({required T model}) {
+    _exampleUtil.toFire<T>(model);
+  }
+
+  // 关闭监听总线事件
+  void eventCancel() {
+    _subscription?.cancel();
+  }
+}

making_school_asignment_app/lib/common/utils/event_bus_utils.dart

@@ -0,0 +1,26 @@
+import 'package:event_bus/event_bus.dart';
+
+//订阅者回调签名
+typedef EventCallback = void Function(dynamic arg);
+
+///事件总线
+class EventBusUtils {
+  late final EventBus _eventBus;
+
+  // 单例模式
+  static final EventBusUtils _instance = EventBusUtils._internal();
+  factory EventBusUtils() => _instance;
+  EventBusUtils._internal() {
+    _eventBus = EventBus();
+  }
+
+  // 获取实例
+  EventBus getEventBus() {
+    return _eventBus;
+  }
+
+  // 发起事件
+  void toFire<T>(T model) {
+    _eventBus.fire(model);
+  }
+}

making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:making_school_asignment_app/common/job/marking_models/do_paper_bus.dart';
+import 'package:making_school_asignment_app/common/mixins/event_bus_mixin.dart';
 import 'package:making_school_asignment_app/common/utils/anti_shake_throttling.dart';
 import 'package:making_school_asignment_app/common/utils/utils.dart';
 import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
@@ -16,7 +18,7 @@ class BottomAnnotationSwitch extends StatefulWidget {
   State<BottomAnnotationSwitch> createState() => _BottomAnnotationSwitchJobState();
 }
 
-class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with SingleTickerProviderStateMixin {
+class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with SingleTickerProviderStateMixin, EventBusMixin<BottomOperationBar> {
   late AnimationController _animationController; // 动画
   final _homeworkLogic = Get.find<HomeworkReviewLogic>();
   final _logicControl = Get.find<HomeworkReviewLogic>().annotationState;
@@ -39,6 +41,7 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
         _animationController.reverse();
       }
     });
+
     super.initState();
   }
 
@@ -48,6 +51,8 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
       ..removeListener(toUp)
       ..dispose();
     _opControllisten?.cancel();
+
+    eventCancel();
     super.dispose();
   }
 
@@ -132,7 +137,7 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
                     ],
                   ),
                 ),
-                Container(width: double.infinity, color: Colors.white, height: 0.5.h),
+                Container(width: double.infinity, color: Colors.white, height: 0.35.h),
                 Expanded(
                   child: Row(
                     children: [
@@ -142,19 +147,26 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
                           width: double.infinity,
                           height: double.infinity,
                           child: IconButton(
-                            onPressed: () => easyThrottle('homework_bottom_action_bar_annotations', () {}),
+                            onPressed: () => easyThrottle(
+                              'homework_bottom_action_bar_annotations',
+                              () => eventFire(model: BottomOperationBar(revokeAll: false, revokePreStep: true)),
+                            ),
                             icon: Icon(const IconData(0xe638, fontFamily: "AlibabaIcon"), size: iconSize, color: defaultColor),
                           ),
                         ),
                       ),
                       Container(width: 0.3.w, height: double.infinity, color: Colors.white),
+                      // 全部撤销
                       Expanded(
                         child: SizedBox(
                           width: double.infinity,
                           height: double.infinity,
                           child: IconButton(
                             icon: Icon(const IconData(0xe637, fontFamily: "AlibabaIcon"), size: iconSize, color: defaultColor),
-                            onPressed: () => easyThrottle('homework_bottom_action_bar_annotations', () {}),
+                            onPressed: () => easyThrottle(
+                              'homework_bottom_action_bar_annotations',
+                              () => eventFire(model: BottomOperationBar(revokeAll: true, revokePreStep: false)),
+                            ),
                           ),
                         ),
                       ),

making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart

@@ -6,9 +6,11 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:functional_widget_annotation/functional_widget_annotation.dart';
 import 'package:get/get.dart';
 import 'package:making_school_asignment_app/common/config/request_config.dart';
+import 'package:making_school_asignment_app/common/job/marking_models/do_paper_bus.dart';
 import 'package:making_school_asignment_app/common/job/marking_models/do_paper_details_param.dart';
 import 'package:making_school_asignment_app/common/job/marking_models/do_paper_details_result.dart';
 import 'package:making_school_asignment_app/common/job/marking_models/do_test_questions_image_info.dart';
+import 'package:making_school_asignment_app/common/mixins/event_bus_mixin.dart';
 import 'package:making_school_asignment_app/common/utils/anti_shake_throttling.dart';
 import 'package:making_school_asignment_app/common/utils/cached_network_img.dart';
 import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
@@ -30,6 +32,7 @@ class QuestionPaperView extends StatefulWidget {
 class _QuestionPaperViewState extends State<QuestionPaperView> {
   final logic = Get.find<HomeworkReviewLogic>();
   final sateData = Get.find<HomeworkReviewLogic>().state;
+  final annotationState = Get.find<HomeworkReviewLogic>().annotationState;
 
   @override
   Widget build(BuildContext context) {
@@ -44,7 +47,7 @@ class _QuestionPaperViewState extends State<QuestionPaperView> {
             return Stack(
               children: [
                 // 主图
-                $QuestionImageView(maxWidth, maxHeight, sateData),
+                QuestionImageView(maxWidth, maxHeight, sateData, annotationState),
                 // 继续批阅按钮
                 Positioned(right: 3.w, bottom: 4.h, child: const $ContinueToReview(isFloatingAction: true)),
                 // 上一题按钮
@@ -111,9 +114,10 @@ Widget $questionNumberView(BuildContext context, HomeworkReviewState sateData) {
   final scrollControllerNum = useScrollController(); // 试题题号区域
 
   useEffect(() {
-    StreamSubscription listenVal = sateData.slide.listen((e) => scrollControllerNum.jumpTo(e));
+    var listenVal = sateData.slide.listen((e) {
+      if (e != scrollControllerNum.offset) scrollControllerNum.jumpTo(e);
+    });
 
-    // 返回一个清理函数，在组件销毁时移除监听
     return () {
       listenVal.cancel();
     };
@@ -141,8 +145,12 @@ Widget $questionNumberView(BuildContext context, HomeworkReviewState sateData) {
         var imageVal = sateData.imageScale.value;
         if (imageVal == null) return const SizedBox();
         var studentQuestions = sateData.studentQuestions.value;
-        print('书哈哈哈...');
+
-        return Padding(
+        var boxHeight = imageVal.boxHeight;
+        var actualImgHeight = imageVal.actualImgHeight; // 实际图片高度
+
+        return Container(
+          height: boxHeight > actualImgHeight ? boxHeight : actualImgHeight,
           padding: EdgeInsets.only(top: imageVal.remainingHeight > 0 ? imageVal.remainingHeight / 2 : 0),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -276,85 +284,139 @@ Widget $scoringQuestionsView(BuildContext context, StudentQuestions item, double
 }
 
 // 试题图片视图
-@hwidget
+class QuestionImageView extends HookWidget with EventBusMixin<BottomOperationBar> {
-Widget $questionImageView(double maxWidth, double maxHeight, HomeworkReviewState sateData) {
+  final double maxWidth;
-  final scrollControllerQuestion = useScrollController(); // 试题图片区域
+  final double maxHeight;
-  var vnHandWritings = useValueNotifier<List<dynamic>>([]);
+  final HomeworkReviewState sateData;
-  ImageStream? imageStream;
+  final HomeworkReviewAnnotationsControlState annotationState;
-  var imageStreamListener = useState<ImageStreamListener>(ImageStreamListener((ImageInfo info, bool _) {
+  QuestionImageView(this.maxWidth, this.maxHeight, this.sateData, this.annotationState, {super.key});
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      sateData.imageScale.value = TestQuestionsImageInfo(
-        boxWidth: maxWidth,
-        boxHeight: maxHeight,
-        imageWidth: info.image.width.toDouble(),
-        imageHeight: info.image.height.toDouble(),
-        url: sateData.data.value!.zgtAnswer,
-      );
-    });
-  }));
 
-  // 可选：添加滚动监听
+  /// 获取数组指定倒数具体值的下标
-  useEffect(() {
+  int _findTargetIndex<T>(List<T> list, T target, [int reciprocal = 2]) {
-    scrollControllerQuestion.addListener(() {
+    List<int> indexs = [];
-      // 执行滚动相关的逻辑，例如打印滚动位置
+    for (int i = list.length - 1; i >= 0; i--) {
-      sateData.slide.value = scrollControllerQuestion.offset;
+      if (list[i] == target) {
-    });
+        indexs.add(i);
-    // 返回一个清理函数，在组件销毁时移除监听
+        if (indexs.length == reciprocal) return i;
-    return () {
+      }
-      imageStream?.removeListener(imageStreamListener.value);
+    }
-    };
+    return -1;
-  }, []);
+  }
 
-  print('这里是加载了..............');
+  @override
-  return Container(
+  Widget build(BuildContext context) {
-    height: maxHeight,
+    final scrollControllerQuestion = useScrollController(); // 试题图片区域
-    // padding: EdgeInsets.only(bottom: 2.h, top: 2.h),
+    var vnHandWritings = useValueNotifier<List<dynamic>>([]);
-    alignment: Alignment.center,
-    child: SingleChildScrollView(
-      controller: scrollControllerQuestion,
-      physics: const BouncingScrollPhysics(),
-      padding: EdgeInsets.zero,
-      scrollDirection: Axis.vertical, // 设置垂直滚动
-      child: Obx(() {
-        var imageUrl = sateData.data.value?.zgtAnswer;
-        if (imageUrl == null) return const SizedBox();
 
-        return Container(
+    ImageStream? imageStream;
-          decoration: BoxDecoration(boxShadow: [
+    var imageStreamListener = useState<ImageStreamListener>(ImageStreamListener((ImageInfo info, bool _) {
-            BoxShadow(
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-                color: Colors.grey.withOpacity(0.2),
+        sateData.imageScale.value = TestQuestionsImageInfo(
-                offset: Offset(-6.r, 1.r), //阴影x轴偏移量
+          templateId: sateData.data.value?.templateId,
-                blurRadius: 10.r, //阴影模糊程度
+          boxWidth: maxWidth,
-                spreadRadius: 8.r //阴影扩散程度
+          boxHeight: maxHeight,
-                )
+          imageWidth: info.image.width.toDouble(),
-          ]),
+          imageHeight: info.image.height.toDouble(),
-          child: Listener(
+          url: sateData.data.value!.zgtAnswer,
-            behavior: HitTestBehavior.opaque,
+        );
-            onPointerUp: (PointerUpEvent details) {},
+      });
-            onPointerMove: (PointerMoveEvent details) {},
+    }));
-            child: RepaintBoundary(
+
-              child: CustomPaint(
+    // 可选：添加滚动监听
-                foregroundPainter: DrawingPainter(ctrl: vnHandWritings),
+    useEffect(() {
+      eventOn(callback: (BottomOperationBar e) async {
+        var annotationsData = vnHandWritings.value; // 批注数据
+        if (e.revokeAll) {
+          // 情况全部
+          if (annotationsData.isNotEmpty) {
+            bool? res = await showDialog<bool>(
+              context: context,
+              builder: (context1) {
+                return AlertDialog(content: quickText("是否撤销上次批阅批注痕迹"), actions: <Widget>[
+                  TextButton(child: quickText("取消"), onPressed: () => Navigator.pop(context1, false)),
+                  TextButton(child: quickText("确定", color: Theme.of(context).primaryColor), onPressed: () => Navigator.pop(context1, true))
+                ]);
+              },
+            );
+            if (res == true) vnHandWritings.value = [];
+          }
+          return;
+        }
+
+        // 返回上一步
+        var index = _findTargetIndex(annotationsData, null);
+        if (index != -1) {
+          annotationsData = annotationsData.sublist(0, index + 1);
+          annotationsData = List.from(annotationsData);
+        } else {
+          annotationsData = [];
+        }
+        vnHandWritings.value = annotationsData;
+      });
+
+      scrollControllerQuestion.addListener(() => sateData.slide.value = scrollControllerQuestion.offset); // 执行滚动相关的逻辑，例如打印滚动位置
+      // 返回一个清理函数，在组件销毁时移除监听
+      return () {
+        imageStream?.removeListener(imageStreamListener.value);
+      };
+    }, []);
+
+    return Container(
+        height: maxHeight,
+        // padding: EdgeInsets.only(bottom: 2.h, top: 2.h),
+        alignment: Alignment.center,
+        child: Obx(() {
+          var imageUrl = sateData.data.value?.zgtAnswer;
+          if (imageUrl == null) return const SizedBox();
+
+          return SingleChildScrollView(
+            controller: scrollControllerQuestion,
+            physics: !annotationState.pen.value ? const BouncingScrollPhysics() : const NeverScrollableScrollPhysics(),
+            padding: EdgeInsets.zero,
+            scrollDirection: Axis.vertical, // 设置垂直滚动
+            child: Container(
+              decoration: BoxDecoration(
+                  boxShadow: [BoxShadow(color: Colors.grey.withOpacity(0.2), offset: Offset(-6.r, 1.r), blurRadius: 10.r, spreadRadius: 8.r)]),
+              child: Listener(
+                behavior: HitTestBehavior.opaque,
+                onPointerUp: (PointerUpEvent details) {
+                  // 处理单个触摸点抬起的逻辑
+                  // activePointers--;
+                  // globalPosition = null;
+                  var imageScale = sateData.imageScale.value;
+                  if (imageScale == null || !annotationState.pen.value) return;
+                  vnHandWritings.value.add(null); // 增加空点以分隔不同的线段
+                },
+                onPointerMove: (PointerMoveEvent event) {
+                  var imageScale = sateData.imageScale.value;
+                  if (imageScale == null || !annotationState.pen.value) return;
+                  Offset localPosition = event.localPosition;
+                  var dy = localPosition.dy;
+                  if (dy > imageScale.actualImgHeight || dy < 0) return; // 检查笔记是否超出图片范围
+
+                  vnHandWritings.value = List.from(vnHandWritings.value)..add(localPosition);
+                },
                 child: RepaintBoundary(
-                  child: $TheCachedNetworkImage(
+                  child: CustomPaint(
-                    (context, imageProvider) {
+                    foregroundPainter: DrawingPainter(ctrl: vnHandWritings),
-                      print('图片加载了..............');
+                    child: RepaintBoundary(
-                      Image imageWidget = Image(image: imageProvider, fit: BoxFit.fitWidth);
+                      child: $TheCachedNetworkImage(
-                      imageStream?.removeListener(imageStreamListener.value);
+                        (context, imageProvider) {
-                      imageStream = imageWidget.image.resolve(const ImageConfiguration())..addListener(imageStreamListener.value);
+                          Image imageWidget = Image(image: imageProvider, fit: BoxFit.fitWidth);
-
+                          imageStream?.removeListener(imageStreamListener.value);
-                      return imageWidget;
+                          imageStream = imageWidget.image.resolve(const ImageConfiguration())..addListener(imageStreamListener.value);
-                    },
+                          return imageWidget;
-                    imageUrl: RequestConfig.imgUrl + imageUrl,
+                        },
+                        imageUrl: RequestConfig.imgUrl + imageUrl,
+                      ),
+                    ),
                   ),
                 ),
               ),
             ),
-          ),
+          );
-        );
+        }));
-      }),
+  }
-    ),
-  );
 }
 
 // 批注框
@@ -363,23 +425,23 @@ class DrawingPainter extends CustomPainter {
   final Paint paintBrush = Paint()
     ..color = Colors.red
     ..strokeCap = StrokeCap.round
-    ..strokeWidth = 1.5.r;
+    ..strokeWidth = 0.6.r;
   DrawingPainter({required this.ctrl}) : super(repaint: ctrl);
 
   @override
   void paint(Canvas canvas, Size size) {
     var points = ctrl.value;
     var pointsLength = points.length;
-    // for (int i = 0; i < pointsLength; i++) {
+    for (int i = 0; i < pointsLength; i++) {
-    //   GestureRecording item = points[i];
+      Offset? offsetData = points[i];
-    //   Offset? offsetData = item.data;
+      Offset? nextOffsetData = pointsLength - 1 == i ? null : points[i + 1];
-    //   Offset? nextOffsetData = pointsLength - 1 == i ? null : points[i + 1].data;
+      if (offsetData != null && nextOffsetData != null) canvas.drawLine(offsetData, nextOffsetData, paintBrush);
-    //   if (offsetData != null && nextOffsetData != null) {
+    }
-    //     canvas.drawLine(offsetData, nextOffsetData, paintBrush);
-    //   }
-    // }
   }
 
   @override
   bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+
+  @override
+  bool shouldRebuildSemantics(CustomPainter oldDelegate) => false;
 }

making_school_asignment_app/pubspec.yaml

@@ -82,6 +82,7 @@ dependencies:
   easy_debounce: ^2.0.3 # 防抖节流
   flutter_hooks: ^0.20.5
   flutter_spinkit: ^5.2.1
+  event_bus: ^2.0.0
 
 dev_dependencies:
   flutter_test: