From 812deb4ea458b46d8cd752f849d0565e7c71f43d Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 2 Sep 2024 14:59:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=96=E8=AF=91app=E6=97=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8F=82=E6=95=B0--build-name=E5=92=8C--build-number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/commands/build_app.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/flutter_tools/lib/src/commands/build_app.dart b/packages/flutter_tools/lib/src/commands/build_app.dart index d91b54c9720..7233fe78bf9 100644 --- a/packages/flutter_tools/lib/src/commands/build_app.dart +++ b/packages/flutter_tools/lib/src/commands/build_app.dart @@ -29,6 +29,8 @@ class BuildAppCommand extends BuildSubCommand { addBuildModeFlags(verboseHelp: verboseHelp); usesFlavorOption(); usesPubOption(); + usesBuildNumberOption(); + usesBuildNameOption(); addShrinkingFlag(verboseHelp: verboseHelp); addSplitDebugInfoOption(); addDartObfuscationOption(); -- Gitee From 322b6211602b4433d836f7a0fb4590bc335514ab Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 7 Sep 2024 18:25:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AF=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=9C=BA=E6=99=AF=E4=B8=8B=E7=9A=84=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- .../flutter_tools/lib/src/ohos/ohos_plugins_manager.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart index 0a89fe2dd6c..c0035dd27cc 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart @@ -195,5 +195,8 @@ Future addFlutterModuleAndPluginsOverrides(FlutterProject flutterProject) } String _relative(String path, {String? from}) { - return globals.fs.path.relative(path, from: from).replaceAll(r'\', '/'); + final String realPath = globals.fs.file(path).resolveSymbolicLinksSync(); + final String realFrom = globals.fs.file(from).resolveSymbolicLinksSync(); + final String result = globals.fs.path.relative(realPath, from: realFrom).replaceAll(r'\', '/'); + return result; } -- Gitee From dba0c882d804f83015f33a73c5771551bb369ca7 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 21 Sep 2024 15:21:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E9=80=BB=E8=BE=91,=E6=94=B9=E5=96=84Windows?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=95=BF=E5=BA=A6>=3D260=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/ohos/application_package.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/flutter_tools/lib/src/ohos/application_package.dart b/packages/flutter_tools/lib/src/ohos/application_package.dart index 51a5deaa715..a21a43e8a50 100644 --- a/packages/flutter_tools/lib/src/ohos/application_package.dart +++ b/packages/flutter_tools/lib/src/ohos/application_package.dart @@ -274,6 +274,7 @@ class OhosModule { required String modulePath, String? flavor, }) { + modulePath = globals.fs.path.normalize(modulePath); final String moduleJsonPath = globals.fs.path.join(modulePath, 'src', 'main', 'module.json5'); final File moduleJsonFile = globals.fs.file(moduleJsonPath); if (!moduleJsonFile.existsSync()) { -- Gitee From cf43b3af9273c4f13b1eae2dbaec9db022fe3f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8B=97=E6=9C=A8?= Date: Wed, 9 Oct 2024 15:54:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=B8=AD=E5=8C=85=E5=90=AB=E8=BD=AF=E8=BF=9E=E6=8E=A5=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 狗木 --- packages/flutter_tools/lib/src/ohos/application_package.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/ohos/application_package.dart b/packages/flutter_tools/lib/src/ohos/application_package.dart index a21a43e8a50..2529a22372c 100644 --- a/packages/flutter_tools/lib/src/ohos/application_package.dart +++ b/packages/flutter_tools/lib/src/ohos/application_package.dart @@ -274,7 +274,7 @@ class OhosModule { required String modulePath, String? flavor, }) { - modulePath = globals.fs.path.normalize(modulePath); + modulePath = globals.fs.path.normalize(globals.fs.file(modulePath).resolveSymbolicLinksSync()); final String moduleJsonPath = globals.fs.path.join(modulePath, 'src', 'main', 'module.json5'); final File moduleJsonFile = globals.fs.file(moduleJsonPath); if (!moduleJsonFile.existsSync()) { -- Gitee From 8fea55eb463d869bc190190061a1d25a6b7b45e3 Mon Sep 17 00:00:00 2001 From: lihui868 Date: Thu, 26 Sep 2024 23:38:46 +0800 Subject: [PATCH 5/5] revert physicalTouchSlop to default Signed-off-by: lihui868 --- packages/flutter/lib/src/widgets/scroll_activity.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter/lib/src/widgets/scroll_activity.dart b/packages/flutter/lib/src/widgets/scroll_activity.dart index 4d4ccd681c0..aa0f92958ed 100644 --- a/packages/flutter/lib/src/widgets/scroll_activity.dart +++ b/packages/flutter/lib/src/widgets/scroll_activity.dart @@ -385,7 +385,7 @@ class ScrollDragController implements Drag { ) * offset.sign; } } else { - return offset < 0 ? offset - 1.0 : offset + 1.0; + return 0.0; } } } -- Gitee