From f1bde16345106c3488e7078f7b47ec093dc499ff Mon Sep 17 00:00:00 2001 From: Gloria Date: Tue, 6 Jun 2023 16:05:16 +0800 Subject: [PATCH] Update docs against 18923+18909 Signed-off-by: wusongqing --- .../device-usage-statistics-use-guide.md | 4 +- .../reference/apis/js-apis-camera.md | 52 ++++++++++++------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/en/application-dev/device-usage-statistics/device-usage-statistics-use-guide.md b/en/application-dev/device-usage-statistics/device-usage-statistics-use-guide.md index 82027e91a9..067f372d7e 100644 --- a/en/application-dev/device-usage-statistics/device-usage-statistics-use-guide.md +++ b/en/application-dev/device-usage-statistics/device-usage-statistics-use-guide.md @@ -1,4 +1,4 @@ -# Device Usage Statistics Development (API Version 9) +# Device Usage Statistics Development ## When to Use @@ -38,7 +38,7 @@ import usageStatistics from '@ohos.resourceschedule.usageStatistics'; ## How to Develop 1. Before obtaining the device usage statistics, check whether the **ohos.permission.BUNDLE_ACTIVE_INFO** permission is configured. For details about how to configure a permission, see [Declaring Permissions](../security/accesstoken-guidelines.md). - + 2. Query events of all applications based on the specified start time and end time. This requires the **ohos.permission.BUNDLE_ACTIVE_INFO** permission to be configured. ```js diff --git a/en/application-dev/reference/apis/js-apis-camera.md b/en/application-dev/reference/apis/js-apis-camera.md index b8d4e4b54a..c86b21c5f8 100644 --- a/en/application-dev/reference/apis/js-apis-camera.md +++ b/en/application-dev/reference/apis/js-apis-camera.md @@ -2,8 +2,7 @@ > **NOTE** > -> - The initial APIs of this module are supported since API version 9. Newly added APIs will be marked with a superscript to indicate their earliest API version. -> - The APIs provided by this module are system APIs. +> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version. ## Modules to Import @@ -110,17 +109,18 @@ Enumerates the camera error codes, which are returned when an API call is incorr **System capability**: SystemCapability.Multimedia.Camera.Core -| Name | Value | Description | -| ------------------------- | ---- | ------------ | -| INVALID_ARGUMENT | 7400101 | A parameter is missing or the parameter type is incorrect. | -| OPERATION_NOT_ALLOWED | 7400102 | The operation is not allowed. | -| SESSION_NOT_CONFIG | 7400103 | The session is not configured. | -| SESSION_NOT_RUNNING | 7400104 | The session is not running. | -| SESSION_CONFIG_LOCKED | 7400105 | The session configuration is locked. | -| DEVICE_SETTING_LOCKED | 7400106 | The device setting is locked. | -| CONFILICT_CAMERA | 7400107 | The device is already started. | -| DEVICE_DISABLED | 7400108 | The camera is disabled for security reasons. | -| SERVICE_FATAL_ERROR | 7400201 | An error occurs in the camera service. | +| Name | Value | Description | +| ------------------------- | ---- | ------------ | +| INVALID_ARGUMENT | 7400101 | A parameter is missing or the parameter type is incorrect. | +| OPERATION_NOT_ALLOWED | 7400102 | The operation is not allowed. | +| SESSION_NOT_CONFIG | 7400103 | The session is not configured. | +| SESSION_NOT_RUNNING | 7400104 | The session is not running. | +| SESSION_CONFIG_LOCKED | 7400105 | The session configuration is locked. | +| DEVICE_SETTING_LOCKED | 7400106 | The device setting is locked. | +| CONFLICT_CAMERA | 7400107 | The device is already started. | +| DEVICE_DISABLED | 7400108 | The camera is disabled for security reasons. | +| DEVICE_PREEMPTED | 7400109 | The camera is preempted. | +| SERVICE_FATAL_ERROR | 7400201 | An error occurs in the camera service. | ## CameraManager @@ -203,7 +203,7 @@ isCameraMuteSupported(): boolean Checks whether the camera can be muted. -This is a system API. +**System API**: This is a system API. **System capability**: SystemCapability.Multimedia.Camera.Core @@ -225,7 +225,7 @@ muteCamera(mute: boolean): void Mutes or unmutes the camera. -This is a system API. +**System API**: This is a system API. **System capability**: SystemCapability.Multimedia.Camera.Core @@ -562,7 +562,7 @@ on(type: 'cameraMute', callback: AsyncCallback\): void Listens for camera mute status changes. This API uses an asynchronous callback to return the result. -This is a system API. +**System API**: This is a system API. **System capability**: SystemCapability.Multimedia.Camera.Core @@ -630,6 +630,20 @@ Enumerates the camera connection types. | CAMERA_CONNECTION_USB_PLUGIN | 1 | Camera connected using USB.| | CAMERA_CONNECTION_REMOTE | 2 | Remote camera.| +## HostDeviceType + +Enumerates the remote camera types. + +**System API**: This is a system API. + +**System capability**: SystemCapability.Multimedia.Camera.Core + +| Name | Value | Description | +| ---------------------------- | ---- | ------------- | +| UNKNOWN_TYPE | 0 | Unknown type. | +| PHONE | 0x0E | Camera of a smartphone.| +| TABLET | 0x11 | Camera of a tablet.| + ## CameraDevice Defines the camera device information. @@ -642,6 +656,8 @@ Defines the camera device information. | cameraPosition | [CameraPosition](#cameraposition) | Yes | Camera position. | | cameraType | [CameraType](#cameratype) | Yes | Camera type. | | connectionType | [ConnectionType](#connectiontype) | Yes | Camera connection type.| +| hostDeviceName | string | Yes | Name of the remote device.
**System API**: This is a system API.| +| hostDeviceType | [hostDeviceType](#hostdevicetype) | Yes | Type of the remote device.
**System API**: This is a system API.| ## Size @@ -1754,7 +1770,7 @@ Before the setting, you are advised to use **[getExposureBiasRange](#getexposure | Name | Type | Mandatory| Description | | -------- | -------------------------------| ---- | ------------------- | -| exposureBias | number | Yes | EV. The supported EV range can be obtained by calling **getExposureBiasRange**. If calling the API fails, an error code defined in [CameraErrorCode](#cameraerrorcode) will be returned. If the value passed is not within the supported range, the nearest critical point is used.| +| exposureBias | number | Yes | EV. The supported EV range can be obtained by calling **getExposureBiasRange**. If the value passed is not within the supported range, the nearest critical point is used. There is a step for EV. For example, if the step is 0.5 and this parameter is set to 1.2, the EV that takes effect is 1.0. If the operation fails, an error code defined in [CameraErrorCode](#cameraerrorcode) is returned. | **Error codes** @@ -1788,7 +1804,7 @@ Obtains the exposure value in use. | Type | Description | | ---------- | ----------------------------- | -| number | Exposure value obtained. If the operation fails, an error code defined in [CameraErrorCode](#cameraerrorcode) is returned.| +| number | Exposure value obtained. There is a step for EV. For example, if the step is 0.5 and this parameter is set to 1.2, the EV that takes effect is 1.0. If the operation fails, an error code defined in [CameraErrorCode](#cameraerrorcode) is returned. | **Error codes** -- GitLab