diff --git a/packages/flutter_tools/lib/src/commands/clean.dart b/packages/flutter_tools/lib/src/commands/clean.dart index fbcae995c39e92e4b1967d379c28f88d329fde5b..14f3be9032c12a60790c346967ab6bec50913fdc 100644 --- a/packages/flutter_tools/lib/src/commands/clean.dart +++ b/packages/flutter_tools/lib/src/commands/clean.dart @@ -68,6 +68,7 @@ class CleanCommand extends FlutterCommand { deleteFile(flutterProject.flutterPluginsFile); flutterProject.ohos.deleteOhModulesCache(); + deleteFile(flutterProject.ohos.ephemeralDirectory); return const FlutterCommandResult(ExitStatus.success); } diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index cb07a97e40bda968ee0689359aaf687162247b77..b4517053e899fe3a99c464609a40be9b9583d3d6 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -727,6 +727,10 @@ class OhosHvigorBuilder implements OhosBuilder { throwToolExit('current project is not module or has not pub get'); } parseData(flutterProject, logger); + + /// 检查plugin的har构建 + await checkPluginsHarUpdate(flutterProject, buildInfo, ohosBuildData); + await flutterBuildPre(flutterProject, buildInfo, targetPlatform: targetPlatform, logger: logger); diff --git a/packages/flutter_tools/lib/src/ohos/ohos_dependencies_manager.dart b/packages/flutter_tools/lib/src/ohos/ohos_dependencies_manager.dart index 18e2ab25e46d4a4b49b6f3e4216b79182dc62615..c2f611d7a4b68ab747432e9120b9285b7da81fcc 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_dependencies_manager.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_dependencies_manager.dart @@ -66,7 +66,7 @@ Future checkOhosPluginsDependencies(FlutterProject flutterProject) async { /// 查询所有的normal依赖 final List list = getOhosDependenciesListFromPackageFile( - flutterProject.ohos.mainModulePackageFile, + flutterProject.ohos.flutterModulePackageFile, dependenceType: DependenceType.normal); final List hasInstallPlugin = list.map((OhosDependence e) => e.baseModuleName).toList(); @@ -86,7 +86,7 @@ Future checkOhosPluginsDependencies(FlutterProject flutterProject) async { OhosDependence transform(OhosPlugin ohosPlugin, DependenceType dependenceType) { return OhosDependence('@ohos/${ohosPlugin.name}', ohosPlugin.name, - '../har/${ohosPlugin.name}.har', dependenceType); + './har/${ohosPlugin.name}.har', dependenceType); } /// 解析dependence列表,dependenceType为空时,返回normal和dev的合集。 @@ -126,16 +126,16 @@ List parseDependenciesFromType( Future addDependencies( FlutterProject flutterProject, List list) async { final dynamic config = - parsePakcageConfig(flutterProject.ohos.mainModulePackageFile); + parsePakcageConfig(flutterProject.ohos.flutterModulePackageFile); final Map dependencies = config['dependencies'] as Map; for (final OhosDependence dependence in list) { dependencies[dependence.moduleName] = - 'file:../har/${dependence.baseModuleName}.har'; + 'file:./har/${dependence.baseModuleName}.har'; } final String configNew = JSON5.stringify(config, space: 2); - flutterProject.ohos.mainModulePackageFile + flutterProject.ohos.flutterModulePackageFile .writeAsStringSync(configNew, flush: true); } 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 486e010524963987a0f003031cc49ea7350ddec8..5006744f61cbbab96bae12fcce500766751f3f56 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart @@ -74,7 +74,7 @@ Future checkPluginsHarUpdate(FlutterProject flutterProject, for (final String path in harPaths) { final File originFile = globals.fs.file(path); final String descPath = globals.fs.path.join( - flutterProject.ohos.ohosRoot.childDirectory('har').path, + flutterProject.ohos.flutterModuleDirectory.childDirectory('har').path, originFile.basename); originFile.copySync(descPath); } diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 6f622c872acfa09e8843d3a97712cf0eac129b01..7365689b58088583554701e20dfe169c4c20a8f9 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart @@ -954,8 +954,8 @@ class OhosProject extends FlutterProjectPlatform { .childDirectory('default') .childFile('entry-default-signed.hap'); - File get mainModulePackageFile => - mainModuleDirectory.childFile('oh-package.json5'); + File get flutterModulePackageFile => + flutterModuleDirectory.childFile('oh-package.json5'); File get localPropertiesFile => ohosRoot.childFile('local.properties');