no message

marking_app/README.md

@@ -14,3 +14,7 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
+
+
+
+fvm flutter build apk --release --no-tree-shake-icons

marking_app/lib/pages/homework_correction/providers/handwriting_drawing_trajectory_provider.dart

@@ -19,7 +19,7 @@ class JobHandwritingDrawingTrajectoryProviderHandle extends StateNotifier<List<G
 
 // 查看原稿
 final jobHandwritingStudentManuscriptProvider = StateNotifierProvider<JobHandwritingStudentManuscriptHandle, ShowStudentMmanuscript>(
-    (ref) => JobHandwritingStudentManuscriptHandle(ShowStudentMmanuscript(false)));
+    (ref) => JobHandwritingStudentManuscriptHandle(ShowStudentMmanuscript(true)));
 
 class JobHandwritingStudentManuscriptHandle extends StateNotifier<ShowStudentMmanuscript> {
   JobHandwritingStudentManuscriptHandle(ShowStudentMmanuscript progress) : super(progress);

marking_app/lib/pages/homework_correction/widget/answer_handwriting.dart

@@ -391,9 +391,8 @@ class _HandwritingDrawBoxState extends ConsumerState<HandwritingDrawBox> with Ev
   void initState() {
     super.initState();
     _vnHandWritings = ValueNotifier<List<GestureHandwritingRecording>>([]);
-    _vnPrimaryHandWritings = ValueNotifier<List<GestureHandwritingRecording>>([]);
+    _vnPrimaryHandWritings = ValueNotifier<List<GestureHandwritingRecording>>(_packagedHandwritingDataAll);
     _jobHandwritingDrawingTrajectoryListener1 = ref.read(jobHandwritingStudentManuscriptProvider.notifier).addListener((state) {
-      print('点击进入了');
       // 查看原稿控制
       if (state.showManuscript) {
         // 查看原稿
@@ -590,6 +589,9 @@ class _HandwritingDrawBoxState extends ConsumerState<HandwritingDrawBox> with Ev
 
         _packagedHandwritingDatas.add(newTrajectoryData); // 分组数据
         _packagedHandwritingDataAll.addAll(newTrajectoryData); // 不分组数据
+        try {
+          Future.delayed(Duration.zero, () => ref.read(jobHandwritingStudentManuscriptProvider.notifier).setVal(ShowStudentMmanuscript(true)));
+        } catch (e) {}
       }
       Future.delayed(Duration.zero, () => eventFire(model: JobHandwritingGetReadyBus())); // 通知外部可以播放笔迹
     }
@@ -625,47 +627,6 @@ class _HandwritingDrawBoxState extends ConsumerState<HandwritingDrawBox> with Ev
   }
 }
 
-class HandWritingDrawingPainter1 extends CustomPainter {
-  final ValueNotifier<List<GestureHandwritingRecording>> ctrl;
-  HandWritingDrawingPainter1({required this.ctrl}) : super(repaint: ctrl);
-  //[定义画笔]
-  final Paint paintBrush = Paint()
-    //画笔颜色
-    ..color = Colors.black
-    //画笔笔触类型
-    ..strokeCap = StrokeCap.round
-    //是否启动抗锯齿
-    ..isAntiAlias = true
-    //绘画风格，默认为填充
-    // ..style = PaintingStyle.fill
-    //画笔的宽度
-    ..style = PaintingStyle.stroke
-    ..strokeWidth = 0.5.r;
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    // canvas.drawPoints(PointMode.points, thePoints, paintBrush);
-
-    var points = ctrl.value;
-    var _length = points.length;
-    for (int i = 0; i < _length; i++) {
-      GestureHandwritingRecording item = points[i];
-      GestureHandwritingRecording? nextItem = i + 1 < _length ? points[i + 1] : null;
-
-      Offset offsetData = item.data;
-      Offset? nextOffsetData = nextItem?.data;
-      if (nextOffsetData != null && item.stroke == nextItem?.stroke) {
-        canvas.drawLine(offsetData, nextOffsetData, paintBrush);
-      }
-    }
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) {
-    return false; // 如果 oldDelegate 不是 MyCustomPainter 的实例，则总是重绘
-  }
-}
-
 class HandWritingDrawingPainter extends CustomPainter {
   final ValueNotifier<List<GestureHandwritingRecording>> ctrl;
   HandWritingDrawingPainter({required this.ctrl}) : super(repaint: ctrl);
@@ -804,14 +765,10 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
 
   return Container(
     height: 62.h,
-    padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 10.h),
+    padding: EdgeInsets.symmetric(horizontal: 10.w),
     alignment: Alignment.center,
     color: Color.fromRGBO(0, 0, 0, 0.4),
-    child: Column(
+    child: Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Container(alignment: Alignment.centerRight, child: StudentManuscriptBtn()), // 查看原稿按钮
-        Row(
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
         if (usePlaybar.handWritingReady.value)
@@ -846,7 +803,7 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
                 left: unitScale * item.startTime,
                 child: Container(
                   width: unitScale * (item.apart ?? 0),
-                      height: 8.h,
+                  height: 10.h,
                   decoration: BoxDecoration(
                     color: Color.fromRGBO(202, 201, 201, 1),
                     borderRadius: isFirst
@@ -863,7 +820,7 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
                 Stack(
                   children: [
                     Container(
-                          height: 8.h,
+                      height: 10.h,
                       width: containerWidth,
                       decoration: BoxDecoration(
                         // color: Color.fromRGBO(146, 146, 146, 1),
@@ -873,12 +830,12 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
                     ),
                     ...pauseTickMarks,
                     Container(
-                          height: 8.h,
+                      height: 10.h,
                       width: containerWidth,
                       // color: Theme.of(context).primaryColor,
                       child: SliderTheme(
                         data: SliderTheme.of(context).copyWith(
-                              trackHeight: 8.h, // 轨道高度
+                          trackHeight: 10.h, // 轨道高度
                           trackShape: RoundedRectSliderTrackShape(), // 轨道形状，可以自定义
                           activeTrackColor: Theme.of(context).primaryColor, // 激活的轨道颜色
                           inactiveTrackColor: Colors.transparent, // 未激活的轨道颜色
@@ -908,7 +865,7 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
                     ),
                   ],
                 ),
-                    SizedBox(height: 4.h),
+                SizedBox(height: 8.h),
                 SizedBox(
                   width: containerWidth,
                   child: Row(
@@ -924,6 +881,10 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
           }),
         ),
         SizedBox(width: 16.w),
+        Column(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
             InkWell(
               onTap: () => easyThrottle('job_handwriting_speed', () {
                 var theIndex = PlaybackSpeed.values.indexOf(usePlaybar.constantFastSpeed.value);
@@ -944,8 +905,10 @@ Widget $bottomPlaybar(BuildContext context, int timeConsuming, int pauseCount, L
                 ),
               ),
             ),
+            SizedBox(height: 7.h),
+            StudentManuscriptBtn(),
           ],
-        )
+        ),
       ],
     ),
   );
@@ -957,15 +920,17 @@ class StudentManuscriptBtn extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    var _showVal = ref.watch(jobHandwritingStudentManuscriptProvider);
     return InkWell(
       onTap: () => easyThrottle('job_handwriting_udent_manuscript', () {
         var showManuscript = ref.read(jobHandwritingStudentManuscriptProvider).showManuscript;
         ref.read(jobHandwritingStudentManuscriptProvider.notifier).setVal(ShowStudentMmanuscript(!showManuscript));
       }),
       child: Container(
-        padding: EdgeInsets.symmetric(horizontal: 2.w, vertical: 1.h),
+        padding: EdgeInsets.symmetric(horizontal: 3.w, vertical: 1.5.h),
-        decoration: BoxDecoration(color: Colors.grey, borderRadius: BorderRadius.circular(4.r)),
+        decoration:
-        child: quickText('学生原稿', color: Colors.white, size: 8.sp),
+            BoxDecoration(color: _showVal.showManuscript ? Theme.of(context).primaryColor : Colors.grey, borderRadius: BorderRadius.circular(4.r)),
+        child: quickText('学生原稿', color: Colors.white, size: 8.sp, align: TextAlign.center),
       ),
     );
   }

marking_app/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.106
+version: 1.0.107+2
 
 environment:
   sdk: ">=2.17.1 <3.0.0"