From 3171ba215fba42498262b57f206d8d505adf20ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B1=8C=E6=9D=82?= <1147192855@qq.com> Date: Fri, 25 Apr 2025 10:34:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=91=98=E8=B4=A6=E5=8F=B7=E8=B7=B3=E8=BF=87=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/common/utils/app_upgrade/upgradeLogic.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart index e0d9114..021b3c8 100644 --- a/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart +++ b/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart @@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; import 'package:making_school_asignment_app/common/job/app_version.dart'; import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart'; +import 'package:making_school_asignment_app/common/store/user_store.dart'; import 'package:making_school_asignment_app/common/utils/permission_describe_util.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:permission_handler/permission_handler.dart'; @@ -27,7 +28,14 @@ class UpgradeLogic extends GetxController with RequestToolMixin { try { showUpgrade.value = true; - // if (['18888888888'].contains(user.loginName)) return; + + final names = [ + UserStore.to.userDetailInfo.value?.name, + UserStore.to.userDetailInfo.value?.account, + ].whereType().where((name) => name.isNotEmpty).toList(); + + if (names.contains('AppleTester')) return; + // 获取设备信息 String deviceInfo; int deviceType; From 4b65ef1e88546456dfe371aa6bb336772ce838f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B1=8C=E6=9D=82?= <1147192855@qq.com> Date: Fri, 25 Apr 2025 10:34:41 +0800 Subject: [PATCH 2/5] 123 --- .../ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ making_school_asignment_app/pubspec.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/making_school_asignment_app/ios/Runner.xcodeproj/project.pbxproj b/making_school_asignment_app/ios/Runner.xcodeproj/project.pbxproj index e643abe..a68b4ea 100644 --- a/making_school_asignment_app/ios/Runner.xcodeproj/project.pbxproj +++ b/making_school_asignment_app/ios/Runner.xcodeproj/project.pbxproj @@ -495,7 +495,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = Z778GC45N8; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -503,7 +503,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3; + MARKETING_VERSION = 4; PRODUCT_BUNDLE_IDENTIFIER = "com.yuanxuan.makingS--buneng--choolAsignmentApp"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -689,7 +689,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = Z778GC45N8; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -697,7 +697,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3; + MARKETING_VERSION = 4; PRODUCT_BUNDLE_IDENTIFIER = com.yuanxuan.makingSchoolAsignmentApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -719,7 +719,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = Z778GC45N8; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -727,7 +727,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3; + MARKETING_VERSION = 4; PRODUCT_BUNDLE_IDENTIFIER = com.yuanxuan.makingSchoolAsignmentApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/making_school_asignment_app/pubspec.yaml b/making_school_asignment_app/pubspec.yaml index a784833..03a7639 100644 --- a/making_school_asignment_app/pubspec.yaml +++ b/making_school_asignment_app/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.4+5 +version: 1.0.5+6 environment: sdk: '>=3.4.1 <4.0.0' From 0902c0cd0d0de01e342ee555e69ad550dd5ea77b Mon Sep 17 00:00:00 2001 From: "DESKTOP-I3JPKHK\\wy" <1111> Date: Fri, 25 Apr 2025 15:31:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E6=8C=87?= =?UTF-8?q?=E6=89=B9=E6=B3=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/question_paper_view.dart | 58 +++++++++++++++---- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart index 5d1f227..2a28c2f 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart @@ -283,6 +283,35 @@ class QuestionImageView extends HookWidget with EventBusMixin> vnHandWritings) { + timer?.cancel(); + timer = Timer(const Duration(milliseconds: timeoutDuration), () { + if (_activePointers > 2) { + _activePointers = 0; + if (vnHandWritings.value.last != null) { + vnHandWritings.value.add(null); // 增加空点以分隔不同的线段 + sateData.handwritings = vnHandWritings.value; // 添加笔迹数据 + } + } + }); + } + + /// 获取最后一个点的坐标位置 + Offset? getLastDrop(List vals, int index) { + Offset? lastDrop; + if (vals.isNotEmpty) { + lastDrop = vals[index] as Offset?; + // if (lastDrop == null) { + // index -= 1; + // if (index > -1) { + // lastDrop = getLastDrop(vals, index); + // } + // } + + } + return lastDrop; + } + @override Widget build(BuildContext context) { final theMaxHeight = useState(maxHeight); @@ -431,16 +460,17 @@ class QuestionImageView extends HookWidget with EventBusMixin 0) { - _activePointers = 0; - if (vnHandWritings.value.last != null) { - vnHandWritings.value.add(null); // 增加空点以分隔不同的线段 - sateData.handwritings = vnHandWritings.value; // 添加笔迹数据 - } - } - }); + toTimer(vnHandWritings); + // timer?.cancel(); + // timer = Timer(const Duration(milliseconds: timeoutDuration), () { + // if (_activePointers > 2) { + // _activePointers = 0; + // if (vnHandWritings.value.last != null) { + // vnHandWritings.value.add(null); // 增加空点以分隔不同的线段 + // sateData.handwritings = vnHandWritings.value; // 添加笔迹数据 + // } + // } + // }); sateData.panQuestView = true; }, onPointerUp: (PointerUpEvent details) { @@ -460,7 +490,7 @@ class QuestionImageView extends HookWidget with EventBusMixin 40 || (lastDrop.dy - localPosition.dy).abs() > 40)) { + /// 当前X点和上一个x点相差 大于10判定为多个手指 + return; + } // print("最终位置 ： $localPosition"); vnHandWritings.value = List.from(vnHandWritings.value)..add(localPosition); sateData.handwritings = vnHandWritings.value; From 3a3458f34e84a6f9acb6a4cf14466abdfc6257d7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-I3JPKHK\\wy" <1111> Date: Fri, 25 Apr 2025 15:32:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homework_review/components/question_paper_view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart index 2a28c2f..3b71baa 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart @@ -459,7 +459,7 @@ class QuestionImageView extends HookWidget with EventBusMixin Date: Fri, 25 Apr 2025 15:36:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/question_paper_view.dart | 13 +++---------- .../macos/Flutter/GeneratedPluginRegistrant.swift | 4 ++++ making_school_asignment_app/pubspec.yaml | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart index 3b71baa..faa1daa 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart @@ -283,6 +283,7 @@ class QuestionImageView extends HookWidget with EventBusMixin> vnHandWritings) { timer?.cancel(); timer = Timer(const Duration(milliseconds: timeoutDuration), () { @@ -301,6 +302,8 @@ class QuestionImageView extends HookWidget with EventBusMixin -1) { @@ -461,16 +464,6 @@ class QuestionImageView extends HookWidget with EventBusMixin 2) { - // _activePointers = 0; - // if (vnHandWritings.value.last != null) { - // vnHandWritings.value.add(null); // 增加空点以分隔不同的线段 - // sateData.handwritings = vnHandWritings.value; // 添加笔迹数据 - // } - // } - // }); sateData.panQuestView = true; }, onPointerUp: (PointerUpEvent details) { diff --git a/making_school_asignment_app/macos/Flutter/GeneratedPluginRegistrant.swift b/making_school_asignment_app/macos/Flutter/GeneratedPluginRegistrant.swift index 043340e..ee64873 100644 --- a/making_school_asignment_app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/making_school_asignment_app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,8 @@ import FlutterMacOS import Foundation +import app_installer +import app_settings import auto_updater_macos import connectivity_plus import device_info_plus @@ -14,6 +16,8 @@ import sqflite import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + AppInstallerPlugin.register(with: registry.registrar(forPlugin: "AppInstallerPlugin")) + AppSettingsPlugin.register(with: registry.registrar(forPlugin: "AppSettingsPlugin")) AutoUpdaterMacosPlugin.register(with: registry.registrar(forPlugin: "AutoUpdaterMacosPlugin")) ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) diff --git a/making_school_asignment_app/pubspec.yaml b/making_school_asignment_app/pubspec.yaml index 03a7639..201db8a 100644 --- a/making_school_asignment_app/pubspec.yaml +++ b/making_school_asignment_app/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.5+6 +version: 1.0.3+4 environment: sdk: '>=3.4.1 <4.0.0'