mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
4 changed files with 14 additions and 14 deletions
Showing only changes of commit 393b2ee578 - Show all commits

View File

@ -298,17 +298,19 @@ class _AnnotateItemState extends State<AnnotateItem> {
: [ : [
Expanded( Expanded(
child: InkWell( child: InkWell(
onTap: () => easyThrottle('TO_GO_REVIEWHOMEWORK', () { onTap: () => easyThrottle('TO_GO_REVIEWHOMEWORK', () async {
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky, overlays: []).then((_) { await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
Get.toNamed(Routes.reviewHomework, arguments: { Future.delayed(const Duration(milliseconds: 300), () {
'homeworkId': widget.homeworkId, Get.toNamed(Routes.reviewHomework, arguments: {
'homeworkName': widget.name, 'homeworkId': widget.homeworkId,
'classId': itemData.classId, 'homeworkName': widget.name,
'subject': widget.logic.state.subject, 'classId': itemData.classId,
}); 'subject': widget.logic.state.subject,
});
}); });
}); });
// Get.toNamed(Routes.reviewHomework, arguments: { // Get.toNamed(Routes.reviewHomework, arguments: {
// 'homeworkId': widget.homeworkId, // 'homeworkId': widget.homeworkId,
// 'homeworkName': widget.name, // 'homeworkName': widget.name,

View File

@ -308,7 +308,6 @@ class QuestionImageView extends HookWidget with EventBusMixin<BottomOperationBar
sateData.zoomOffset = Offset(sateData.zoomOffset!.dx, -sateData.slide.value); sateData.zoomOffset = Offset(sateData.zoomOffset!.dx, -sateData.slide.value);
} }
initPosition.value = sateData.zoomOffset; initPosition.value = sateData.zoomOffset;
print("赋值 initPosition.value ${initPosition.value}");
} }
}); });
return () { return () {
@ -479,7 +478,7 @@ class QuestionImageView extends HookWidget with EventBusMixin<BottomOperationBar
(dy - max(0, imageHeightOffsetStart) + ((zoomFile.imageHeightOffsetStart == null || zoomFile.imageHeightOffsetStart! <= 0.1) ? (sateData.zoomOffset?.dy.abs() ?? 0) : 0)) / theScale, (dy - max(0, imageHeightOffsetStart) + ((zoomFile.imageHeightOffsetStart == null || zoomFile.imageHeightOffsetStart! <= 0.1) ? (sateData.zoomOffset?.dy.abs() ?? 0) : 0)) / theScale,
); );
print("最终位置 $localPosition"); // print("最终位置 $localPosition");
vnHandWritings.value = List.from(vnHandWritings.value)..add(localPosition); vnHandWritings.value = List.from(vnHandWritings.value)..add(localPosition);
sateData.handwritings = vnHandWritings.value; sateData.handwritings = vnHandWritings.value;
}, },
@ -545,7 +544,7 @@ class DrawingPainter extends CustomPainter {
final Paint paintBrush = Paint() final Paint paintBrush = Paint()
..color = Colors.red ..color = Colors.red
..strokeCap = StrokeCap.round ..strokeCap = StrokeCap.round
..strokeWidth = 0.75.sp; ..strokeWidth = 0.7.sp;
DrawingPainter({required this.ctrl}) : super(repaint: ctrl); DrawingPainter({required this.ctrl}) : super(repaint: ctrl);
@override @override

View File

@ -125,7 +125,7 @@ class HomeworkReviewLogic extends GetxController with RequestToolMixin {
// var theImageScaleZoom = state.imageScaleZoom.value; // var theImageScaleZoom = state.imageScaleZoom.value;
// if (theImageScaleZoom == null || theImageScaleZoom.url != e?.url) state.imageScaleZoom.value = e; // if (theImageScaleZoom == null || theImageScaleZoom.url != e?.url) state.imageScaleZoom.value = e;
// }); // });
WidgetsBinding.instance.addPostFrameCallback((_) => getData()); WidgetsBinding.instance.addPostFrameCallback((_) => getData());
super.onInit(); super.onInit();
} }

View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:making_school_asignment_app/page/global_widget/ReturnToHomepage.dart'; import 'package:making_school_asignment_app/page/global_widget/ReturnToHomepage.dart';