From 1b11073af12693bc0455efb999471004e23460c3 Mon Sep 17 00:00:00 2001 From: dujing Date: Mon, 11 Nov 2024 17:03:32 +0800 Subject: [PATCH] =?UTF-8?q?devide=5Finfo=5Fplus3.22=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dujing --- .../device_info_plus/example/lib/main.dart | 76 +++-- .../device_info_plus/example/ohos/.gitignore | 18 + .../example/ohos/AppScope/app.json5 | 10 + .../resources/base/element/string.json | 8 + .../resources/base/media/app_icon.png | Bin 0 -> 6790 bytes .../example/ohos/build-profile.json5 | 27 ++ .../example/ohos/entry/.gitignore | 9 + .../example/ohos/entry/build-profile.json5 | 29 ++ .../example/ohos/entry/hvigorfile.ts | 17 + .../example/ohos/entry/oh-package.json5 | 10 + .../main/ets/entryability/EntryAbility.ets | 25 ++ .../ohos/entry/src/main/ets/pages/Index.ets | 38 +++ .../ets/plugins/GeneratedPluginRegistrant.ets | 28 ++ .../example/ohos/entry/src/main/module.json5 | 53 +++ .../main/resources/base/element/color.json | 8 + .../main/resources/base/element/string.json | 16 + .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/main_pages.json | 5 + .../main/resources/en_US/element/string.json | 16 + .../main/resources/zh_CN/element/string.json | 16 + .../example/ohos/hvigor/hvigor-config.json5 | 24 ++ .../example/ohos/hvigorfile.ts | 21 ++ .../example/ohos/oh-package.json5 | 18 + .../device_info_plus/example/pubspec.yaml | 6 +- .../lib/device_info_plus_ohos.dart | 30 ++ .../lib/src/ohos_device_info.dart | 309 ++++++++++++++++++ .../device_info_plus/ohos/.gitignore | 9 + .../device_info_plus/ohos/build-profile.json5 | 10 + .../device_info_plus/ohos/hvigorfile.ts | 2 + .../device_info_plus/ohos/index.ets | 17 + .../device_info_plus/ohos/oh-package.json5 | 11 + .../plugin/DeviceInfoPlusOhosPlugin.ets | 92 ++++++ .../ohos/src/main/module.json5 | 10 + .../device_info_plus/pubspec.yaml | 3 +- 34 files changed, 943 insertions(+), 28 deletions(-) create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/.gitignore create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/AppScope/app.json5 create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/element/string.json create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/media/app_icon.png create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/build-profile.json5 create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/.gitignore create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/build-profile.json5 create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/hvigorfile.ts create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/oh-package.json5 create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/ets/pages/Index.ets create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/module.json5 create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/resources/base/element/color.json create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/resources/base/element/string.json create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/resources/base/media/icon.png create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/resources/base/profile/main_pages.json create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/resources/en_US/element/string.json create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/entry/src/main/resources/zh_CN/element/string.json create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/hvigor/hvigor-config.json5 create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/hvigorfile.ts create mode 100644 packages/device_info_plus/device_info_plus/example/ohos/oh-package.json5 create mode 100644 packages/device_info_plus/device_info_plus/lib/device_info_plus_ohos.dart create mode 100644 packages/device_info_plus/device_info_plus/lib/src/ohos_device_info.dart create mode 100644 packages/device_info_plus/device_info_plus/ohos/.gitignore create mode 100644 packages/device_info_plus/device_info_plus/ohos/build-profile.json5 create mode 100644 packages/device_info_plus/device_info_plus/ohos/hvigorfile.ts create mode 100644 packages/device_info_plus/device_info_plus/ohos/index.ets create mode 100644 packages/device_info_plus/device_info_plus/ohos/oh-package.json5 create mode 100644 packages/device_info_plus/device_info_plus/ohos/src/main/ets/components/plugin/DeviceInfoPlusOhosPlugin.ets create mode 100644 packages/device_info_plus/device_info_plus/ohos/src/main/module.json5 diff --git a/packages/device_info_plus/device_info_plus/example/lib/main.dart b/packages/device_info_plus/device_info_plus/example/lib/main.dart index 58f4888b..f9547e39 100644 --- a/packages/device_info_plus/device_info_plus/example/lib/main.dart +++ b/packages/device_info_plus/device_info_plus/example/lib/main.dart @@ -8,6 +8,7 @@ import 'dart:async'; import 'dart:developer' as developer; import 'package:device_info_plus/device_info_plus.dart'; +import 'package:device_info_plus/device_info_plus_ohos.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -29,6 +30,8 @@ class MyApp extends StatefulWidget { class _MyAppState extends State { static final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin(); + static final DeviceInfoOhosPlugin deviceInfoOhosPlugin = + DeviceInfoOhosPlugin(); Map _deviceData = {}; @override @@ -44,21 +47,33 @@ class _MyAppState extends State { if (kIsWeb) { deviceData = _readWebBrowserInfo(await deviceInfoPlugin.webBrowserInfo); } else { - deviceData = switch (defaultTargetPlatform) { - TargetPlatform.android => - _readAndroidBuildData(await deviceInfoPlugin.androidInfo), - TargetPlatform.iOS => - _readIosDeviceInfo(await deviceInfoPlugin.iosInfo), - TargetPlatform.linux => - _readLinuxDeviceInfo(await deviceInfoPlugin.linuxInfo), - TargetPlatform.windows => - _readWindowsDeviceInfo(await deviceInfoPlugin.windowsInfo), - TargetPlatform.macOS => - _readMacOsDeviceInfo(await deviceInfoPlugin.macOsInfo), - TargetPlatform.fuchsia => { - 'Error:': 'Fuchsia platform isn\'t supported' - }, - }; + switch (defaultTargetPlatform) { + case TargetPlatform.android: + deviceData = + _readAndroidBuildData(await deviceInfoPlugin.androidInfo); + break; + case TargetPlatform.iOS: + deviceData = _readIosDeviceInfo(await deviceInfoPlugin.iosInfo); + break; + case TargetPlatform.linux: + deviceData = _readLinuxDeviceInfo(await deviceInfoPlugin.linuxInfo); + break; + case TargetPlatform.windows: + deviceData = + _readWindowsDeviceInfo(await deviceInfoPlugin.windowsInfo); + break; + case TargetPlatform.macOS: + deviceData = _readMacOsDeviceInfo(await deviceInfoPlugin.macOsInfo); + break; + case TargetPlatform.ohos: + deviceData = (await deviceInfoOhosPlugin.ohosDeviceInfo).data; + break; + default: + deviceData = { + 'Error:': '$defaultTargetPlatform isn\'t supported' + }; + } + ; } } on PlatformException { deviceData = { @@ -252,14 +267,25 @@ class _MyAppState extends State { ); } - String _getAppBarTitle() => kIsWeb - ? 'Web Browser info' - : switch (defaultTargetPlatform) { - TargetPlatform.android => 'Android Device Info', - TargetPlatform.iOS => 'iOS Device Info', - TargetPlatform.linux => 'Linux Device Info', - TargetPlatform.windows => 'Windows Device Info', - TargetPlatform.macOS => 'MacOS Device Info', - TargetPlatform.fuchsia => 'Fuchsia Device Info', - }; + String _getAppBarTitle() { + if (kIsWeb) { + return 'Web Browser info'; + } + switch (defaultTargetPlatform) { + case TargetPlatform.android: + return 'Android Device Info'; + case TargetPlatform.ohos: + return 'Ohos Device Info'; + case TargetPlatform.iOS: + return 'iOS Device Info'; + case TargetPlatform.linux: + return 'Linux Device Info'; + case TargetPlatform.windows: + return 'Windows Device Info'; + case TargetPlatform.macOS: + return 'MacOS Device Info'; + case TargetPlatform.fuchsia: + return 'Fuchsia Device Info'; + } + } } diff --git a/packages/device_info_plus/device_info_plus/example/ohos/.gitignore b/packages/device_info_plus/device_info_plus/example/ohos/.gitignore new file mode 100644 index 00000000..940b8265 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/example/ohos/.gitignore @@ -0,0 +1,18 @@ +/node_modules +/oh_modules +/local.properties +/.idea +**/build +/.hvigor +.cxx +/.clangd +/.clang-format +/.clang-tidy +**/.test +entry/libs/arm64-v8a/libapp.so +entry/libs/arm64-v8a/libflutter.so +entry/libs/arm64-v8a/libvmservice_snapshot.so +entry/src/main/resources/rawfile/flutter_assets/ +har/*.har +oh-package-lock.json5 +dta \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/example/ohos/AppScope/app.json5 b/packages/device_info_plus/device_info_plus/example/ohos/AppScope/app.json5 new file mode 100644 index 00000000..ae914f3a --- /dev/null +++ b/packages/device_info_plus/device_info_plus/example/ohos/AppScope/app.json5 @@ -0,0 +1,10 @@ +{ + "app": { + "bundleName": "dev.fluttercommunity.plus.device_info_plus_example", + "vendor": "example", + "versionCode": 1000000, + "versionName": "1.0.0", + "icon": "$media:app_icon", + "label": "$string:app_name" + } +} \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/element/string.json b/packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/element/string.json new file mode 100644 index 00000000..73507ba6 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "device_info_plus_example" + } + ] +} diff --git a/packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/media/app_icon.png b/packages/device_info_plus/device_info_plus/example/ohos/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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 get ohosDeviceInfo async => _cachedOhosDeviceInfo ??= + OhosDeviceInfo.fromMap((await _platform.deviceInfo()).data); + + /// Requires permission: ohos.permission.sec.ACCESS_UDID (System permission, only open to system apps). + /// Device serial number. + /// Device Udid. + Future get ohosAccessUDIDInfo async => + OhosAccessUDIDInfo.fromMap( + // ignore: invalid_use_of_visible_for_testing_member + (await _platform.channel.invokeMethod('getAccessUDIDInfo')) + .cast()); +} diff --git a/packages/device_info_plus/device_info_plus/lib/src/ohos_device_info.dart b/packages/device_info_plus/device_info_plus/lib/src/ohos_device_info.dart new file mode 100644 index 00000000..04beaa38 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/lib/src/ohos_device_info.dart @@ -0,0 +1,309 @@ +import 'package:device_info_plus_platform_interface/model/base_device_info.dart'; + +/// Information derived from `@ohos.deviceInfo`. +/// +/// https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-device-info-0000001428061996-V3 + +class OhosDeviceInfo extends BaseDeviceInfo { + OhosDeviceInfo._({ + required Map data, + required this.deviceType, + required this.manufacture, + required this.brand, + required this.marketName, + required this.productSeries, + required this.productModel, + required this.softwareModel, + required this.hardwareModel, + // required this.hardwareProfile, + // required this.serial, + required this.bootloaderVersion, + required this.abiList, + required this.securityPatchTag, + required this.displayVersion, + required this.incrementalVersion, + required this.osReleaseType, + required this.osFullName, + required this.majorVersion, + required this.seniorVersion, + required this.featureVersion, + required this.buildVersion, + required this.sdkApiVersion, + required this.firstApiVersion, + required this.versionId, + required this.buildType, + required this.buildUser, + required this.buildHost, + required this.buildTime, + required this.buildRootHash, + // required this.udid, + required this.distributionOSName, + required this.distributionOSVersion, + required this.distributionOSApiVersion, + required this.distributionOSReleaseType, + required this.isPhysicalDevice, + }) : super(data); + + factory OhosDeviceInfo.fromMap(Map map) { + return OhosDeviceInfo._( + data: map, + deviceType: map['deviceType'] ?? '', + manufacture: map['manufacture'] ?? '', + brand: map['brand'] ?? '', + marketName: map['marketName'] ?? '', + productSeries: map['productSeries'] ?? '', + productModel: map['productModel'] ?? '', + softwareModel: map['softwareModel'] ?? '', + hardwareModel: map['hardwareModel'] ?? '', + // hardwareProfile: map['hardwareProfile'] ?? '', + // serial: map['serial'] ?? '', + bootloaderVersion: map['bootloaderVersion'] ?? '', + abiList: map['abiList'] ?? '', + securityPatchTag: map['securityPatchTag'] ?? '', + displayVersion: map['displayVersion'] ?? '', + incrementalVersion: map['incrementalVersion'] ?? '', + osReleaseType: map['osReleaseType'] ?? '', + osFullName: map['osFullName'] ?? '', + majorVersion: map['majorVersion'] ?? 0, + seniorVersion: map['seniorVersion'] ?? 0, + featureVersion: map['featureVersion'] ?? 0, + buildVersion: map['buildVersion'] ?? 0, + sdkApiVersion: map['sdkApiVersion'] ?? 0, + firstApiVersion: map['firstApiVersion'] ?? 0, + versionId: map['versionId'] ?? '', + buildType: map['buildType'] ?? '', + buildUser: map['buildUser'] ?? '', + buildHost: map['buildHost'] ?? '', + buildTime: map['buildTime'] ?? '', + buildRootHash: map['buildRootHash'] ?? '', + // udid: map['udid'] ?? '', + distributionOSName: map['distributionOSName'] ?? '', + distributionOSVersion: map['distributionOSVersion'] ?? '', + distributionOSApiVersion: map['distributionOSApiVersion'] ?? 0, + distributionOSReleaseType: map['distributionOSReleaseType'] ?? '', + isPhysicalDevice: map['isPhysicalDevice'] == true, + ); + } + + /// Device type. + /// 设备类型。 + final String deviceType; + + /// Device manufacturer name. + /// 设备厂家名称。 + final String manufacture; + + /// Device brand name. + /// 设备品牌名称。 + final String brand; + + /// External product series. + /// 外部产品系列。 + final String marketName; + + /// Product series. + /// 产品系列。 + final String productSeries; + + /// Product model. + /// 认证型号。 + final String productModel; + + /// Software model. + /// 内部软件子型号。 + final String softwareModel; + + /// Hardware model. + /// 硬件版本号。 + final String hardwareModel; + + /// Hardware profile. + /// 硬件Profile。 + // @Deprecated('since api 9') + // final String hardwareProfile; + + /// Requires permission: ohos.permission.sec.ACCESS_UDID (System permission, only open to system apps). + /// Device serial number. + /// 设备序列号。 + // final String serial; + + /// Bootloader version number. + /// Bootloader版本号。 + final String bootloaderVersion; + + /// Application binary interface (Abi) list. + /// 应用二进制接口（Abi）列表。 + final String abiList; + + /// Security patch level. + /// 安全补丁级别。 + final String securityPatchTag; + + /// Product version. + /// 产品版本。 + final String displayVersion; + + /// Incremental version. + /// 差异版本号。 + final String incrementalVersion; + + /// OS release type. + /// 系统的发布类型，取值为： + /// - Canary：面向特定开发者发布的早期预览版本，不承诺API稳定性。 + /// - Beta：面向开发者公开发布的Beta版本，不承诺API稳定性。 + /// - Release：面向开发者公开发布的正式版本，承诺API稳定性。 + final String osReleaseType; + + /// OS version. + /// 系统版本。 + final String osFullName; + + /// Major version number, increases with updates to the overall architecture. + /// Major版本号，随主版本更新增加。 + final int majorVersion; + + /// Senior version number, increases with updates to the partial architecture or major features. + /// Senior版本号，随局部架构、重大特性增加。 + final int seniorVersion; + + /// Feature version number, increases with planned new features. + /// Feature版本号，标识规划的新特性版本。 + final int featureVersion; + + /// Build version number, increases with each new development build. + /// Build版本号，标识编译构建的版本号。 + final int buildVersion; + + /// SDK API version number. + /// 系统软件API版本。 + final int sdkApiVersion; + + /// First API version number. + /// 首个版本系统软件API版本。 + final int firstApiVersion; + + /// Version ID. + /// 版本ID。 + final String versionId; + + /// Build type. + /// 构建类型。 + final String buildType; + + /// Build user. + /// 构建用户。 + final String buildUser; + + /// Build host. + /// 构建主机。 + final String buildHost; + + /// Build time. + /// 构建时间。 + final String buildTime; + + /// Build version hash. + /// 构建版本Hash。 + final String buildRootHash; + + /// Requires permission: ohos.permission.sec.ACCESS_UDID (System permission, only open to system apps). + /// Device Udid. + /// 设备Udid。 + // final String udid; + + /// Distribution OS name. + /// 发行版系统名称。 + final String distributionOSName; + + /// Distribution OS version. + /// 发行版系统版本号。 + final String distributionOSVersion; + + /// Distribution OS API version. + /// 发行版系统API版本号。 + final int distributionOSApiVersion; + + /// Distribution OS release type. + /// 发行版系统类型。 + final String distributionOSReleaseType; + + /// `false` if the application is running in an emulator, `true` otherwise. + final bool isPhysicalDevice; + + Map toJson() { + return { + 'deviceType': deviceType, + 'manufacture': manufacture, + 'brand': brand, + 'marketName': marketName, + 'productSeries': productSeries, + 'productModel': productModel, + 'softwareModel': softwareModel, + 'hardwareModel': hardwareModel, + // 'hardwareProfile': hardwareProfile, + // serial': serial, + 'bootloaderVersion': bootloaderVersion, + 'abiList': abiList, + 'securityPatchTag': securityPatchTag, + 'displayVersion': displayVersion, + 'incrementalVersion': incrementalVersion, + 'osReleaseType': osReleaseType, + 'osFullName': osFullName, + 'majorVersion': majorVersion, + 'seniorVersion': seniorVersion, + 'featureVersion': featureVersion, + 'buildVersion': buildVersion, + 'sdkApiVersion': sdkApiVersion, + 'firstApiVersion': firstApiVersion, + 'versionId': versionId, + 'buildType': buildType, + 'buildUser': buildUser, + 'buildHost': buildHost, + 'buildTime': buildTime, + 'buildRootHash': buildRootHash, + // 'udid': udid, + 'distributionOSName': distributionOSName, + 'distributionOSVersion': distributionOSVersion, + 'distributionOSApiVersion': distributionOSApiVersion, + 'distributionOSReleaseType': distributionOSReleaseType, + 'isPhysicalDevice': isPhysicalDevice, + }; + } +} + +/// Information derived from `@ohos.deviceInfo`. +/// +/// https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-device-info-0000001428061996-V3 + +class OhosAccessUDIDInfo extends BaseDeviceInfo { + OhosAccessUDIDInfo._({ + required Map data, + required this.serial, + required this.udid, + }) : super(data); + + factory OhosAccessUDIDInfo.fromMap(Map map) { + return OhosAccessUDIDInfo._( + data: map, + serial: map['serial'] ?? '', + udid: map['udid'] ?? '', + ); + } + + /// Requires permission: ohos.permission.sec.ACCESS_UDID (System permission, only open to system apps). + /// Device serial number. + /// 设备序列号。 + final String serial; + + /// Requires permission: ohos.permission.sec.ACCESS_UDID (System permission, only open to system apps). + /// Device Udid. + /// 设备Udid。 + final String udid; + + Map toJson() { + return { + 'serial': serial, + 'udid': udid, + }; + } +} diff --git a/packages/device_info_plus/device_info_plus/ohos/.gitignore b/packages/device_info_plus/device_info_plus/ohos/.gitignore new file mode 100644 index 00000000..c0f9ca4c --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/.gitignore @@ -0,0 +1,9 @@ +/node_modules +/oh_modules +/.preview +/.idea +/build +/.cxx +/.test +/BuildProfile.ets +/oh-package-lock.json5 diff --git a/packages/device_info_plus/device_info_plus/ohos/build-profile.json5 b/packages/device_info_plus/device_info_plus/ohos/build-profile.json5 new file mode 100644 index 00000000..79961f96 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/build-profile.json5 @@ -0,0 +1,10 @@ +{ + "apiType": "stageMode", + "buildOption": { + }, + "targets": [ + { + "name": "default" + } + ] +} diff --git a/packages/device_info_plus/device_info_plus/ohos/hvigorfile.ts b/packages/device_info_plus/device_info_plus/ohos/hvigorfile.ts new file mode 100644 index 00000000..47e6e1f8 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/hvigorfile.ts @@ -0,0 +1,2 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +export { harTasks } from '@ohos/hvigor-ohos-plugin'; \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/ohos/index.ets b/packages/device_info_plus/device_info_plus/ohos/index.ets new file mode 100644 index 00000000..d1866906 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/index.ets @@ -0,0 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +import DeviceInfoPlusPlugin from './src/main/ets/components/plugin/DeviceInfoPlusOhosPlugin'; +export default DeviceInfoPlusPlugin; diff --git a/packages/device_info_plus/device_info_plus/ohos/oh-package.json5 b/packages/device_info_plus/device_info_plus/ohos/oh-package.json5 new file mode 100644 index 00000000..6ee47cc8 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/oh-package.json5 @@ -0,0 +1,11 @@ +{ + "name": "device_info_plus", + "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "index.ets", + "author": "", + "license": "Apache-2.0", + "dependencies": { + "@ohos/flutter_ohos": "file:./har/flutter.har" + } +} diff --git a/packages/device_info_plus/device_info_plus/ohos/src/main/ets/components/plugin/DeviceInfoPlusOhosPlugin.ets b/packages/device_info_plus/device_info_plus/ohos/src/main/ets/components/plugin/DeviceInfoPlusOhosPlugin.ets new file mode 100644 index 00000000..9d8b8fe9 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/src/main/ets/components/plugin/DeviceInfoPlusOhosPlugin.ets @@ -0,0 +1,92 @@ +import { + FlutterPlugin, + FlutterPluginBinding +} from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; +import MethodChannel, { + MethodCallHandler, + MethodResult +} from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodChannel'; +import MethodCall from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodCall'; +import deviceInfo from '@ohos.deviceInfo'; +import HashMap from '@ohos.util.HashMap'; + +/** DeviceInfoPlusPlugin **/ +export default class DeviceInfoPlusPlugin implements FlutterPlugin, MethodCallHandler { + private channel: MethodChannel | null = null; + + constructor() { + } + + getUniqueClassName(): string { + return "DeviceInfoPlusPlugin" + } + + onAttachedToEngine(binding: FlutterPluginBinding): void { + this.channel = new MethodChannel(binding.getBinaryMessenger(), "dev.fluttercommunity.plus/device_info"); + this.channel.setMethodCallHandler(this) + } + + onDetachedFromEngine(binding: FlutterPluginBinding): void { + if (this.channel != null) { + this.channel.setMethodCallHandler(null) + } + } + + onMethodCall(call: MethodCall, result: MethodResult): void { + if (call.method == "getDeviceInfo") { + let infoMap: HashMap = new HashMap(); + infoMap.set('deviceType', deviceInfo.deviceType); + infoMap.set('manufacture', deviceInfo.manufacture); + infoMap.set('brand', deviceInfo.brand); + infoMap.set('marketName', deviceInfo.marketName); + infoMap.set('productSeries', deviceInfo.productSeries); + infoMap.set('productModel', deviceInfo.productModel); + infoMap.set('softwareModel', deviceInfo.softwareModel); + infoMap.set('hardwareModel', deviceInfo.hardwareModel); + // deprecated + // infoMap.set('hardwareProfile', deviceInfo.hardwareProfile); + // infoMap.set('serial', deviceInfo.serial); + // infoMap.set('serial', ''); + infoMap.set('bootloaderVersion', deviceInfo.bootloaderVersion); + infoMap.set('abiList', deviceInfo.abiList); + infoMap.set('securityPatchTag', deviceInfo.securityPatchTag); + infoMap.set('displayVersion', deviceInfo.displayVersion); + infoMap.set('incrementalVersion', deviceInfo.incrementalVersion); + infoMap.set('osReleaseType', deviceInfo.osReleaseType); + infoMap.set('osFullName', deviceInfo.osFullName); + infoMap.set('majorVersion', deviceInfo.majorVersion); + infoMap.set('seniorVersion', deviceInfo.seniorVersion); + infoMap.set('featureVersion', deviceInfo.featureVersion); + infoMap.set('buildVersion', deviceInfo.buildVersion); + infoMap.set('sdkApiVersion', deviceInfo.sdkApiVersion); + infoMap.set('firstApiVersion', deviceInfo.firstApiVersion); + infoMap.set('versionId', deviceInfo.versionId); + infoMap.set('buildType', deviceInfo.buildType); + infoMap.set('buildUser', deviceInfo.buildUser); + infoMap.set('buildHost', deviceInfo.buildHost); + infoMap.set('buildTime', deviceInfo.buildTime); + infoMap.set('buildRootHash', deviceInfo.buildRootHash); + // infoMap.set('udid', deviceInfo.udid); + // infoMap.set('udid', ''); + infoMap.set('distributionOSName', deviceInfo.distributionOSName); + infoMap.set('distributionOSVersion', deviceInfo.distributionOSVersion); + infoMap.set('distributionOSApiVersion', deviceInfo.distributionOSApiVersion); + infoMap.set('distributionOSReleaseType', deviceInfo.distributionOSReleaseType); + infoMap.set('isPhysicalDevice', !this.isEmulator(infoMap)); + result.success(infoMap) + } + else if (call.method == "getAccessUDIDInfo") { + let infoMap: HashMap = new HashMap(); + infoMap.set('serial', deviceInfo.serial); + infoMap.set('udid', deviceInfo.udid); + result.success(infoMap) + } + else { + result.notImplemented() + } + } + + isEmulator(infoMap: HashMap): Boolean { + return infoMap.hasValue('emulator') || deviceInfo.versionId.includes('emulator') || deviceInfo.displayVersion.includes('emulator'); + } +} \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/ohos/src/main/module.json5 b/packages/device_info_plus/device_info_plus/ohos/src/main/module.json5 new file mode 100644 index 00000000..700af06c --- /dev/null +++ b/packages/device_info_plus/device_info_plus/ohos/src/main/module.json5 @@ -0,0 +1,10 @@ +{ + "module": { + "name": "device_info_plus", + "type": "har", + "deviceTypes": [ + "default", + "tablet" + ] + } +} diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index e09e032f..25d10dee 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -27,7 +27,8 @@ flutter: pluginClass: DeviceInfoPlusMacosPlugin windows: dartPluginClass: DeviceInfoPlusWindowsPlugin - + ohos: + pluginClass: DeviceInfoPlusPlugin dependencies: device_info_plus_platform_interface: ^7.0.1 ffi: ^2.0.1 -- Gitee