From dd230d07f6b61e2009be8db5de34219911a8cff5 Mon Sep 17 00:00:00 2001 From: liuxinbing Date: Thu, 10 Jul 2025 06:18:47 +0000 Subject: [PATCH] cherry-pick Signed-off-by: liuxinbing --- api/@ohos.geoLocationManager.d.ts | 503 ++++++++++++++++++++---------- kits/@kit.LocationKit.d.ts | 11 +- 2 files changed, 344 insertions(+), 170 deletions(-) diff --git a/api/@ohos.geoLocationManager.d.ts b/api/@ohos.geoLocationManager.d.ts index d5413e5ba8..74511e841d 100644 --- a/api/@ohos.geoLocationManager.d.ts +++ b/api/@ohos.geoLocationManager.d.ts @@ -22,9 +22,10 @@ import { AsyncCallback, Callback } from './@ohos.base'; /*** if arkts 1.1 */ import { WantAgent } from './@ohos.wantAgent'; /*** endif */ -/*** if arkts 1.1 */ -import { NotificationRequest } from './notification/notificationRequest'; +/*** if arkts 1.2 */ +import { WantAgent } from '@ohos.app.ability.wantAgent'; /*** endif */ +import { NotificationRequest } from './notification/notificationRequest'; /** * Provides interfaces for acquiring location information, managing location switches, @@ -108,7 +109,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationChange', request: LocationRequest | ContinuousLocationRequest, callback: Callback): void; @@ -156,7 +158,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationChange', callback?: Callback): void; @@ -172,7 +175,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationError', callback: Callback): void; @@ -188,7 +192,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationError', callback?: Callback): void; @@ -201,7 +206,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationEnabledChange', callback: Callback): void; @@ -214,7 +220,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationEnabledChange', callback?: Callback): void; @@ -247,7 +254,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'cachedGnssLocationsChange', request: CachedGnssLocationsRequest, callback: Callback>): void; @@ -278,7 +286,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'cachedGnssLocationsChange', callback?: Callback>): void; @@ -294,7 +303,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'satelliteStatusChange', callback: Callback): void; @@ -310,7 +320,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'satelliteStatusChange', callback?: Callback): void; @@ -326,7 +337,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'nmeaMessage', callback: Callback): void; @@ -342,7 +354,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'nmeaMessage', callback?: Callback): void; @@ -392,7 +405,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'countryCodeChange', callback: Callback): void; @@ -406,7 +420,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'countryCodeChange', callback?: Callback): void; @@ -425,7 +440,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301800 - Failed to start WiFi or Bluetooth scanning. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locatingRequiredDataChange', config: LocatingRequiredDataConfig, callback: Callback>): void; @@ -441,7 +457,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locatingRequiredDataChange')} due to limited device capabilities. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locatingRequiredDataChange', callback?: Callback>): void; @@ -456,7 +473,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationIconStatusChange', callback: Callback): void; @@ -471,7 +489,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationIconStatusChange', callback?: Callback): void; @@ -487,7 +506,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'bluetoothScanResultChange', callback: Callback): void; @@ -502,7 +522,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('bluetoothScanResultChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'bluetoothScanResultChange', callback?: Callback): void; @@ -665,7 +686,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301200 - Failed to obtain the geographical location. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getLastLocation(): Location; @@ -686,7 +708,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function isLocationEnabled(): boolean; @@ -730,7 +753,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function enableLocation(callback: AsyncCallback): void; @@ -758,7 +782,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function enableLocation(): Promise; @@ -800,7 +825,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function disableLocation(): void; @@ -845,7 +871,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest, callback: AsyncCallback>): void; @@ -859,7 +886,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest): Promise>; @@ -1190,7 +1218,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isLocationPrivacyConfirmed(type: LocationPrivacyType): boolean; @@ -1403,7 +1432,8 @@ declare namespace geoLocationManager { * * @typedef SatelliteStatusInfo * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface SatelliteStatusInfo { /** @@ -1411,7 +1441,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ satellitesNumber: number; @@ -1420,7 +1451,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteIds: Array; @@ -1429,7 +1461,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ carrierToNoiseDensitys: Array; @@ -1438,7 +1471,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ altitudes: Array; @@ -1447,7 +1481,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ azimuths: Array; @@ -1456,7 +1491,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ carrierFrequencies: Array; @@ -1465,7 +1501,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteConstellation?: Array; @@ -1474,7 +1511,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteAdditionalInfo?: Array; } @@ -1484,7 +1522,8 @@ declare namespace geoLocationManager { * * @typedef CachedGnssLocationsRequest * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CachedGnssLocationsRequest { /** @@ -1492,7 +1531,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ reportingPeriodSec: number; @@ -1501,7 +1541,8 @@ declare namespace geoLocationManager { * * @type { boolean } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ wakeUpCacheQueueFull: boolean; } @@ -1637,7 +1678,8 @@ declare namespace geoLocationManager { * * @typedef ReverseGeoCodeRequest * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ReverseGeoCodeRequest { /** @@ -1645,7 +1687,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -1654,7 +1697,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ country?: string; @@ -1663,7 +1707,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ latitude: number; @@ -1672,7 +1717,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ longitude: number; @@ -1681,7 +1727,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxItems?: number; } @@ -1691,7 +1738,8 @@ declare namespace geoLocationManager { * * @typedef GeoCodeRequest * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface GeoCodeRequest { /** @@ -1699,7 +1747,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -1708,7 +1757,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ country?: string; @@ -1717,7 +1767,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ description: string; @@ -1726,7 +1777,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxItems?: number; @@ -1735,7 +1787,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ minLatitude?: number; @@ -1744,7 +1797,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ minLongitude?: number; @@ -1753,7 +1807,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxLatitude?: number; @@ -1762,7 +1817,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxLongitude?: number; } @@ -1772,7 +1828,8 @@ declare namespace geoLocationManager { * * @typedef GeoAddress * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface GeoAddress { /** @@ -1782,7 +1839,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ latitude?: number; @@ -1793,7 +1851,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ longitude?: number; @@ -1803,7 +1862,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -1812,7 +1872,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ placeName?: string; @@ -1821,7 +1882,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ countryCode?: string; @@ -1830,7 +1892,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ countryName?: string; @@ -1839,7 +1902,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ administrativeArea?: string; @@ -1848,7 +1912,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ subAdministrativeArea?: string; @@ -1857,7 +1922,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locality?: string; @@ -1866,7 +1932,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ subLocality?: string; @@ -1875,7 +1942,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ roadName?: string; @@ -1884,7 +1952,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ subRoadName?: string; @@ -1893,7 +1962,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ premises?: string; @@ -1902,7 +1972,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ postalCode?: string; @@ -1911,7 +1982,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ phoneNumber?: string; @@ -1920,7 +1992,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ addressUrl?: string; @@ -1929,7 +2002,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ descriptions?: Array; @@ -1938,7 +2012,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ descriptionsSize?: number; @@ -1948,7 +2023,8 @@ declare namespace geoLocationManager { * @type { ?Boolean } * @syscap SystemCapability.Location.Location.Geocoder * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isFromMock?: Boolean; } @@ -1966,7 +2042,8 @@ declare namespace geoLocationManager { * @typedef LocationRequest * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LocationRequest { /** @@ -1982,7 +2059,8 @@ declare namespace geoLocationManager { * @type { ?LocationRequestPriority } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ priority?: LocationRequestPriority; @@ -1999,7 +2077,8 @@ declare namespace geoLocationManager { * @type { ?LocationRequestScenario } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ scenario?: LocationRequestScenario; @@ -2016,7 +2095,8 @@ declare namespace geoLocationManager { * @type { ?number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ timeInterval?: number; @@ -2033,7 +2113,8 @@ declare namespace geoLocationManager { * @type { ?number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ distanceInterval?: number; @@ -2050,7 +2131,8 @@ declare namespace geoLocationManager { * @type { ?number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ maxAccuracy?: number; } @@ -2178,7 +2260,8 @@ declare namespace geoLocationManager { * @typedef ContinuousLocationRequest * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ContinuousLocationRequest { /** @@ -2187,7 +2270,8 @@ declare namespace geoLocationManager { * @type { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interval: number; @@ -2197,7 +2281,8 @@ declare namespace geoLocationManager { * @type { UserActivityScenario | PowerConsumptionScenario } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ locationScenario: UserActivityScenario | PowerConsumptionScenario; @@ -2209,7 +2294,8 @@ declare namespace geoLocationManager { * @syscap SystemCapability.Location.Location.Core * @systemapi * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ sportsType?: SportsType; @@ -2565,7 +2651,8 @@ declare namespace geoLocationManager { * @typedef LocatingRequiredDataConfig * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LocatingRequiredDataConfig { /** @@ -2574,7 +2661,8 @@ declare namespace geoLocationManager { * @type {LocatingRequiredDataType} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type: LocatingRequiredDataType; @@ -2584,7 +2672,8 @@ declare namespace geoLocationManager { * @type {boolean} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ needStartScan: boolean; @@ -2595,7 +2684,8 @@ declare namespace geoLocationManager { * @type {?number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ scanInterval?: number; @@ -2606,7 +2696,8 @@ declare namespace geoLocationManager { * @type {?number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ scanTimeout?: number; } @@ -2616,7 +2707,8 @@ declare namespace geoLocationManager { * @typedef LocatingRequiredData * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LocatingRequiredData { /** @@ -2625,7 +2717,8 @@ declare namespace geoLocationManager { * @type {?WifiScanInfo} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ wifiData?: WifiScanInfo; @@ -2635,7 +2728,8 @@ declare namespace geoLocationManager { * @type {?BluetoothScanInfo} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ bluetoothData?: BluetoothScanInfo; } @@ -2645,7 +2739,8 @@ declare namespace geoLocationManager { * @typedef WifiScanInfo * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface WifiScanInfo { /** @@ -2654,7 +2749,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -2664,7 +2760,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ bssid: string; @@ -2674,7 +2771,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -2684,7 +2782,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ frequency: number; @@ -2694,7 +2793,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ timestamp: number; } @@ -2705,7 +2805,8 @@ declare namespace geoLocationManager { * @typedef BluetoothScanInfo * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface BluetoothScanInfo { /** @@ -2714,7 +2815,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; @@ -2724,7 +2826,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ macAddress: string; @@ -2734,7 +2837,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -2744,7 +2848,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ timestamp: number; } @@ -2754,7 +2859,8 @@ declare namespace geoLocationManager { * * @typedef BluetoothScanResult * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ export interface BluetoothScanResult { /** @@ -2762,7 +2868,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; @@ -2771,7 +2878,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -2780,7 +2888,8 @@ declare namespace geoLocationManager { * * @type { ?ArrayBuffer } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ data?: ArrayBuffer; @@ -2789,7 +2898,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; @@ -2798,7 +2908,8 @@ declare namespace geoLocationManager { * * @type { boolean } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ connectable: boolean; } @@ -3000,14 +3111,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Geofence - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum CoordinateSystemType { /** * WGS84 coordinates system. * * @syscap SystemCapability.Location.Location.Geofence - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ WGS84 = 1, @@ -3015,7 +3128,8 @@ declare namespace geoLocationManager { * GCJ-02 coordinates system. * * @syscap SystemCapability.Location.Location.Geofence - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GCJ02 = 2 } @@ -3026,7 +3140,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocationIconStatus { /** @@ -3034,7 +3149,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_NOT_STARTED = 0, @@ -3043,7 +3159,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_STARTED = 1, @@ -3052,7 +3169,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HD_LOCATING_STARTED = 2 } @@ -3063,7 +3181,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocationError { /** @@ -3071,7 +3190,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_DEFAULT = -1, @@ -3080,7 +3200,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_LOCATION_PERMISSION_DENIED = -2, @@ -3089,7 +3210,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_BACKGROUND_PERMISSION_DENIED = -3, @@ -3098,7 +3220,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_LOCATION_SWITCH_OFF = -4, @@ -3107,7 +3230,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_INTERNET_ACCESS_FAILURE = -5 } @@ -3150,14 +3274,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SatelliteConstellationCategory { /** * Invalid value. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_UNKNOWN = 0, @@ -3165,7 +3291,8 @@ declare namespace geoLocationManager { * GPS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_GPS = 1, @@ -3173,7 +3300,8 @@ declare namespace geoLocationManager { * SBAS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_SBAS = 2, @@ -3181,7 +3309,8 @@ declare namespace geoLocationManager { * GLONASS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_GLONASS = 3, @@ -3189,7 +3318,8 @@ declare namespace geoLocationManager { * QZSS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_QZSS = 4, @@ -3197,7 +3327,8 @@ declare namespace geoLocationManager { * BEIDOU. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_BEIDOU = 5, @@ -3205,7 +3336,8 @@ declare namespace geoLocationManager { * GALILEO. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_GALILEO = 6, @@ -3213,7 +3345,8 @@ declare namespace geoLocationManager { * IRNSS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_IRNSS = 7 } @@ -3223,14 +3356,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SatelliteAdditionalInfo { /** * Default value. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_NULL = 0, @@ -3238,7 +3373,8 @@ declare namespace geoLocationManager { * Ephemeris data exist. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_EPHEMERIS_DATA_EXIST = 1, @@ -3246,7 +3382,8 @@ declare namespace geoLocationManager { * Almanac data exist. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_ALMANAC_DATA_EXIST = 2, @@ -3254,7 +3391,8 @@ declare namespace geoLocationManager { * This satellite is being used in location fix. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_USED_IN_FIX = 4, @@ -3262,7 +3400,8 @@ declare namespace geoLocationManager { * Carrier frequency exist. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_CARRIER_FREQUENCY_EXIST = 8 } @@ -3273,7 +3412,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum UserActivityScenario { /** @@ -3281,7 +3421,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NAVIGATION = 0x401, @@ -3290,7 +3431,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SPORT = 0x402, @@ -3299,7 +3441,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TRANSPORT = 0x403, @@ -3308,7 +3451,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DAILY_LIFE_SERVICE = 0x404 } @@ -3546,7 +3690,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum PowerConsumptionScenario { /** @@ -3554,7 +3699,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HIGH_POWER_CONSUMPTION = 0x601, @@ -3563,7 +3709,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOW_POWER_CONSUMPTION = 0x602, @@ -3572,7 +3719,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NO_POWER_CONSUMPTION = 0x603 } @@ -3583,7 +3731,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocationPrivacyType { /** @@ -3591,7 +3740,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ OTHERS = 0, @@ -3600,7 +3750,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ STARTUP, @@ -3609,7 +3760,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CORE_LOCATION } @@ -3620,7 +3772,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SportsType { /** @@ -3628,7 +3781,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RUNNING = 1, @@ -3637,7 +3791,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ WALKING, @@ -3646,7 +3801,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ CYCLING } @@ -3683,7 +3839,8 @@ declare namespace geoLocationManager { * * @typedef CountryCode * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CountryCode { /** @@ -3691,7 +3848,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ country: string; @@ -3700,7 +3858,8 @@ declare namespace geoLocationManager { * * @type { CountryCodeType } * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ type: CountryCodeType; } @@ -3710,14 +3869,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum CountryCodeType { /** * Country code obtained from the locale setting. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_LOCALE = 1, @@ -3725,7 +3886,8 @@ declare namespace geoLocationManager { * Country code obtained from the SIM information. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_SIM, @@ -3733,7 +3895,8 @@ declare namespace geoLocationManager { * Query the country code information from the reverse geocoding result. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_LOCATION, @@ -3741,7 +3904,8 @@ declare namespace geoLocationManager { * Obtain the country code from the cell registration information. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_NETWORK } @@ -3752,7 +3916,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocatingRequiredDataType { /** @@ -3760,7 +3925,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ WIFI = 1, @@ -3769,7 +3935,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ BLUETOOTH } diff --git a/kits/@kit.LocationKit.d.ts b/kits/@kit.LocationKit.d.ts index 24735b74e1..917b13e3fc 100644 --- a/kits/@kit.LocationKit.d.ts +++ b/kits/@kit.LocationKit.d.ts @@ -17,9 +17,15 @@ * @file * @kit LocationKit */ +/*** if arkts 1.1&1.2 */ +import geoLocationManager from '@ohos.geoLocationManager'; +export { + geoLocationManager +}; +/*** endif */ +/*** if arkts 1.1*/ import geolocation from '@ohos.geolocation'; -import geoLocationManager from '@ohos.geoLocationManager'; import FenceExtensionAbility from '@ohos.app.ability.FenceExtensionAbility'; import FenceExtensionContext from '@ohos.app.ability.FenceExtensionContext'; import Geolocation, { @@ -29,6 +35,7 @@ import Geolocation, { export { Geolocation, GeolocationResponse, GetLocationOption, GetLocationTypeOption, - GetLocationTypeResponse, SubscribeLocationOption, geoLocationManager, geolocation, + GetLocationTypeResponse, SubscribeLocationOption, geolocation, FenceExtensionAbility,FenceExtensionContext }; +/*** endif */ \ No newline at end of file -- Gitee