From 162853e1bf5c9373b88a262478ee5ff0decffb75 Mon Sep 17 00:00:00 2001 From: lihui868 Date: Wed, 13 Mar 2024 01:44:44 -0700 Subject: [PATCH] =?UTF-8?q?#I985NC=20=E4=BF=AE=E5=A4=8D=E5=9B=A0emulator?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8C=85=E5=90=ABsdk-mgr.json=E5=AF=BC?= =?UTF-8?q?=E8=87=B4SDK=E8=AF=86=E5=88=AB=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李辉 --- packages/flutter_tools/lib/src/ohos/ohos_sdk.dart | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart index 6aa8de9cb4..b76e796b37 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart @@ -263,12 +263,19 @@ class HmosSdk implements HarmonySdk { File sdkPkgJson = globals.fs.directory(element).childFile('sdk-pkg.json'); if (sdkPkgJson.existsSync()) { dynamic sdk_pkg = JSON5.parse(sdkPkgJson.readAsStringSync()); - sdkVersionMap.addAll({int.parse(sdk_pkg['data']['apiVersion'] as String): element.basename}); + if (sdk_pkg['data'] != null && sdk_pkg['data']['apiVersion'] != null + && isNumeric(sdk_pkg['data']['apiVersion'] as String)) { + sdkVersionMap.addAll({int.parse(sdk_pkg['data']['apiVersion'] as String): element.basename}); + } } } } } + static bool isNumeric(String str) { + return double.tryParse(str) != null; + } + static String? getHdcPath(String sdkPath) { final bool isWindows = globals.platform.isWindows; // find it in api11 developer preview folder @@ -317,4 +324,4 @@ class HmosSdk implements HarmonySdk { } return true; } -} \ No newline at end of file +} -- Gitee