diff --git a/en/application-dev/Readme-EN.md b/en/application-dev/Readme-EN.md
index 32d357ba419d3cde2750011141449e2129133a5d..623145619dbee26958ac53e7bce4ed40e213b860 100644
--- a/en/application-dev/Readme-EN.md
+++ b/en/application-dev/Readme-EN.md
@@ -15,6 +15,7 @@
- Development Fundamentals
- [Application Package Structure Configuration File (FA Model)](quick-start/package-structure.md)
- [Application Package Structure Configuration File (Stage Model)](quick-start/stage-structure.md)
+ - [Resource File Categories](quick-start/basic-resource-file-categories.md)
- [SysCap](quick-start/syscap.md)
- Development
- [Ability Development](ability/Readme-EN.md)
@@ -42,6 +43,9 @@
- [Component Reference (TypeScript-based Declarative Development Paradigm)](reference/arkui-ts/Readme-EN.md)
- [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/Readme-EN.md)
- APIs
- - [JS and TS APIs](reference/apis/Readme-EN.md)
+ - [JS and TS APIs](reference/apis/Readme-EN.md)
+ - Native APIs
+ - [Standard Libraries](reference/native-lib/third_party_libc/musl.md)
+ - [Node_API](reference/native-lib/third_party_napi/napi.md)
- Contribution
- [How to Contribute](../contribute/documentation-contribution.md)
diff --git a/en/application-dev/ability/ability-brief.md b/en/application-dev/ability/ability-brief.md
index 187064a1c67d7bd21c823a945cca79366428d3f8..0d2303bf4f84c2ddc6f34a13d28b02a3762893b0 100644
--- a/en/application-dev/ability/ability-brief.md
+++ b/en/application-dev/ability/ability-brief.md
@@ -2,19 +2,19 @@
An ability is the abstraction of a functionality that an application can provide. It is the minimum unit for the system to schedule applications. An application can contain one or more `Ability` instances.
-The ability framework model has two forms.
+The ability framework model has two forms:
-- FA model, which applies to application development using API version 8 and earlier versions. In the FA model, there are Feature Ability (FA) and Particle Ability (PA). The FA supports Page abilities, and the PA supports Service, Data, and Form abilities.
-- Stage model, which is introduced since API version 9. In the stage model, there are Ability and ExtensionAbility. The ExtensionAbility is further extended to ServiceExtensionAbility, FormExtensionAbility, DataShareExtensionAbility, and more.
+- FA model, which applies to application development using API version 8 and earlier versions. In the FA model, there is Feature Ability (FA) and Particle Ability (PA). The FA supports Page abilities, and the PA supports Service, Data, and Form abilities.
+- Stage model, which is introduced since API version 9. In the stage model, there is `Ability` and `ExtensionAbility`. `ExtensionAbility` is further extended to `ServiceExtensionAbility`, `FormExtensionAbility`, `DataShareExtensionAbility`, and more.
The stage model is designed to make it easier to develop complex applications in the distributed environment. The table below lists the design differences between the two models.
| Item | FA Model | Stage Model |
| -------------- | ------------------------------------------------------------ | -------------------------------------------------------- |
-| Development mode | Web-like APIs are provided. The UI development is the same as that of the stage model. | Object-oriented development mode is provided. The UI development is the same as that of the FA model. |
+| Development mode | Web-like APIs are provided. The UI development is the same as that of the stage model. | Object-oriented development mode is provided. The UI development is the same as that of the FA model. |
| Engine instance | Each ability in a process exclusively uses a JS VM engine instance. | Multiple abilities in a process share one JS VM engine instance. |
| Intra-process object sharing| Not supported. | Supported. |
-| Bundle description file | The `config.json` file is used to describe the HAP and component information. Each component must use a fixed file name.| The `module.json` file is used to describe the HAP and component information. The entry file name can be specified.|
+| Bundle description file | The `config.json` file is used to describe the HAP and component information. Each component must use a fixed file name.| The `module.json5` file is used to describe the HAP and component information. The entry file name can be specified.|
| Component | Four types of components are provided: Page ability (used for UI page display), Service ability (used to provide services), Data ability (used for data sharing), and Form ability (used to provide widgets).| Two types of components are provided: Ability (used for UI page display) and Extension (scenario-based service extension). |
In addition, the following differences exist in the development process:
@@ -27,5 +27,4 @@ In addition, the following differences exist in the development process:

-
For details about the two models, see [FA Model Overview](fa-brief.md) and [Stage Model Overview](stage-brief.md).
diff --git a/en/application-dev/ability/stage-ability.md b/en/application-dev/ability/stage-ability.md
index 7f08aa3d19d29d1857e36791e7ca28ea99e62bce..19c43dcc322e08fad315341396fabfad9d99d0a1 100644
--- a/en/application-dev/ability/stage-ability.md
+++ b/en/application-dev/ability/stage-ability.md
@@ -1,6 +1,6 @@
# Ability Development
## When to Use
-Ability development in the [stage model](stage-brief.md) is significantly different from that in the FA model. The stage model requires you to declare the application package structure in the `module.json` and `app.json` files during application development. For details about the configuration file, see [Application Package Structure Configuration File](../quick-start/stage-structure.md). To develop an ability based on the stage model, implement the following logic:
+Ability development in the [stage model](stage-brief.md) is significantly different from that in the FA model. The stage model requires you to declare the application package structure in the `module.json5` and `app.json5` files during application development. For details about the configuration file, see [Application Package Structure Configuration File](../quick-start/stage-structure.md). To develop an ability based on the stage model, implement the following logic:
- Create an ability that supports screen viewing and human-machine interaction. You must implement the following scenarios: ability lifecycle callbacks, obtaining ability configuration, requesting permissions, and notifying environment changes.
- Start an ability. You need to implement ability startup on the same device, on a remote device, or with a specified UI page.
- Call abilities. For details, see [Call Development](stage-call.md).
@@ -8,7 +8,7 @@ Ability development in the [stage model](stage-brief.md) is significantly differ
- Continue the ability on another device. For details, see [Ability Continuation Development](stage-ability-continuation.md).
### Launch Type
-An ability can be launched in the **standard**, **singleton**, or **specified** mode, as configured by `launchType` in the `module.json` file. Depending on the launch type, the action performed when the ability is started differs, as described below.
+An ability can be launched in the **standard**, **singleton**, or **specified** mode, as configured by `launchType` in the `module.json5` file. Depending on the launch type, the action performed when the ability is started differs, as described below.
| Launch Type | Description |Action |
| ----------- | ------- |---------------- |
@@ -16,7 +16,7 @@ An ability can be launched in the **standard**, **singleton**, or **specified**
| singleton | Singleton | The ability has only one instance in the system. If an instance already exists when an ability is started, that instance is reused.|
| specified | Instance-specific| The internal service of an ability determines whether to create multiple instances during running.|
-By default, the singleton mode is used. The following is an example of the `module.json` file:
+By default, the singleton mode is used. The following is an example of the `module.json5` file:
```json
{
"module": {
@@ -42,6 +42,7 @@ The table below describes the APIs provided by the `AbilityStage` class, which h
The table below describes the APIs provided by the `Ability` class. For details about the APIs, see [Ability](../reference/apis/js-apis-application-ability.md).
**Table 2** Ability APIs
+
|API|Description|
|:------|:------|
|onCreate(want: Want, param: AbilityConstant.LaunchParam): void|Called when an ability is created.|
@@ -107,7 +108,10 @@ To create Page abilities for an application in the stage model, you must impleme
}
```
### Obtaining AbilityStage and Ability Configurations
-Both the `AbilityStage` and `Ability` classes have the `context` attribute. An application can obtain the context of an `Ability` instance through `this.context` to obtain the configuration details. The following example shows how an application obtains the bundle code directory, HAP file name, ability name, and system language through the `context` attribute in the `AbilityStage` class. The sample code is as follows:
+Both the `AbilityStage` and `Ability` classes have the `context` attribute. An application can obtain the context of an `Ability` instance through `this.context` to obtain the configuration details.
+
+The following example shows how an application obtains the bundle code directory, HAP file name, ability name, and system language through the `context` attribute in the `AbilityStage` class. The sample code is as follows:
+
```ts
import AbilityStage from "@ohos.application.AbilityStage"
export default class MyAbilityStage extends AbilityStage {
@@ -145,9 +149,9 @@ export default class MainAbility extends Ability {
}
```
### Requesting Permissions
-If an application needs to obtain user privacy information or use system capabilities, for example, obtaining location information or using the camera to take photos or record videos, it must request the respective permission from consumers. During application development, you need to specify the involved sensitive permissions, declare the required permissions in `module.json`, and use the `requestPermissionsFromUser` API to request the permission from consumers in the form of a dialog box. The following uses the permission for calendar access as an example.
+If an application needs to obtain user privacy information or use system capabilities, for example, obtaining location information or using the camera to take photos or record videos, it must request the respective permission from consumers. During application development, you need to specify the involved sensitive permissions, declare the required permissions in `module.json5`, and use the `requestPermissionsFromUser` API to request the permission from consumers in the form of a dialog box. The following uses the permission for calendar access as an example.
-Declare the required permission in the `module.json` file.
+Declare the required permission in the `module.json5` file.
```json
"requestPermissions": [
{
@@ -269,7 +273,7 @@ function getRemoteDeviceId() {
```
Request the permission `ohos.permission.DISTRIBUTED_DATASYNC` from consumers. This permission is used for data synchronization. For details about the sample code for requesting the permission, see [Requesting Permissions](##requesting-permissions).
### Starting an Ability with the Specified Page
-If the launch type of an ability is set to `singleton` and the ability has been started, the `onNewWant` callback rather than the `onCreate` callback is triggered when the ability is started again. You can pass start options through the `want`. For example, to start an ability with the specified page, use the `uri` or `parameters` parameter in the `want` to pass the page information. Currently, the ability in the stage model cannot directly use the `router` capability. You must pass the start options to the custom component and invoke the `router` method to display the specified page during the custom component lifecycle management. The sample code is as follows:
+If the launch type of an ability is set to `singleton` and the ability has been started, the `onNewWant` callback is triggered when the ability is started again. You can pass start options through the `want`. For example, to start an ability with the specified page, use the `uri` or `parameters` parameter in the `want` to pass the page information. Currently, the ability in the stage model cannot directly use the `router` capability. You must pass the start options to the custom component and invoke the `router` method to display the specified page during the custom component lifecycle management. The sample code is as follows:
When using `startAbility` to start an ability again, use the `uri` parameter in the `want` to pass the page information.
```ts
diff --git a/en/application-dev/ability/stage-serviceextension.md b/en/application-dev/ability/stage-serviceextension.md
index b6fc349d0902889502e10502ca850af295b2ecc0..6f83c084a783856c871848171af24e430611356d 100644
--- a/en/application-dev/ability/stage-serviceextension.md
+++ b/en/application-dev/ability/stage-serviceextension.md
@@ -61,9 +61,9 @@ OpenHarmony does not support creation of a Service Extension ability for third-p
2. Register the Service Extension ability.
- Declare the Service Extension ability in the **module.json** file by setting its **type** attribute to **service**.
+ Declare the Service Extension ability in the **module.json5** file by setting its **type** attribute to **service**.
- **module.json configuration example**
+ **module.json5 configuration example**
```json
"extensionAbilities":[{
diff --git a/en/application-dev/database/database-mdds-overview.md b/en/application-dev/database/database-mdds-overview.md
index 2262558e38e892854b4de12cf124a88569cabf84..26efa7491805e871017db3593f5fa50d947717f5 100644
--- a/en/application-dev/database/database-mdds-overview.md
+++ b/en/application-dev/database/database-mdds-overview.md
@@ -1,8 +1,12 @@
-# Distributed Data Service Overview
+# Distributed Data Service Overview
-The distributed data service \(DDS\) implements distributed database collaboration across devices for applications. Applications save data to distributed databases by calling the DDS APIs. The DDS isolates data of different applications based on a triplet of account, application, and database to ensure secure data access. The DDS synchronizes application data between trusted devices to provide users with consistent data access experience on different devices.
+The distributed data service (DDS) implements distributed database collaboration across devices for applications.
-## Basic Concepts
+Applications save data to distributed databases by calling the DDS APIs. The DDS isolates data of different applications based on a triplet of account, application, and database to ensure secure data access. The DDS synchronizes application data between trusted devices to provide users with consistent data access experience on different devices.
+
+You do not need to care about the implementation of the database locking mechanism.
+
+## Basic Concepts
- **KV data model**
@@ -54,7 +58,7 @@ The distributed data service \(DDS\) implements distributed database collaborati
The DDS provides the database backup capability. You can set **backup** to **true** to enable daily backup. If a distributed database is damaged, the DDS deletes the database and restores the most recent data from the backup database. If no backup database is available, the DDS creates one. The DDS can also back up encrypted databases.
-## Working Principles
+## Working Principles
The DDS supports distributed management of application database data in the OpenHarmony system. Data can be synchronized between multiple devices with the same account, delivering a consistent user experience across devices. The DDS consists of the following:
@@ -86,7 +90,7 @@ Applications call the DDS APIs to create, access, and subscribe to distributed d

-## Constraints
+## Constraints
- The DDS supports the KV data model only. It does not support foreign keys or triggers of the relational database.
- The KV data model specifications supported by the DDS are as follows:
diff --git a/en/application-dev/database/database-relational-guidelines.md b/en/application-dev/database/database-relational-guidelines.md
index c8ff6bc64eeccb90c131d5ac4e799b09e6293b9c..688835122445f6800d83a76fa0633b0be64f385c 100644
--- a/en/application-dev/database/database-relational-guidelines.md
+++ b/en/application-dev/database/database-relational-guidelines.md
@@ -2,7 +2,7 @@
## When to Use
-A relational database (RDB) store allows you to operate local data with or without native SQL statements based on SQLite.
+A relational database (RDB) store allows you to manage local data with or without native SQL statements based on SQLite.
## Available APIs
@@ -21,11 +21,11 @@ The table below describes the APIs available for creating and deleting an RDB st
### Managing Data in an RDB Store
-The RDB provides APIs for inserting, deleting, updating, and querying data in the local RDB store.
+The **RDB** module provides APIs for inserting, deleting, updating, and querying data in a local RDB store.
- **Inserting Data**
- The RDB provides APIs for inserting data through a **ValuesBucket** in a data table. If the data is inserted, the row ID of the data inserted will be returned; otherwise, **-1** will be returned.
+ The **RDB** module provides APIs for inserting data through a **ValuesBucket** in a data table. If the data is inserted, the row ID of the data inserted will be returned; otherwise, **-1** will be returned.
**Table 2** API for inserting data
@@ -41,7 +41,7 @@ The RDB provides APIs for inserting, deleting, updating, and querying data in th
| Class| API| Description|
| -------- | -------- | -------- |
- | RdbStore | update(values:ValuesBucket,rdbPredicates:RdbPredicates):Promise\ | Updates data based on the specified **RdbPredicates** object. This API uses a promise to return the result. Return value: number of rows updated. - **values**: data to update, which is stored in **ValuesBucket**. - **rdbPredicates**: conditions for updating data. |
+ | RdbStore | update(values:ValuesBucket,rdbPredicates:RdbPredicates):Promise\ | Updates data based on the specified **RdbPredicates** object. This API uses a promise to return the result. Return value: number of rows updated. - **values**: data to update, which is stored in **ValuesBucket**. - **rdbPredicates**: conditions for updating data.|
- **Deleting Data**
@@ -51,7 +51,7 @@ The RDB provides APIs for inserting, deleting, updating, and querying data in th
| Class| API| Description|
| -------- | -------- | -------- |
- | RdbStore | delete(rdbPredicates:RdbPredicates):Promise\ | Deletes data from the RDB store based on the specified **RdbPredicates** object. This API uses a promise to return the result. Return value: number of rows updated. - **rdbPredicates**: conditions for deleting data. |
+ | RdbStore | delete(rdbPredicates:RdbPredicates):Promise\ | Deletes data from the RDB store based on the specified **RdbPredicates** object. This API uses a promise to return the result. Return value: number of rows updated. - **rdbPredicates**: conditions for deleting data.|
- **Querying data**
@@ -69,19 +69,19 @@ The RDB provides APIs for inserting, deleting, updating, and querying data in th
### Using Predicates
-The RDB provides **RdbPredicates** for you to set database operation conditions.
+The **RDB** module provides **RdbPredicates** for you to set database operation conditions.
-The following lists common predicates. For more information about predicates, see [**RdbPredicates**](../reference/apis/js-apis-data-rdb.md#rdbpredicates).
+The table below lists common predicates. For more information about predicates, see [**RdbPredicates**](../reference/apis/js-apis-data-rdb.md#rdbpredicates).
**Table 6** APIs for using RDB store predicates
| Class| API| Description|
| -------- | -------- | -------- |
-| RdbPredicates | equalTo(field:string,value:ValueType):RdbPredicates | Sets an **RdbPredicates** to match the field with data type **ValueType** and value equal to the specified value. - **field**: column name in the database table. - **value**: value to match the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** object that matches the specified field. |
-| RdbPredicates | notEqualTo(field:string,value:ValueType):RdbPredicates | Sets an **RdbPredicates** to match the field with data type **ValueType** and value not equal to the specified value. - **field**: column name in the database table. - **value**: value to match the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** object that matches the specified field. |
-| RdbPredicates | or():RdbPredicates | Adds the OR condition to the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** with the OR condition.|
-| RdbPredicates | and():RdbPredicates | Adds the AND condition to the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** with the AND condition.|
-| RdbPredicates | contains(field:string,value:string):RdbPredicats | Sets an **RdbPredicates** to match a string that contains the specified value. - **field**: column name in the database table. - **value**: value to match the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** object that matches the specified field. |
+| RdbPredicates | equalTo(field:string,value:ValueType):RdbPredicates | Sets an **RdbPredicates** object to match the field with data type **ValueType** and value equal to the specified value. - **field**: column name in the database table. - **value**: value to match the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** object created.|
+| RdbPredicates | notEqualTo(field:string,value:ValueType):RdbPredicates | Sets an **RdbPredicates** object to match the field with data type **ValueType** and value not equal to the specified value. - **field**: column name in the database table. - **value**: value to match the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** object created.|
+| RdbPredicates | or():RdbPredicates | Adds the OR condition to the **RdbPredicates** object. - **RdbPredicates**: **RdbPredicates** with the OR condition.|
+| RdbPredicates | and():RdbPredicates | Adds the AND condition to the **RdbPredicates** object. - **RdbPredicates**: **RdbPredicates** with the AND condition.|
+| RdbPredicates | contains(field:string,value:string):RdbPredicats | Sets an **RdbPredicates** object to match a string that contains the specified value. - **field**: column name in the database table. - **value**: value to match the **RdbPredicates**. - **RdbPredicates**: **RdbPredicates** object created.|
### Using the Result Set
diff --git a/en/application-dev/database/database-relational-overview.md b/en/application-dev/database/database-relational-overview.md
index cd675b9701e9e22147833d1fb7b471f420af2f12..c78034c76f63fe1f6e8bd338f9595206f8c5eea0 100644
--- a/en/application-dev/database/database-relational-overview.md
+++ b/en/application-dev/database/database-relational-overview.md
@@ -1,42 +1,43 @@
-# RDB Overview
+# RDB Overview
-The relational database \(RDB\) manages data based on relational models. With the underlying SQLite database, the RDB provides a complete mechanism for managing local databases. To satisfy different needs in complicated scenarios, the RDB offers a series of methods for performing operations such as adding, deleting, modifying, and querying data, and supports direct execution of SQL statements.
+The relational database (RDB) manages data based on relational models. With the underlying SQLite database, the RDB provides a complete mechanism for managing local databases. To satisfy different needs in complicated scenarios, the RDB offers a series of methods for performing operations such as adding, deleting, modifying, and querying data, and supports direct execution of SQL statements.
-## Basic Concepts
+You do not need to care about the implementation of the database locking mechanism.
-- **RDB**
+## Basic concepts
- A type of database based on the relational model of data. The RDB stores data in rows and columns. An RDB is also called RDB store.
+- **RDB**
-- **Predicate**
+ A type of database created on the basis of relational models. The RDB stores data in rows and columns. A RDB is also called RDB store.
- A representation of the property or feature of a data entity, or the relationship between data entities. It is mainly used to define operation conditions.
+- **Predicate**
-- **Result set**
+ A representation of the property or feature of a data entity, or the relationship between data entities. It is mainly used to define operation conditions.
- A set of query results used to access the data. You can access the required data in a result set in flexible modes.
+- **Result set**
-- **SQLite database**
+ A set of query results used to access data. You can access the required data in a result set in flexible modes.
- A lightweight open-source relational database management system that complies with Atomicity, Consistency, Isolation, and Durability \(ACID\).
+- **SQLite database**
+ A lightweight open-source relational database management system that complies with Atomicity, Consistency, Isolation, and Durability (ACID).
-## Working Principles
+## Working Principles
-The RDB provides a common operation interface for external systems. It uses the SQLite as the underlying persistent storage engine, which supports all SQLite database features.
+The RDB provides common operation APIs for external systems. It uses the SQLite as the underlying persistent storage engine, which supports all SQLite database features.
-**Figure 1** How RDB works
-
+**Figure 1** How RDB works
-## Default Settings
+
-- The default database logging mode is write-ahead logging \(WAL\).
-- The default database flush mode is Full mode.
-- The default shared memory used by the OpenHarmony database is 2 MB.
+## Default Settings
-## Constraints
+- The default RDB logging mode is Write Ahead Log (WAL).
+- The default data flushing mode is **FULL** mode.
+- The default size of the shared memory used by an OpenHarmony database is 2 MB.
-- A maximum of four connection pools can be connected to an RDB to manage read and write operations.
+## Constraints
-- To ensure data accuracy, the RDB supports only one write operation at a time.
+- A maximum of four connection pools can be connected to an RDB to manage read and write operations.
+- To ensure data accuracy, the RDB supports only one write operation at a time.
diff --git a/en/application-dev/database/database-storage-overview.md b/en/application-dev/database/database-storage-overview.md
index 45639c75e8ad5d1b3f68c79da90fbc598af7e840..6bf3acda7d8eb9efac54b38474eeea5b2c35c4fd 100644
--- a/en/application-dev/database/database-storage-overview.md
+++ b/en/application-dev/database/database-storage-overview.md
@@ -1,31 +1,32 @@
-# Lightweight Data Store Overview
+# Lightweight Data Store Overview
-Lightweight data store is applicable to access and persistence operations on the data in key-value pairs. When an application accesses a lightweight **Storage** instance, data in the **Storage** instance will be cached in the memory for faster access. The cached data can also be written back to the text file for persistent storage. Since file read and write consume system resources, you are advised to minimize the frequency of reading and writing persistent files.
+The lightweight data store is applicable to access and persistence of data in the key-value structure.
-## Basic Concepts
+After an application obtains a lightweight store instance, the data in the instance will be cached in the memory for faster access. The cached data can also be written back to the text file for persistent storage. Since file read and write consume system resources, you are advised to minimize the frequency of reading and writing persistent files.
-- **Key-Value data structure**
+You do not need to care about the implementation of the database lock mechanism.
- A type of data structure. The key is the unique identifier for a piece of data, and the value is the specific data being identified.
+## Basic Concepts
-- **Non-relational database**
+- **Key-value structure**
- A database not in compliance with the atomicity, consistency, isolation, and durability \(ACID\) database management properties of relational data transactions. The data in a non-relational database is independent.
+ A type of data structure. The key is the unique identifier for a piece of data, and the value is the specific data being identified.
+- **Non-relational database**
-## Working Principles
+ A database not in compliance with the atomicity, consistency, isolation, and durability (ACID) properties of relational data transactions. The data in a non-relational database is independent.
-1. When an application loads data from a specified **Storage** file to a **Storage** instance, the system stores the instance in the memory through a static container. Each file of an application or process has only one **Storage** instance in the memory, till the application removes the instance from the memory or deletes the **Storage** file.
-2. When obtaining a **Storage** instance, the application can read data from or write data to the instance. The data in the **Storage** instance can be flushed to its **Storage** file by calling the **flush** or **flushSync** method.
+## Working Principles
-**Figure 1** How lightweight data store works
+1. An application can load data from a specified **Storage** file to a **Storage** instance. The system stores the instance in the memory through a static container. Each file of an application or process has only one **Storage** instance in the memory, till the application removes the instance from the memory or deletes the **Storage** file.
+2. When obtaining a **Storage** instance, the application can read data from or write data to the instance. The data in the **Storage** instance can be flushed to its **Storage** file by calling the **flush** or **flushSync** method.
+**Figure 1** Working mechanism

-## Constraints
-
-- **Storage** instances are loaded to the memory. To minimize non-memory overhead, the number of data records stored in a **Storage** instance cannot exceed 10,000. Delete the instances that are no longer used in a timely manner.
-- The key in the key-value pairs is of the string type. It cannot be empty or exceed 80 characters.
-- If the value in the key-value pairs is of the string type, it can be empty or contain a maximum of 8192 characters.
+## Constraints
+- **Storage** instances are loaded to the memory. To minimize non-memory overhead, the number of data records stored in a **Storage** instance cannot exceed 10,000. Delete the instances that are no longer used in a timely manner.
+- The key in the key-value pairs is of the string type. It cannot be empty or exceed 80 bytes.
+- The value of the string type can be empty, but cannot exceed 8192 bytes if not empty.
diff --git a/en/application-dev/device/usb-guidelines.md b/en/application-dev/device/usb-guidelines.md
index 5e3e6ba1c139a6bf5717865a040884d8ce6e40a4..e026109ca3d34b44f69d2ae4752425febbd2116c 100644
--- a/en/application-dev/device/usb-guidelines.md
+++ b/en/application-dev/device/usb-guidelines.md
@@ -16,7 +16,7 @@ The following table lists the USB APIs currently available. For details, see the
| ------------------------------------------------------------ | ------------------------------------------------------------ |
| hasRight(deviceName: string): boolean | Checks whether the user, for example, the application or system, has the device access permissions. The value **true** is returned if the user has the device access permissions; the value **false** is returned otherwise. |
| requestRight(deviceName: string): Promise\ | Requests the temporary permission for a given application to access the USB device. |
-| connectDevice(device: USBDevice): Readonly\ | Connects to the USB device based on the device information returned by **getDevices()**. |
+| connectDevice(device: USBDevice): Readonly\ | Connects to the USB device based on the device information returned by `getDevices()`. |
| getDevices(): Array> | Obtains the USB device list. |
| setConfiguration(pipe: USBDevicePipe, config: USBConfig): number | Sets the USB device configuration. |
| setInterface(pipe: USBDevicePipe, iface: USBInterface): number | Sets a USB interface. |
@@ -113,7 +113,7 @@ You can set a USB device as a host to connect to a device for data transfer. The
Claim the corresponding interface from deviceList.
interface1 must be one present in the device configuration.
*/
- usb.claimInterface(pipe , interface1, true);
+ usb.claimInterface(pipe, interface1, true);
```
4. Perform data transfer.
diff --git a/en/application-dev/media/public_sys-resources/icon-caution.gif b/en/application-dev/media/public_sys-resources/icon-caution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e90d7cfc2193e39e10bb58c38d01a23f045d571
Binary files /dev/null and b/en/application-dev/media/public_sys-resources/icon-caution.gif differ
diff --git a/en/application-dev/media/public_sys-resources/icon-danger.gif b/en/application-dev/media/public_sys-resources/icon-danger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e90d7cfc2193e39e10bb58c38d01a23f045d571
Binary files /dev/null and b/en/application-dev/media/public_sys-resources/icon-danger.gif differ
diff --git a/en/application-dev/media/public_sys-resources/icon-note.gif b/en/application-dev/media/public_sys-resources/icon-note.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6314297e45c1de184204098efd4814d6dc8b1cda
Binary files /dev/null and b/en/application-dev/media/public_sys-resources/icon-note.gif differ
diff --git a/en/application-dev/media/public_sys-resources/icon-notice.gif b/en/application-dev/media/public_sys-resources/icon-notice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..86024f61b691400bea99e5b1f506d9d9aef36e27
Binary files /dev/null and b/en/application-dev/media/public_sys-resources/icon-notice.gif differ
diff --git a/en/application-dev/media/public_sys-resources/icon-tip.gif b/en/application-dev/media/public_sys-resources/icon-tip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..93aa72053b510e456b149f36a0972703ea9999b7
Binary files /dev/null and b/en/application-dev/media/public_sys-resources/icon-tip.gif differ
diff --git a/en/application-dev/media/public_sys-resources/icon-warning.gif b/en/application-dev/media/public_sys-resources/icon-warning.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e90d7cfc2193e39e10bb58c38d01a23f045d571
Binary files /dev/null and b/en/application-dev/media/public_sys-resources/icon-warning.gif differ
diff --git a/en/application-dev/napi/Readme-EN.md b/en/application-dev/napi/Readme-EN.md
index b34a02ddc209ad3c0c4feec76bce3247fbdb5b27..280efd8afa5fa845dab0d607ed94b33e2a75e6d3 100644
--- a/en/application-dev/napi/Readme-EN.md
+++ b/en/application-dev/napi/Readme-EN.md
@@ -2,6 +2,7 @@
- [Using Native APIs in Application Projects](napi-guidelines.md)
- [Drawing Development](drawing-guidelines.md)
-- [Native Window Development](native_window-guidelines.md)
- [Raw File Development](rawfile-guidelines.md)
+- [Native Window Development](native-window-guidelines.md)
+
diff --git a/en/application-dev/napi/native_window-guidelines.md b/en/application-dev/napi/native-window-guidelines.md
similarity index 100%
rename from en/application-dev/napi/native_window-guidelines.md
rename to en/application-dev/napi/native-window-guidelines.md
diff --git a/en/application-dev/reference/apis/js-apis-brightness.md b/en/application-dev/reference/apis/js-apis-brightness.md
index 6bbea8b08a752972bcc9354b63841831ae837a88..e0b192951999cae7daba27a9f58d93e6c64af860 100644
--- a/en/application-dev/reference/apis/js-apis-brightness.md
+++ b/en/application-dev/reference/apis/js-apis-brightness.md
@@ -1,10 +1,10 @@
# Brightness
->  **NOTE**
-> The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
-
The Brightness module provides an API for setting the screen brightness.
+> **NOTE**
+>
+> The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
## Modules to Import
diff --git a/en/application-dev/reference/apis/js-apis-bytrace.md b/en/application-dev/reference/apis/js-apis-bytrace.md
index 544a4ba0d27e6c39794e063fc63282ba5455bf5e..69bc43b637e75ee32acaf67fbf12a5658cc81055 100644
--- a/en/application-dev/reference/apis/js-apis-bytrace.md
+++ b/en/application-dev/reference/apis/js-apis-bytrace.md
@@ -7,7 +7,7 @@
## Modules to Import
- ```js
+```js
import bytrace from '@ohos.bytrace';
```
@@ -23,7 +23,7 @@ Marks the start of a timeslice trace task.
>
> If multiple trace tasks with the same name need to be performed at the same time or a trace task needs to be performed multiple times concurrently, different task IDs must be specified in **startTrace**. If the trace tasks with the same name are not performed at the same time, the same taskId can be used. For details, see the bytrace.finishTrace example.
-**System capability**: SystemCapability.Developtools.Bytrace
+**System capability**: SystemCapability.HiviewDFX.HiTrace
**Parameters**
@@ -36,7 +36,7 @@ Marks the start of a timeslice trace task.
**Example**
- ```js
+```js
bytrace.startTrace("myTestFunc", 1);
bytrace.startTrace("myTestFunc", 1, 5); // The expected duration of the trace is 5 ms.
```
@@ -52,7 +52,7 @@ Marks the end of a timeslice trace task.
>
> To stop a trace task, the values of name and task ID in **finishTrace** must be the same as those in **startTrace**.
-**System capability**: SystemCapability.Developtools.Bytrace
+**System capability**: SystemCapability.HiviewDFX.HiTrace
**Parameters**
@@ -64,7 +64,7 @@ Marks the end of a timeslice trace task.
**Example**
- ```js
+```js
bytrace.finishTrace("myTestFunc", 1);
```
@@ -97,7 +97,7 @@ traceByValue(name: string, count: number): void
Defines the variable that indicates the number of timeslice trace tasks.
-**System capability**: SystemCapability.HiviewDFX.HiTrace
+**System capability**: HiviewDFX.HiTrace
**Parameters**
| Name| Type| Mandatory| Description|
@@ -107,7 +107,7 @@ Defines the variable that indicates the number of timeslice trace tasks.
**Example**
- ```js
+```js
let traceCount = 3;
bytrace.traceByValue("myTestCount", traceCount);
traceCount = 4;
diff --git a/en/application-dev/reference/apis/js-apis-data-storage.md b/en/application-dev/reference/apis/js-apis-data-storage.md
index 7b7178215ac27b121c844dfd209d1ac8b74c2331..01d064e9a3e12e2bda811a7de953cf15fea6efe7 100644
--- a/en/application-dev/reference/apis/js-apis-data-storage.md
+++ b/en/application-dev/reference/apis/js-apis-data-storage.md
@@ -54,7 +54,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
let storage = data_storage.getStorageSync(path + '/mystore');
@@ -87,7 +87,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
data_storage.getStorage(path + '/mystore', function (err, storage) {
@@ -130,7 +130,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
let getPromise = data_storage.getStorage(path + '/mystore');
@@ -166,7 +166,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
data_storage.deleteStorageSync(path + '/mystore');
@@ -197,7 +197,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
data_storage.deleteStorage(path + '/mystore', function (err) {
@@ -238,7 +238,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
let promisedelSt = data_storage.deleteStorage(path + '/mystore');
@@ -273,7 +273,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
data_storage.removeStorageFromCacheSync(path + '/mystore');
@@ -304,7 +304,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
data_storage.removeStorageFromCache(path + '/mystore', function (err) {
@@ -346,7 +346,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
});
let promiserevSt = data_storage.removeStorageFromCache(path + '/mystore')
diff --git a/en/application-dev/reference/apis/js-apis-display.md b/en/application-dev/reference/apis/js-apis-display.md
index ffbc73ff530a4d8f9ec39fd6e824760df9448644..aed3f0dfd30e05810bf103c4b04738ae4fe237f9 100644
--- a/en/application-dev/reference/apis/js-apis-display.md
+++ b/en/application-dev/reference/apis/js-apis-display.md
@@ -1,5 +1,5 @@
# Display
-Provides APIs for managing displays, such as obtaining information about the default display, obtaining information about all displays, and listening for the addition and removal of displays.
+The **Display** module provides APIs for managing displays, such as obtaining information about the default display, obtaining information about all displays, and listening for the addition and removal of displays.
> **NOTE**
>
@@ -14,11 +14,11 @@ import display from '@ohos.display';
## DisplayState
-Provides the state of a display.
+Enumerates the display states.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
-| Name| Default Value| Description|
+| Name| Value| Description|
| -------- | -------- | -------- |
| STATE_UNKNOWN | 0 | Unknown.|
| STATE_OFF | 1 | The display is shut down.|
@@ -35,163 +35,169 @@ Describes the attributes of a display.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
-| Name| Type| Readable| Writable| Description|
-| -------- | -------- | -------- | -------- | -------- |
-| id | number | Yes| No| ID of the display.|
-| name | string | Yes| No| Name of the display.|
-| alive | boolean | Yes| No| Whether the display is alive.|
-| state | [DisplayState](#displaystate) | Yes| No| State of the display.|
-| refreshRate | number | Yes| No| Refresh rate of the display.|
-| rotation | number | Yes| No| Screen rotation angle of the display.|
-| width | number | Yes| No| Width of the display, in pixels.|
-| height | number | Yes| No| Height of the display, in pixels.|
-| densityDPI | number | Yes| No| Screen density of the display, in DPI.|
-| densityPixels | number | Yes| No| Screen density of the display, in pixels.|
-| scaledDensity | number | Yes| No| Scaling factor for fonts displayed on the display.|
-| xDPI | number | Yes| No| Exact physical dots per inch of the screen in the horizontal direction.|
-| yDPI | number | Yes| No| Exact physical dots per inch of the screen in the vertical direction.|
+| Name | Type | Readable | Writable | Description |
+| ------------- | ----------------------------- | -------- | -------- | ------------------------------------------------------------ |
+| id | number | Yes | No | ID of the display. |
+| name | string | Yes | No | Name of the display. |
+| alive | boolean | Yes | No | Whether the display is alive. |
+| state | [DisplayState](#displaystate) | Yes | No | State of the display. |
+| refreshRate | number | Yes | No | Refresh rate of the display. |
+| rotation | number | Yes | No | Screen rotation angle of the display. |
+| width | number | Yes | No | Width of the display, in pixels. |
+| height | number | Yes | No | Height of the display, in pixels. |
+| densityDPI | number | Yes | No | Screen density of the display, in DPI. |
+| densityPixels | number | Yes | No | Screen density of the display, in pixels. |
+| scaledDensity | number | Yes | No | Scaling factor for fonts displayed on the display. |
+| xDPI | number | Yes | No | Exact physical dots per inch of the screen in the horizontal direction. |
+| yDPI | number | Yes | No | Exact physical dots per inch of the screen in the vertical direction. |
## display.getDefaultDisplay
getDefaultDisplay(callback: AsyncCallback<Display>): void
-Obtains the default display object.
+Obtains the default display object. This API uses an asynchronous callback to return the result.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
**Parameters**
- | Name| Type| Mandatory| Description|
- | -------- | -------- | -------- | -------- |
- | callback | AsyncCallback<[Display](#display)> | Yes| Callback used to return the default display object.|
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| callback | AsyncCallback<[Display](#display)> | Yes| Callback used to return the default display object.|
**Example**
- ```js
- var displayClass = null;
- display.getDefaultDisplay((err, data) => {
- if (err.code) {
- console.error('Failed to obtain the default display object. Code: ' + JSON.stringify(err));
- return;
- }
- console.info('Succeeded in obtaining the default display object. Data:' + JSON.stringify(data));
- displayClass = data;
- });
- ```
+
+```js
+var displayClass = null;
+display.getDefaultDisplay((err, data) => {
+ if (err.code) {
+ console.error('Failed to obtain the default display object. Code: ' + JSON.stringify(err));
+ return;
+ }
+ console.info('Succeeded in obtaining the default display object. Data:' + JSON.stringify(data));
+ displayClass = data;
+});
+```
## display.getDefaultDisplay
getDefaultDisplay(): Promise<Display>
-Obtains the default display object.
+Obtains the default display object. This API uses a promise to return the result.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
**Return value**
- | Type | Description |
- | ---------------------------------- | ---------------------------------------------- |
- | Promise<[Display](#display)> | Promise used to return the default display object.|
+| Type | Description |
+| ---------------------------------- | ---------------------------------------------- |
+| Promise<[Display](#display)> | Promise used to return the default display object.|
**Example**
- ```js
- let promise = display.getDefaultDisplay();
- promise.then(() => {
- console.log('getDefaultDisplay success');
- }).catch((err) => {
- console.log('getDefaultDisplay fail: ' + JSON.stringify(err));
- });
- ```
+```js
+var displayClass = null;
+let promise = display.getDefaultDisplay();
+promise.then((data) => {
+ displayClass = data;
+ console.info('Succeeded in obtaining the default display object. Data:' + JSON.stringify(data));
+}).catch((err) => {
+ console.error('Failed to obtain the default display object. Code: ' + JSON.stringify(err));
+});
+```
## display.getAllDisplay
getAllDisplay(callback: AsyncCallback<Array<Display>>): void
-Obtains all the display objects.
+Obtains all display objects. This API uses an asynchronous callback to return the result.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
**Parameters**
- | Name | Type | Mandatory| Description |
- | -------- | ---------------------------------------------------- | ---- | ------------------------------- |
- | callback | AsyncCallback<Array<[Display](#display)>> | Yes | Callback used to return all the display objects.|
+| Name | Type | Mandatory| Description |
+| -------- | ---------------------------------------------------- | ---- | ------------------------------- |
+| callback | AsyncCallback<Array<[Display](#display)>> | Yes | Callback used to return all the display objects.|
**Example**
- ```js
- display.getAllDisplay((err, data) => {
- if (err.code) {
- console.error('Failed to obtain all the display objects. Code: ' + JSON.stringify(err));
- return;
- }
- console.info('Succeeded in obtaining all the display objects. Data: ' + JSON.stringify(data))
- });
- ```
+```js
+display.getAllDisplay((err, data) => {
+ if (err.code) {
+ console.error('Failed to obtain all the display objects. Code: ' + JSON.stringify(err));
+ return;
+ }
+ console.info('Succeeded in obtaining all the display objects. Data: ' + JSON.stringify(data));
+});
+```
## display.getAllDisplay
getAllDisplay(): Promise<Array<Display>>
-Obtains all the display objects.
+Obtains all display objects. This API uses a promise to return the result.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
**Return value**
- | Type | Description |
- | ----------------------------------------------- | ------------------------------------------------------- |
- | Promise<Array<[Display](#display)>> | Promise used to return all the display objects.|
+| Type | Description |
+| ----------------------------------------------- | ------------------------------------------------------- |
+| Promise<Array<[Display](#display)>> | Promise used to return all the display objects.|
**Example**
- ```js
- let promise = display.getAllDisplay();
- promise.then(() => {
- console.log('getAllDisplay success');
- }).catch((err) => {
- console.log('getAllDisplay fail: ' + JSON.stringify(err));
- });
- ```
+```js
+let promise = display.getAllDisplay();
+promise.then((data) => {
+ console.info('Succeeded in obtaining all the display objects. Data: ' + JSON.stringify(data));
+}).catch((err) => {
+ console.error('Failed to obtain all the display objects. Code: ' + JSON.stringify(err));
+});
+```
## display.on('add'|'remove'|'change')
on(type: 'add'|'remove'|'change', callback: Callback<number>): void
-Enables listening.
+Subscribes to display changes.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
**Parameters**
- | Name| Type| Mandatory| Description|
- | -------- | -------- | -------- | -------- |
- | type | string | Yes| Listening type. The available values are as follows: - **add**: listening for whether a display is added - **remove**: listening for whether a display is removed - **change**: listening for whether a display is changed|
- | callback | Callback<number> | Yes| Callback used to return the ID of the display.|
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| type | string | Yes| Event type. - **add**, indicating the display addition event. - **remove**, indicating the display removal event. - **change**, indicating the display change event.|
+| callback | Callback<number> | Yes| Callback used to return the ID of the display.|
**Example**
- ```js
- var callback = (data) => {
- console.info('Listening enabled. Data: ' + JSON.stringify(data))
- }
- display.on("add", callback);
- ```
+```js
+var callback = (data) => {
+ console.info('Listening enabled. Data: ' + JSON.stringify(data))
+}
+display.on("add", callback);
+ ```
## display.off('add'|'remove'|'change')
off(type: 'add'|'remove'|'change', callback?: Callback<number>): void
-Disables listening.
+Unsubscribes from display changes.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
**Parameters**
- | Name| Type| Mandatory| Description|
- | -------- | -------- | -------- | -------- |
- | type | string | Yes| Listening type. The available values are as follows: - **add**: listening for whether a display is added - **remove**: listening for whether a display is removed - **change**: listening for whether a display is changed|
- | callback | Callback<number> | No| Callback used to return the ID of the display.|
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| type | string | Yes| Event type. - **add**, indicating the display addition event. - **remove**, indicating the display removal event. - **change**, indicating the display change event.|
+| callback | Callback<number> | No| Callback used to return the ID of the display.|
**Example**
- ```js
- display.off("remove");
- ```
+```js
+display.off("remove");
+```
diff --git a/en/application-dev/reference/apis/js-apis-featureAbility.md b/en/application-dev/reference/apis/js-apis-featureAbility.md
index 821407ada202109ab3b17e560402621ac5ae8356..cf862c2d57454b742fb42208e011efcce06029dc 100644
--- a/en/application-dev/reference/apis/js-apis-featureAbility.md
+++ b/en/application-dev/reference/apis/js-apis-featureAbility.md
@@ -138,10 +138,10 @@ Starts an ability. This API uses a callback to return the execution result when
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
import wantConstant from '@ohos.ability.wantConstant'
featureAbility.startAbilityForResult(
- {
+ {
want:
{
action: "action.system.home",
@@ -154,6 +154,9 @@ featureAbility.startAbilityForResult(
uri:""
},
},
+ (err, data) => {
+ console.info("err: " + JSON.stringify(err) + "data: " + JSON.stringify(data))
+ }
)
```
@@ -180,7 +183,7 @@ Starts an ability. This API uses a promise to return the execution result when t
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
import wantConstant from '@ohos.ability.wantConstant'
featureAbility.startAbilityForResult(
{
@@ -284,7 +287,7 @@ Destroys this Page ability, with the result code and data sent to the caller. Th
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
import wantConstant from '@ohos.ability.wantConstant'
featureAbility.terminateSelfWithResult(
{
@@ -335,7 +338,7 @@ Checks whether the main window of this ability has the focus. This API uses a ca
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
featureAbility.hasWindowFocus()
```
@@ -358,7 +361,7 @@ Checks whether the main window of this ability has the focus. This API uses a pr
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
featureAbility.hasWindowFocus().then((data) => {
console.info("==========================>hasWindowFocus=======================>");
});
@@ -383,7 +386,7 @@ Obtains the **Want** object sent from this ability. This API uses a callback to
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
featureAbility.getWant()
```
@@ -406,7 +409,7 @@ Obtains the **Want** object sent from this ability. This API uses a promise to r
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
featureAbility.getWant().then((data) => {
console.info("==========================>getWantCallBack=======================>");
});
@@ -429,7 +432,7 @@ Obtains the application context.
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
var context = featureAbility.getContext()
context.getBundleName()
```
@@ -453,7 +456,7 @@ Destroys this Page ability, with the result code and data sent to the caller. Th
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
featureAbility.terminateSelf()
```
@@ -476,7 +479,7 @@ Destroys this Page ability, with the result code and data sent to the caller. Th
**Example**
```javascript
-import featureAbility from '@ohos.ability.featureability';
+import featureAbility from '@ohos.ability.featureAbility';
featureAbility.terminateSelf().then((data) => { console.info("==========================>terminateSelfCallBack=======================>");
});
```
@@ -926,6 +929,8 @@ Enumerates operation types of the Data ability.
| action | Read-only | string | No | Action option. |
| parameters | Read-only | {[key: string]: any} | No | List of parameters in the **Want** object. |
| entities | Read-only | Array\ | No | List of entities. |
+| extensionAbilityType9+ | Read-only | bundle.ExtensionAbilityType | No | Type of the Extension ability. |
+| extensionAbilityName9+ | Read-only | string | No | Description of the Extension ability name in the **Want** object. |
## flags
diff --git a/en/application-dev/reference/apis/js-apis-hilog.md b/en/application-dev/reference/apis/js-apis-hilog.md
index 4d45271a8791a8370ed4950c75ac96c0fb408b8c..fd44ed62b3e67dfac8c3fa44f0f23485e2eeff5d 100644
--- a/en/application-dev/reference/apis/js-apis-hilog.md
+++ b/en/application-dev/reference/apis/js-apis-hilog.md
@@ -1,6 +1,6 @@
# HiLog
-The HiLog subsystem allows your applications or services to output logs based on the specified type, level, and format string. Such logs help you learn the running status of applications and better debug programs.
+The HiLog module allows your applications or services to output logs based on the specified type, level, and format string. Such logs help you learn the running status of applications and better debug programs.
> **NOTE**
> The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
@@ -23,8 +23,8 @@ Checks whether logs are printable based on the specified service domain, log tag
| Name| Type | Mandatory| Description |
| ------ | --------------------- | ---- | ------------------------------------------------------------ |
-| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
-| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
+| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
+| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
| level | [LogLevel](#loglevel) | Yes | Log level. |
**Return value**
@@ -48,7 +48,7 @@ Enumerates the log levels.
| Name | Default Value| Description |
| ----- | ------ | ------------------------------------------------------------ |
| DEBUG | 3 | Log level used to record more detailed process information than INFO logs to help developers analyze service processes and locate faults.|
-| INFO | 4 | Log level used to record key service process nodes and exceptions that occur during service running, for example, no network signal or login failure. These logs should be recorded by the dominant module in the service to avoid repeated logging conducted by multiple invoked modules or low-level functions.|
+| INFO | 4 | Log level used to record key service process nodes and exceptions that occur during service running, for example, no network signal or login failure. These logs should be recorded by the dominant module in the service to avoid repeated logging conducted by multiple invoked modules or low-level functions.|
| WARN | 5 | Log level used to record severe, unexpected faults that have little impact on users and can be rectified by the programs themselves or through simple operations.|
| ERROR | 6 | Log level used to record program or functional errors that affect the normal running or use of the functionality and can be fixed at a high cost, for example, by resetting data.|
| FATAL | 7 | Log level used to record program or functionality crashes that cannot be rectified. |
@@ -67,8 +67,8 @@ DEBUG logs are not recorded in official versions by default. They are available
| Name| Type | Mandatory| Description |
| ------ | ------ | ---- | ------------------------------------------------------------ |
-| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
-| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
+| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
+| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
| format | string | Yes | Format string used to output logs in a specified format. It can contain several parameters, where the parameter type and privacy identifier are mandatory. Parameters labeled **{public}** are public data and are displayed in plaintext; parameters labeled **{private}** (default value) are private data and are filtered by ****.|
| args | any[] | Yes | Variable-length parameter list corresponding to the format string. The number and type of parameters must map to the identifier in the format string.|
@@ -98,8 +98,8 @@ Prints INFO logs.
| Name| Type | Mandatory| Description |
| ------ | ------ | ---- | ------------------------------------------------------------ |
-| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
-| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
+| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
+| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
| format | string | Yes | Format string used to output logs in a specified format. It can contain several parameters, where the parameter type and privacy identifier are mandatory. Parameters labeled **{public}** are public data and are displayed in plaintext; parameters labeled **{private}** (default value) are private data and are filtered by ****.|
| args | any[] | Yes | Variable-length parameter list corresponding to the format string. The number and type of parameters must map to the identifier in the format string.|
@@ -129,8 +129,8 @@ Prints WARN logs.
| Name| Type | Mandatory| Description |
| ------ | ------ | ---- | ------------------------------------------------------------ |
-| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
-| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
+| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
+| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
| format | string | Yes | Format string used to output logs in a specified format. It can contain several parameters, where the parameter type and privacy identifier are mandatory. Parameters labeled **{public}** are public data and are displayed in plaintext; parameters labeled **{private}** (default value) are private data and are filtered by ****.|
| args | any[] | Yes | Variable-length parameter list corresponding to the format string. The number and type of parameters must map to the identifier in the format string.|
@@ -160,8 +160,8 @@ Prints ERROR logs.
| Name| Type | Mandatory| Description |
| ------ | ------ | ---- | ------------------------------------------------------------ |
-| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
-| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
+| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
+| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
| format | string | Yes | Format string used to output logs in a specified format. It can contain several parameters, where the parameter type and privacy identifier are mandatory. Parameters labeled **{public}** are public data and are displayed in plaintext; parameters labeled **{private}** (default value) are private data and are filtered by ****.|
| args | any[] | Yes | Variable-length parameter list corresponding to the format string. The number and type of parameters must map to the identifier in the format string.|
@@ -191,8 +191,8 @@ Prints FATAL logs.
| Name| Type | Mandatory| Description |
| ------ | ------ | ---- | ------------------------------------------------------------ |
-| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
-| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
+| domain | number | Yes | Service domain of logs. The value ranges from **0x0** to **0xFFFF**. You can define the value as required.|
+| tag | string | Yes | Log tag in the string format. You are advised to use this parameter to identify a particular service behavior or the class holding the ongoing method.|
| format | string | Yes | Format string used to output logs in a specified format. It can contain several parameters, where the parameter type and privacy identifier are mandatory. Parameters labeled **{public}** are public data and are displayed in plaintext; parameters labeled **{private}** (default value) are private data and are filtered by ****.|
| args | any[] | Yes | Variable-length parameter list corresponding to the format string. The number and type of parameters must map to the identifier in the format string.|
diff --git a/en/application-dev/reference/apis/js-apis-hitracemeter.md b/en/application-dev/reference/apis/js-apis-hitracemeter.md
index e856ee20a4c8956ff0f05707b596935b68ca9e7a..04a9db2a0e7bc00cb9ff8a017eb6e39c47d97f30 100644
--- a/en/application-dev/reference/apis/js-apis-hitracemeter.md
+++ b/en/application-dev/reference/apis/js-apis-hitracemeter.md
@@ -1,8 +1,9 @@
# Performance Tracing
-This module provides the functions of tracing service processes and monitoring the system performance. It provides the data needed for hiTraceMeter to carry out performance analysis.
+The Performance Tracing module provides the functions of tracing service processes and monitoring the system performance. It provides the data needed for hiTraceMeter to carry out performance analysis.
->  **NOTE**
+> **NOTE**
+>
> The initial APIs of this module are supported since API version 8. Newly added APIs will be marked with a superscript to indicate their earliest API version.
@@ -17,7 +18,7 @@ import hiTraceMeter from '@ohos.hiTraceMeter';
startTrace(name: string, taskId: number): void
-Starts a trace task. **expectedTime** is an optional parameter, which specifies the expected duration of the trace.
+Starts a trace task.
If multiple trace tasks with the same name need to be performed at the same time or a trace task needs to be performed multiple times concurrently, different task IDs must be specified in **startTrace**.
diff --git a/en/application-dev/reference/apis/js-apis-logs.md b/en/application-dev/reference/apis/js-apis-logs.md
index e2d0aff5a5eec1f468b0511a08f1f593a9af3548..a1e0786bda3cae69131a317ac6d61db35d0652c0 100644
--- a/en/application-dev/reference/apis/js-apis-logs.md
+++ b/en/application-dev/reference/apis/js-apis-logs.md
@@ -1,30 +1,42 @@
# Log
->  **NOTE**
-> The APIs of this module are no longer maintained since API version 7. You are advised to use ['@ohos.hilog](js-apis-hilog.md)' instead.
+The Log module provides basic log printing capabilities and supports log printing by log level.
-## console.debug
-
-debug(message: string): void
+If you want to use more advanced log printing services, for example, filtering logs by the specified ID, you are advised to use [`@ohos.hilog`](js-apis-hilog.md).
-Prints debug logs.
-
-- Parameters
- | Name | Type | Mandatory | Description |
- | ------- | ------ | ---- | ----------- |
- | message | string | Yes | Text to print.|
+> **NOTE**
+>
+> The initial APIs of this module are supported since API version 3. Newly added APIs will be marked with a superscript to indicate their earliest API version.
## console.log
log(message: string): void
-Prints debug logs.
+Prints logs.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
-- Parameters
- | Name | Type | Mandatory | Description |
- | ------- | ------ | ---- | ----------- |
- | message | string | Yes | Text to print.|
+| Name | Type | Mandatory | Description |
+| ------- | ------ | ---- | ----------- |
+| message | string | Yes | Text to print.|
+
+
+## console.debug
+
+debug(message: string): void
+
+Prints debug-level logs.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
+
+| Name | Type | Mandatory | Description |
+| ------- | ------ | ---- | ----------- |
+| message | string | Yes | Text to print.|
## console.info
@@ -33,10 +45,13 @@ info(message: string): void
Prints info-level logs.
-- Parameters
- | Name | Type | Mandatory | Description |
- | ------- | ------ | ---- | ----------- |
- | message | string | Yes | Text to print.|
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
+
+| Name | Type | Mandatory | Description |
+| ------- | ------ | ---- | ----------- |
+| message | string | Yes | Text to print.|
## console.warn
@@ -45,10 +60,13 @@ warn(message: string): void
Prints warn-level logs.
-- Parameters
- | Name | Type | Mandatory | Description |
- | ------- | ------ | ---- | ----------- |
- | message | string | Yes | Text to print.|
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
+
+| Name | Type | Mandatory | Description |
+| ------- | ------ | ---- | ----------- |
+| message | string | Yes | Text to print.|
## console.error
@@ -57,10 +75,13 @@ error(message: string): void
Prints error-level logs.
-- Parameters
- | Name | Type | Mandatory | Description |
- | ------- | ------ | ---- | ----------- |
- | message | string | Yes | Text to print.|
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
+
+| Name | Type | Mandatory | Description |
+| ------- | ------ | ---- | ----------- |
+| message | string | Yes | Text to print.|
## Example
diff --git a/en/application-dev/reference/apis/js-apis-mediaquery.md b/en/application-dev/reference/apis/js-apis-mediaquery.md
index 60892cd01ff976bbbfded7b948c9ff0462919560..2adc09bf03b7dc3f818443eaf0f7ca56abc3439d 100644
--- a/en/application-dev/reference/apis/js-apis-mediaquery.md
+++ b/en/application-dev/reference/apis/js-apis-mediaquery.md
@@ -26,6 +26,7 @@ Sets the media query criteria and returns the corresponding listening handle.
**System capability**: SystemCapability.ArkUI.ArkUI.Full
**Parameters**
+
| Name | Type | Mandatory | Description |
| --------- | ------ | ---- | ---------------------------------------- |
| condition | string | Yes | Matching condition of a media event. For details, see [Syntax of Media Query Conditions](../../ui/ui-ts-layout-mediaquery.md#syntax-of-media-query-conditions).|
@@ -37,7 +38,7 @@ Sets the media query criteria and returns the corresponding listening handle.
**Example**
```js
-listener = mediaquery.matchMediaSync('(orientation: landscape)'); // Listen for landscape events.
+let listener = mediaquery.matchMediaSync('(orientation: landscape)'); // Listen for landscape events.
```
@@ -66,7 +67,7 @@ Registers a callback with the corresponding query condition by using the handle.
**Parameters**
| Name | Type | Mandatory | Description |
| -------- | -------------------------------- | ---- | ---------------- |
-| type | string | Yes | Must enter the string **'change'**.|
+| type | string | Yes | Must enter the string **change**.|
| callback | Callback<MediaQueryResult> | Yes | Callback registered with media query. |
**Example**
@@ -88,7 +89,7 @@ Deregisters a callback with the corresponding query condition by using the handl
| callback | Callback<MediaQueryResult> | No | Callback to be deregistered. If the default value is used, all callbacks of the handle are deregistered.|
**Example**
- ```js
+ ```ts
import mediaquery from '@ohos.mediaquery'
let listener = mediaquery.matchMediaSync('(orientation: landscape)'); // Listen for landscape events.
@@ -117,10 +118,9 @@ Deregisters a callback with the corresponding query condition by using the handl
### Example
-```js
+```ts
import mediaquery from '@ohos.mediaquery'
-let portraitFunc = null
@Entry
@Component
@@ -140,7 +140,7 @@ struct MediaQueryExample {
}
aboutToAppear() {
- portraitFunc = this.onPortrait.bind(this) //bind current js instance
+ let portraitFunc = this.onPortrait.bind(this) // Bind the current JS instance.
this.listener.on('change', portraitFunc)
}
diff --git a/en/application-dev/reference/apis/js-apis-sensor.md b/en/application-dev/reference/apis/js-apis-sensor.md
index b8d487b4af7a528f8474d60e60a3ae828ea10d6c..d9278e34142be1721540537d4d879c95806f49c4 100644
--- a/en/application-dev/reference/apis/js-apis-sensor.md
+++ b/en/application-dev/reference/apis/js-apis-sensor.md
@@ -1,6 +1,5 @@
# Sensor
-
> **NOTE**
>
> The initial APIs of this module are supported since API version 8. Newly added APIs will be marked with a superscript to indicate their earliest API version.
@@ -1351,8 +1350,6 @@ off(type: SensorType.SENSOR_TYPE_ID_HUMIDITY, callback?: Callback<HumidityRes
Unsubscribes from sensor data changes.
-**Required permissions**: ohos.permission.READ_HEALTH_DATA (a system permission)
-
**System capability**: SystemCapability.Sensors.Sensor
**Parameters**
@@ -1405,8 +1402,6 @@ sensor.off(sensor.SensorType.SENSOR_TYPE_ID_LINEAR_ACCELERATION, callback);
Unsubscribes from sensor data changes.
-**Required permissions**: ohos.permission.ACCELEROMETER (a system permission)
-
**System capability**: SystemCapability.Sensors.Sensor
**Parameters**
@@ -1488,6 +1483,8 @@ off(type: SensorType.SENSOR_TYPE_ID_PEDOMETER, callback?: Callback<PedometerR
Unsubscribes from sensor data changes.
+**Required permissions**: ohos.permission.ACTIVITY_MOTION
+
**System capability**: SystemCapability.Sensors.Sensor
**Parameters**
@@ -1718,7 +1715,7 @@ sensor.getGeomagneticField({latitude:80, longitude:0, altitude:0}, 1580486400000
console.error('Operation failed. Error code: ' + err.code + '; message: ' + err.message);
return;
}
- console.info('sensor_getGeomagneticField_promise x: ' + data.x + ',y: ' + data.y + ',z: ' +
+ console.info('sensor_getGeomagneticField_callback x: ' + data.x + ',y: ' + data.y + ',z: ' +
data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle +
',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity);
});
@@ -1900,7 +1897,6 @@ Obtains the angle change between two rotation matrices. This API uses a callback
err.message);
return;
}
- console.info("SensorJsAPI--->Successed to get getAngleModifiy interface get data: " + data.x);
for (var i=0; i < data.length; i++) {
console.info("data[" + i + "]: " + data[i]);
}
@@ -1968,7 +1964,6 @@ Converts a rotation vector into a rotation matrix. This API uses a callback to r
err.message);
return;
}
- console.info("SensorJsAPI--->Successed to get createRotationMatrix interface get data: " + data.x);
for (var i=0; i < data.length; i++) {
console.info("data[" + i + "]: " + data[i]);
}
@@ -2035,7 +2030,6 @@ Converts a rotation vector into a quaternion. This API uses a callback to return
err.message);
return;
}
- console.info("SensorJsAPI--->Successed to get createQuaternion interface get data: " + data.x);
for (var i=0; i < data.length; i++) {
console.info("data[" + i + "]: " + data[i]);
}
@@ -2102,7 +2096,6 @@ Obtains the device direction based on the rotation matrix. This API uses a callb
err.message);
return;
}
- console.info("SensorJsAPI--->Successed to get getDirection interface get data: " + data);
for (var i = 1; i < data.length; i++) {
console.info("sensor_getDirection_callback" + data[i]);
}
@@ -2170,7 +2163,6 @@ Creates a rotation matrix based on the gravity vector and geomagnetic vector. Th
err.message);
return;
}
- console.info("SensorJsAPI--->Successed to get createRotationMatrix interface get data: " + data.x);
for (var i=0; i < data.rotation.length; i++) {
console.info("data[" + i + "]: " + data[i])
}
@@ -2419,9 +2411,9 @@ Describes the Hall effect sensor data. It extends from [Response](#response).
**System capability**: SystemCapability.Sensors.Sensor
-| Name | Type | Readable | Writable | Description |
-| ------ | ------ | ---- | ---- | --------------------------------- |
-| status | number | Yes | Yes | Hall effect sensor status. This parameter specifies whether a magnetic field exists around a device. The value **0** means that a magnetic field exists around the device, and **1** means the opposite.|
+| Name | Type| Readable| Writable| Description |
+| ------ | -------- | ---- | ---- | ------------------------------------------------------------ |
+| status | number | Yes | Yes | Hall effect sensor status. This parameter specifies whether a magnetic field exists around a device. The value **0** means that a magnetic field does not exist, and a value greater than **0** means the opposite.|
## MagneticFieldResponse
diff --git a/en/application-dev/reference/apis/js-apis-system-battery.md b/en/application-dev/reference/apis/js-apis-system-battery.md
index 7b577c8ee81c733cdb1aa1f2ccfcced87829f304..5ec8dacc2ed7a88010e2156b6f82be3a4f9557e2 100644
--- a/en/application-dev/reference/apis/js-apis-system-battery.md
+++ b/en/application-dev/reference/apis/js-apis-system-battery.md
@@ -1,7 +1,7 @@
# Battery Level
->  **NOTE**
-> - The APIs of this module are no longer maintained since API version 7. It is recommended that you use [`@ohos.batteryInfo`](js-apis-battery-info.md) instead.
+> **NOTE**
+> - The APIs of this module are no longer maintained since API version 6. You are advised to use [`@ohos.batteryInfo`](js-apis-battery-info.md).
>
> - The initial APIs of this module are supported since API version 3. Newly added APIs will be marked with a superscript to indicate their earliest API version.
@@ -22,20 +22,13 @@ Obtains the current charging state and battery level.
**System capability**: SystemCapability.PowerManager.BatteryManager.Core
-**Parameter**
+**Parameters**
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
| -------- | -------- | -------- | -------- |
-| success | Function | No | Called when the check result is obtained |
-| fail | Function | No | Called when the check result fails to be obtained |
-| complete | Function | No | Called when the execution is complete |
-
-The following value will be returned when the check result is obtained.
-
-| Name | Type | Description |
-| -------- | -------- | -------- |
-| charging | boolean | Whether the battery is being charged |
-| level | number | Current battery level, which ranges from 0.00 to 1.00. |
+| success | (data: [BatteryResponse](#batteryresponse)) => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
**Example**
@@ -52,4 +45,11 @@ export default {
});
},
}
-```
\ No newline at end of file
+```
+
+## BatteryResponse
+
+| Name| Type| Description|
+| -------- | -------- | -------- |
+| charging | boolean | Whether the battery is being charged.|
+| level | number | Current battery level, which ranges from **0.00** to **1.00**.|
diff --git a/en/application-dev/reference/apis/js-apis-system-brightness.md b/en/application-dev/reference/apis/js-apis-system-brightness.md
index 3b1731b865d28bab4708e8613e6969529ed21cb9..9efb0b0a3b3a4aa3103204b1b41b273bae8398f3 100644
--- a/en/application-dev/reference/apis/js-apis-system-brightness.md
+++ b/en/application-dev/reference/apis/js-apis-system-brightness.md
@@ -1,7 +1,7 @@
# Screen Brightness
->  **Note:**
-> - The APIs of this module are no longer maintained since API version 7. It is recommended that you use [`@ohos.brightness`](js-apis-brightness.md) instead.
+> **NOTE**
+> - The APIs of this module are no longer maintained since API version 7. You are advised to use [`@ohos.brightness`](js-apis-brightness.md).
>
> - The initial APIs of this module are supported since API version 3. Newly added APIs will be marked with a superscript to indicate their earliest API version.
@@ -24,34 +24,35 @@ Obtains the current screen brightness.
**Parameters**
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
| -------- | -------- | -------- | -------- |
-| success | Function | No | Called when the execution is successful. |
-| fail | Function | No | Called when the operation fails. |
-| complete | Function | No | Called when the execution is complete |
+| success | (data: [BrightnessResponse](#brightnessresponse)) => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
-The following values will be returned when the operation is successful.
+**Return value of success()**
-| Name | Type | Description |
+| Name| Type| Description|
| -------- | -------- | -------- |
-| value | number | Screen brightness, which ranges from 1 to 255. |
+| value | number | Screen brightness. The value is an integer ranging from **1** to **255**.|
+
**Example**
-```js
-export default {
- getValue() {
- brightness.getValue({
- success: function(data){
- console.log('success get brightness value:' + data.value);
- },
- fail: function(data, code) {
- console.log('get brightness fail, code: ' + code + ', data: ' + data);
- },
- });
- },
-}
-```
+ ```js
+ export default {
+ getValue() {
+ brightness.getValue({
+ success: function(data){
+ console.log('success get brightness value:' + data.value);
+ },
+ fail: function(data, code) {
+ console.log('get brightness fail, code: ' + code + ', data: ' + data);
+ },
+ });
+ },
+ }
+ ```
## brightness.setValue
@@ -64,30 +65,30 @@ Sets the screen brightness.
**Parameters**
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
| -------- | -------- | -------- | -------- |
-| value | number | Yes | Screen brightness. The value is an integer ranging from 1 to 255. - If the value is less than or equal to **0**, value **1** will be used. - If the value is greater than **255**, value **255** will be used. - If the value contains decimals, the integral part of the value will be used. For example, if value **8.1** is set, value **8** will be used. |
-| success | Function | No | Called when the execution is successful. |
-| fail | Function | No | Called when the operation fails. |
-| complete | Function | No | Called when the execution is complete. |
+| value | number | Yes| Screen brightness. The value is an integer ranging from **1** to **255**. - If the value is less than or equal to **0**, value **1** will be used. - If the value is greater than **255**, value **255** will be used. - If the value contains decimals, the integral part of the value will be used. For example, if value **8.1** is set, value **8** will be used.|
+| success | () => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
**Example**
-```js
-export default {
- setValue() {
- brightness.setValue({
- value: 100,
- success: function(){
- console.log('handling set brightness success.');
- },
- fail: function(data, code){
- console.log('handling set brightness value fail, code:' + code + ', data: ' + data);
- },
- });
- },
-}
-```
+ ```js
+ export default {
+ setValue() {
+ brightness.setValue({
+ value: 100,
+ success: function(){
+ console.log('handling set brightness success.');
+ },
+ fail: function(data, code){
+ console.log('handling set brightness value fail, code:' + code + ', data: ' + data);
+ },
+ });
+ },
+ }
+ ```
## brightness.getMode
@@ -100,34 +101,34 @@ Obtains the screen brightness adjustment mode.
**Parameters**
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
| -------- | -------- | -------- | -------- |
-| success | Function | No | Called when the execution is successful. |
-| fail | Function | No | Called when the operation fails. |
-| complete | Function | No | Called when the execution is complete |
+| success | (data: [BrightnessModeResponse](#brightnessmoderesponse)) => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
-The following values will be returned when the operation is successful.
+**Return value of success()**
-| Name | Type | Description |
+| Name| Type| Description|
| -------- | -------- | -------- |
-| mode | number | The value can be **0** or **1**. - **0**: The screen brightness is manually adjusted. - **1**: The screen brightness is automatically adjusted. |
+| mode | number | The value can be **0** or **1**. - **0**: manual adjustment - **1**: automatic adjustment|
**Example**
-```js
-export default {
- getMode() {
- brightness.getMode({
- success: function(data){
- console.log('success get mode:' + data.mode);
- },
- fail: function(data, code){
- console.log('handling get mode fail, code:' + code + ', data: ' + data);
- },
- });
- },
-}
-```
+ ```js
+ export default {
+ getMode() {
+ brightness.getMode({
+ success: function(data){
+ console.log('success get mode:' + data.mode);
+ },
+ fail: function(data, code){
+ console.log('handling get mode fail, code:' + code + ', data: ' + data);
+ },
+ });
+ },
+ }
+ ```
## brightness.setMode
@@ -139,31 +140,30 @@ Sets the screen brightness adjustment mode.
**System capability**: SystemCapability.PowerManager.DisplayPowerManager
**Parameters**
-
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
| -------- | -------- | -------- | -------- |
-| mode | number | Yes | The value can be **0** or **1**. - **0**: The screen brightness is manually adjusted. - **1**: The screen brightness is automatically adjusted. |
-| success | Function | No | Called when the execution is successful. |
-| fail | Function | No | Called when the operation fails. |
-| complete | Function | No | Called when the execution is complete. |
+| mode | number | Yes| The value can be **0** or **1**. - **0**: manual adjustment - **1**: automatic adjustment|
+| success | () => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
**Example**
-```js
-export default {
- setMode() {
- brightness.setMode({
- mode: 1,
- success: function(){
- console.log('handling set mode success.');
- },
- fail: function(data, code){
- console.log('handling set mode fail, code:' + code + ', data: ' + data);
- },
- });
- },
-}
-```
+ ```js
+ export default {
+ setMode() {
+ brightness.setMode({
+ mode: 1,
+ success: function(){
+ console.log('handling set mode success.');
+ },
+ fail: function(data, code){
+ console.log('handling set mode fail, code:' + code + ', data: ' + data);
+ },
+ });
+ },
+ }
+ ```
## brightness.setKeepScreenOn
@@ -175,28 +175,40 @@ Sets whether to always keep the screen on. Call this API in **onShow()**.
**System capability**: SystemCapability.PowerManager.DisplayPowerManager
**Parameters**
-
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
| -------- | -------- | -------- | -------- |
-| keepScreenOn | boolean | Yes | Whether to always keep the screen on |
-| success | Function | No | Called when the execution is successful. |
-| fail | Function | No | Called when the operation fails. |
-| complete | Function | No | Called when the execution is complete. |
+| keepScreenOn | boolean | Yes| Whether to keep the screen on.|
+| success | () => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
**Example**
-```js
-export default {
- setKeepScreenOn() {
- brightness.setKeepScreenOn({
- keepScreenOn: true,
- success: function () {
- console.log('handling set keep screen on success.')
- },
- fail: function (data, code) {
- console.log('handling set keep screen on fail, code:' + code + ', data: ' + data);
- },
- });
- },
-}
-```
\ No newline at end of file
+ ```js
+ export default {
+ setKeepScreenOn() {
+ brightness.setKeepScreenOn({
+ keepScreenOn: true,
+ success: function () {
+ console.log('handling set keep screen on success.')
+ },
+ fail: function (data, code) {
+ console.log('handling set keep screen on fail, code:' + code + ', data: ' + data);
+ },
+ });
+ },
+ }
+ ```
+##
+
+## BrightnessResponse
+
+| Name| Type | Description|
+| -------- | -------- | -------- |
+| value | number | Screen brightness. The value is an integer ranging from **1** to **255**.|
+
+## BrightnessModeResponse
+
+| Name| Type | Description|
+| -------- | -------- | -------- |
+| mode | number | The value can be **0** or **1**. - **0**: manual adjustment - **0**: manual adjustment|
diff --git a/en/application-dev/reference/apis/js-apis-timer.md b/en/application-dev/reference/apis/js-apis-timer.md
index f9e174b5147370f465e140d03aeba6b3802380a0..cf8ca596bd72517835c6bd277c0bf29ebf2b7213 100644
--- a/en/application-dev/reference/apis/js-apis-timer.md
+++ b/en/application-dev/reference/apis/js-apis-timer.md
@@ -1,5 +1,10 @@
# Timer
+The **Timer** module provides basic timer capabilities. You can use the APIs of this module to execute functions at the specified time.
+
+> **NOTE**
+>
+> The initial APIs of this module are supported since API version 3. Newly added APIs will be marked with a superscript to indicate their earliest API version.
## setTimeout
@@ -7,6 +12,8 @@ setTimeout(handler[,delay[,…args]]): number
Sets a timer for the system to call a function after the timer goes off.
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
**Parameters**
| Name| Type| Mandatory| Description|
@@ -23,15 +30,15 @@ Sets a timer for the system to call a function after the timer goes off.
**Example**
-```js
-export default {
- setTimeOut() {
- var timeoutID = setTimeout(function() {
- console.log('delay 1s');
- }, 1000);
+ ```js
+ export default {
+ setTimeOut() {
+ var timeoutID = setTimeout(function() {
+ console.log('delay 1s');
+ }, 1000);
+ }
}
-}
-```
+ ```
## clearTimeout
@@ -40,6 +47,8 @@ clearTimeout(timeoutID: number): void
Cancels the timer created via **setTimeout()**.
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
**Parameters**
| Name| Type| Mandatory| Description|
@@ -48,16 +57,16 @@ Cancels the timer created via **setTimeout()**.
**Example**
-```js
-export default {
- clearTimeOut() {
- var timeoutID = setTimeout(function() {
- console.log('do after 1s delay.');
- }, 1000);
- clearTimeout(timeoutID);
+ ```js
+ export default {
+ clearTimeOut() {
+ var timeoutID = setTimeout(function() {
+ console.log('do after 1s delay.');
+ }, 1000);
+ clearTimeout(timeoutID);
+ }
}
-}
-```
+ ```
## setInterval
@@ -66,6 +75,8 @@ setInterval(handler[, delay[, ...args]]): number
Sets a repeating timer for the system to repeatedly call a function at a fixed interval.
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
**Parameters**
| Name| Type| Mandatory| Description|
@@ -82,15 +93,15 @@ Sets a repeating timer for the system to repeatedly call a function at a fixed i
**Example**
-```js
-export default {
- setInterval() {
- var intervalID = setInterval(function() {
- console.log('do very 1s.');
- }, 1000);
+ ```js
+ export default {
+ setInterval() {
+ var intervalID = setInterval(function() {
+ console.log('do very 1s.');
+ }, 1000);
+ }
}
-}
-```
+ ```
## clearInterval
@@ -99,6 +110,8 @@ clearInterval(intervalID: number): void
Cancels the repeating timer set via **setInterval()**.
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
**Parameters**
| Name| Type| Mandatory| Description|
@@ -107,13 +120,13 @@ Cancels the repeating timer set via **setInterval()**.
**Example**
-```js
-export default {
- clearInterval() {
- var intervalID = setInterval(function() {
- console.log('do very 1s.');
- }, 1000);
- clearInterval(intervalID);
+ ```js
+ export default {
+ clearInterval() {
+ var intervalID = setInterval(function() {
+ console.log('do very 1s.');
+ }, 1000);
+ clearInterval(intervalID);
+ }
}
-}
-```
\ No newline at end of file
+ ```
diff --git a/en/application-dev/reference/apis/js-apis-window.md b/en/application-dev/reference/apis/js-apis-window.md
index f73e6f6315b4a18a2dee70d9d5a9a8f0c0e14c90..cf1052ae97ef878030e348cea83f8388092fbde2 100644
--- a/en/application-dev/reference/apis/js-apis-window.md
+++ b/en/application-dev/reference/apis/js-apis-window.md
@@ -10,7 +10,6 @@ This module provides the following common window-related functions:
>
> The initial APIs of this module are supported since API version 6. Newly added APIs will be marked with a superscript to indicate their earliest API version.
-
## Modules to Import
```js
@@ -35,10 +34,10 @@ Enumerates the types of the area where the window cannot be displayed.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
-| Name | Value | Description |
-| ----------- | ---- | ------------------ |
-| TYPE_SYSTEM | 0 | Default area of the system.|
-| TYPE_CUTOUT | 1 | Notch. |
+| Name | Value | Description |
+|----------------------------------|-----| ----------------- |
+| TYPE_SYSTEM | 0 | Default area of the system.|
+| TYPE_CUTOUT | 1 | Notch. |
## WindowMode7+
@@ -64,11 +63,11 @@ Describes the properties of the status bar and navigation bar.
| Name | Type| Readable| Writable| Description |
| -------------------------------------- | -------- | ---- | ---- | ------------------------------------------------------------ |
-| statusBarColor | string | Yes | Yes | Background color of the status bar. The value is a hexadecimal RGB or aRGB color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
+| statusBarColor | string | No | Yes | Background color of the status bar. The value is a hexadecimal RGB or aRGB color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
| isStatusBarLightIcon7+ | boolean | No | Yes | Whether any icon on the status bar is highlighted. |
| statusBarContentColor8+ | string | No | Yes | Color of the text on the status bar. |
-| navigationBarColor | string | Yes | Yes | Background color of the navigation bar. The value is a hexadecimal RGB or aRGB color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
-| isNavigationBarLightIcon7+ | boolean | No | No | Whether any icon on the navigation bar is highlighted. |
+| navigationBarColor | string | No | Yes | Background color of the navigation bar. The value is a hexadecimal RGB or aRGB color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
+| isNavigationBarLightIcon7+ | boolean | No | Yes | Whether any icon on the navigation bar is highlighted. |
| navigationBarContentColor8+ | string | No | Yes | Color of the text on the navigation bar. |
## SystemBarRegionTint8+
@@ -81,11 +80,11 @@ Describes the callback for a single system bar.
| Name | Type | Readable| Writable| Description |
| --------------- | ------------------------- | ---- | ---- | ------------------------------------------------------------ |
-| type | [WindowType](#windowtype) | Yes | Yes | Type of the system bar whose properties are changed. Only the status bar and navigation bar are supported.|
-| isEnable | boolean | Yes | Yes | Whether the system bar is displayed. |
-| region | [Rect](#rect) | Yes | Yes | Current position and size of the system bar. |
-| backgroundColor | string | Yes | Yes | Background color of the system bar. The value is a hexadecimal RGB or aRGB color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
-| contentColor | string | Yes | Yes | Color of the text on the system bar. |
+| type | [WindowType](#windowtype) | Yes | No | Type of the system bar whose properties are changed. Only the status bar and navigation bar are supported.|
+| isEnable | boolean | Yes | No | Whether the system bar is displayed. |
+| region | [Rect](#rect) | Yes | No | Current position and size of the system bar. |
+| backgroundColor | string | Yes | No | Background color of the system bar. The value is a hexadecimal RGB or aRGB color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
+| contentColor | string | Yes | No | Color of the text on the system bar. |
## SystemBarTintState8+
@@ -98,7 +97,7 @@ Describes the callback for the current system bar.
| Name | Type | Readable| Writable| Description |
| ---------- | --------------------------------------------------- | ---- | ---- | ---------------------------- |
| displayId | number | Yes | No | ID of the current physical screen. |
-| regionTint | Array<[SystemBarRegionTint](#systembarregiontint8)> | Yes | Yes | All system bar information that has been changed.|
+| regionTint | Array<[SystemBarRegionTint](#systembarregiontint8)> | Yes | No | All system bar information that has been changed.|
## Rect7+
@@ -126,6 +125,7 @@ Describes the area where the window cannot be displayed.
| rightRect | [Rect](#rect) | Yes | Yes | Rectangle on the right of the screen.|
| bottomRect | [Rect](#rect) | Yes | Yes | Rectangle at the bottom of the screen.|
+
## Size7+
Describes the window size.
@@ -143,20 +143,20 @@ Describes the window properties.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
-| Name | Type | Readable| Writable| Description |
-| ------------------------------- | ------------------------- | ---- | ---- | -------------------------------------------- |
-| windowRect7+ | [Rect](#rect) | Yes | Yes | Window size. |
-| type7+ | [WindowType](#windowtype) | Yes | Yes | Window type. |
-| isFullScreen | boolean | Yes | Yes | Whether the window is displayed in full screen mode. The default value is `false`. |
-| isLayoutFullScreen7+ | boolean | Yes | Yes | Whether the window layout is in full-screen mode (whether the window is immersive). The default value is `false`. |
-| focusable7+ | boolean | Yes | No | Whether the window can gain focus. The default value is `true`. |
-| touchable7+ | boolean | Yes | No | Whether the window is touchable. The default value is `true`. |
-| brightness | number | Yes | Yes | Screen brightness. The value ranges from 0 to 1. The value `1` indicates the maximum brightness. |
-| dimBehindValue7+ | number | Yes | Yes | Dimness of the window that is not on top. The value ranges from 0 to 1. The value `1` indicates the maximum dimness.|
-| isKeepScreenOn | boolean | Yes | Yes | Whether the screen is always on. The default value is `false`. |
-| isPrivacyMode7+ | boolean | Yes | Yes | Whether the window is in privacy mode. The default value is `false`. |
-| isRoundCorner7+ | boolean | Yes | Yes | Whether the window has rounded corners. The default value is `false`. |
-| isTransparent7+ | boolean | Yes | Yes | Whether the window is transparent. The default value is `false`. |
+| Name | Type | Readable| Writable| Description |
+| ------------------------------------- | ------------------------- | ---- | ---- | ------------------------------------------------------------ |
+| windowRect7+ | [Rect](#rect) | Yes | Yes | Window size. |
+| type7+ | [WindowType](#windowtype) | Yes | Yes | Window type. |
+| isFullScreen | boolean | Yes | Yes | Whether the window is displayed in full screen mode. The default value is `false`. |
+| isLayoutFullScreen7+ | boolean | Yes | Yes | Whether the window layout is in full-screen mode (whether the window is immersive). The default value is `false`. |
+| focusable7+ | boolean | Yes | No | Whether the window can gain focus. The default value is `true`. |
+| touchable7+ | boolean | Yes | No | Whether the window is touchable. The default value is `true`. |
+| brightness | number | Yes | Yes | Screen brightness. The value ranges from 0 to 1. The value `1` indicates the maximum brightness. |
+| dimBehindValue7+ | number | Yes | Yes | Dimness of the window that is not on top. The value ranges from 0 to 1. The value `1` indicates the maximum dimness. |
+| isKeepScreenOn | boolean | Yes | Yes | Whether the screen is always on. The default value is `false`. |
+| isPrivacyMode7+ | boolean | Yes | Yes | Whether the window is in privacy mode. The default value is `false`. |
+| isRoundCorner7+ | boolean | Yes | Yes | Whether the window has rounded corners. The default value is `false`. |
+| isTransparent7+ | boolean | Yes | Yes | Whether the window is transparent. The default value is `false`. |
## ColorSpace8+
@@ -245,7 +245,7 @@ Creates a subwindow. This API uses an asynchronous callback to return the result
| Name | Type | Mandatory| Description |
| -------- | -------------------------------------- | ---- | ------------------------------------------------------------ |
-| ctx | [Context](js-apis-Context.md) | Yes | Current application context.|
+| ctx | [Context](js-apis-Context.md) | Yes | Current application context.|
| id | string | Yes | Window ID. |
| type | [WindowType](#windowtype) | Yes | Window type. |
| callback | AsyncCallback<[Window](#window)> | Yes | Callback used to return the subwindow created. |
@@ -430,7 +430,7 @@ Obtains the top window of the current application. This API uses an asynchronous
| Name | Type | Mandatory| Description |
| -------- | -------------------------------------- | ---- | ------------------------------------------------------------ |
-| ctx | [Context](js-apis-Context.md) | Yes | Current application context. |
+| ctx | [Context](js-apis-Context.md) | Yes | Current application context.|
| callback | AsyncCallback<[Window](#window)> | Yes | Callback used to return the top window obtained. |
**Example**
@@ -937,8 +937,8 @@ Obtains the area where this window cannot be displayed, for example, the system
**Parameters**
-| Name | Type | Mandatory| Description |
-| -------- | -------------------------------------------- | ---- | ------------------------------------------------------------ |
+| Name | Type | Mandatory| Description |
+| -------- |-----------------------------------------------| ---- | ------------------------------------------------------------ |
| type | [AvoidAreaType](#avoidareatype) | Yes | Type of the area. `TYPE_SYSTEM` indicates the default area of the system. `TYPE_CUTOUT` indicates the notch.|
| callback | AsyncCallback<[AvoidArea](#avoidarea)> | Yes | Callback used to return the area. |
@@ -965,20 +965,21 @@ Obtains the area where this window cannot be displayed, for example, the system
**Parameters**
-| Name| Type | Mandatory| Description |
-| ------ | ------------------------------- | ---- | ------------------------------------------------------------ |
+| Name| Type | Mandatory| Description |
+| ------ |----------------------------------| ---- | ------------------------------------------------------------ |
| type | [AvoidAreaType](#avoidareatype) | Yes | Type of the area. `TYPE_SYSTEM` indicates the default area of the system. `TYPE_CUTOUT` indicates the notch.|
**Return value**
-| Type | Description |
-| -------------------------------------- | ----------------------------------- |
+| Type | Description |
+|-----------------------------------------| ----------------------------------- |
| Promise<[AvoidArea](#avoidarea)> | Promise used to return the area.|
**Example**
```js
-let promise = windowClass.getAvoidArea();
+var type = window.AvoidAreaType.TYPE_SYSTEM;
+let promise = windowClass.getAvoidArea(type);
promise.then((data)=> {
console.info('Succeeded in obtaining the area. Data:' + JSON.stringify(data));
}).catch((err)=>{
@@ -1315,7 +1316,7 @@ Checks whether this window is displayed. This API uses an asynchronous callback
| Name | Type | Mandatory| Description |
| -------- | ---------------------------- | ---- | ------------------------------------------------------------ |
-| callback | AsyncCallback<boolean> | Yes | Callback used to return the result. The value `true` means that this window is displayed, and `false` means the opposite.|
+| callback | AsyncCallback<boolean> | Yes | Callback used to return the result. The value `true` means that the window is displayed, and `false` means the opposite.|
**Example**
@@ -1341,7 +1342,7 @@ Checks whether this window is displayed. This API uses a promise to return the r
| Type | Description |
| ---------------------- | ------------------------------------------------------------ |
-| Promise<boolean> | Promise used to return the result. The value `true` means that this window is displayed, and `false` means the opposite.|
+| Promise<boolean> | Promise used to return the result. The value `true` means that the window is displayed, and `false` means the opposite.|
**Example**
@@ -1408,9 +1409,9 @@ Enables listening for changes to the area where the window cannot be displayed.
**Parameters**
-| Name | Type | Mandatory| Description |
-| -------- | --------------------------------------- | ---- | ------------------------------------------------------------ |
-| type | string | Yes | Event type. The value is fixed at `systemAvoidAreaChange`, indicating the event of changes to the area where the window cannot be displayed.|
+| Name | Type | Mandatory| Description |
+| -------- |------------------------------------------| ---- | ------------------------------------------------------- |
+| type | string | Yes | Event type. The value is fixed at `systemAvoidAreaChange`, indicating the event of changes to the area where the window cannot be displayed.|
| callback | Callback<[AvoidArea](#avoidarea)> | Yes | Callback used to return the area. |
**Example**
@@ -1431,10 +1432,10 @@ Disables listening for changes to the area where the window cannot be displayed.
**Parameters**
-| Name | Type | Mandatory| Description |
-| -------- | --------------------------------------- | ---- | ------------------------------------------------------------ |
-| type | string | Yes | Event type. The value is fixed at `systemAvoidAreaChange`, indicating the event of changes to the area where the window cannot be displayed.|
-| callback | Callback<[AvoidArea](#avoidarea)> | No | Callback used to return the area. |
+| Name | Type | Mandatory| Description |
+| -------- |------------------------------------------| ---- | ------------------------------------------------------- |
+| type | string | Yes | Event type. The value is fixed at `systemAvoidAreaChange`, indicating the event of changes to the area where the window cannot be displayed.|
+| callback | Callback<[AvoidArea](#avoidarea)> | No | Callback used to return the area. |
**Example**
@@ -1658,7 +1659,7 @@ Sets the background color for this window. This API uses an asynchronous callbac
| Name | Type | Mandatory| Description |
| -------- | ------------------------- | ---- | ------------------------------------------------------------ |
-| color | string | Yes | Background color to set. The value is a hexadecimal color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
+| color | string | Yes | Background color to set. The value is a hexadecimal color code and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
| callback | AsyncCallback<void> | Yes | Callback used to return the result. |
**Example**
@@ -1686,7 +1687,7 @@ Sets the background color for this window. This API uses a promise to return the
| Name| Type | Mandatory| Description |
| ------ | ------ | ---- | ------------------------------------------------------------ |
-| color | string | Yes | Background color to set. The value is a hexadecimal color value and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
+| color | string | Yes | Background color to set. The value is a hexadecimal color code and is case insensitive, for example, `#00FF00` or `#FF00FF00`.|
**Return value**
@@ -1772,8 +1773,9 @@ setDimBehind(dimBehindValue: number, callback: AsyncCallback<void>): void
Sets the dimness of the window that is not on top. This API uses an asynchronous callback to return the result.
-> **NOTE**: This API cannot be used.
-
+> **NOTE**
+>
+> This API cannot be used.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
@@ -1802,8 +1804,9 @@ setDimBehind(dimBehindValue: number): Promise<void>
Sets the dimness of the window that is not on top. This API uses a promise to return the result.
-> **NOTE**: This API cannot be used.
-
+> **NOTE**
+>
+> This API cannot be used.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
@@ -1956,8 +1959,9 @@ setOutsideTouchable(touchable: boolean, callback: AsyncCallback<void>): vo
Sets whether the area outside the subwindow is touchable. This API uses an asynchronous callback to return the result.
-> **NOTE**: This API cannot be used.
-
+> **NOTE**
+>
+> This API cannot be used.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
@@ -1986,8 +1990,9 @@ setOutsideTouchable(touchable: boolean): Promise<void>
Sets whether the area outside the subwindow is touchable. This API uses a promise to return the result.
-> **NOTE**: This API cannot be used.
-
+> **NOTE**
+>
+> This API cannot be used.
**System capability**: SystemCapability.WindowManager.WindowManager.Core
diff --git a/en/application-dev/reference/arkui-ts/ts-basic-components-search.md b/en/application-dev/reference/arkui-ts/ts-basic-components-search.md
index 386f5aa23c7467f88e77d0c34647f2467af903b3..51598a90f72944e959ab2d9b836933c18356cc08 100644
--- a/en/application-dev/reference/arkui-ts/ts-basic-components-search.md
+++ b/en/application-dev/reference/arkui-ts/ts-basic-components-search.md
@@ -1,11 +1,11 @@
# Search
+The **\** component provides an input area for users to search.
+
> **NOTE**
>
> This component is supported since API version 8. Updates will be marked with a superscript to indicate their earliest API version.
-The **\** component provides an input area for users to search.
-
## Required Permissions
None
@@ -18,34 +18,34 @@ Not supported
Search(options?: { value?: string; placeholder?: string; icon?: string; controller?: SearchController })
-- Parameters
+**Parameters**
- | Name | Type | Mandatory | Default Value | Description |
- | -------- | -------- | -------- | -------- | -------- |
- | value | string | No| - | Text input in the search text box. |
- | placeholder | string | No | - | Text displayed when there is no input. |
- | icon | string | No| - | Path to the search icon. By default, the system search icon is used. The supported icon formats are .svg, .jpg, and .png. |
- | controller | SearchController | No| - | Controller. |
+| Name | Type | Mandatory | Default Value | Description |
+| ----------- | ---------------- | ---- | ---- | ---------------------------------------- |
+| value | string | No | - | Text input in the search text box. |
+| placeholder | string | No | - | Text displayed when there is no input. |
+| icon | string | No | - | Path to the search icon. By default, the system search icon is used. The supported icon formats are .svg, .jpg, and .png.|
+| controller | SearchController | No | - | Controller. |
## Attributes
-| Name | Type | Default Value | Description |
-| -------- | -------- | -------- | -------- |
-| searchButton | string | –| Text on the search button located next to the search text box. By default, there is no search button. |
-| placeholderColor | [ResourceColor](../../ui/ts-types.md) | - | Placeholder text color. |
-| placeholderFont | [Font](../../ui/ts-types.md) | - | Placeholder text style. |
-| textFont | [Font](../../ui/ts-types.md) | - | Text font for the search text box. |
+| Name | Type | Default Value | Description |
+| ----------------------- | ---------------------------------------- | ---- | --------------------- |
+| searchButton | string | – | Text on the search button located next to the search text box. By default, there is no search button.|
+| placeholderColor | [ResourceColor](ts-types.md#resourcecolor8) | - | Placeholder text color. |
+| placeholderFont | [Font](ts-types.md#font) | - | Placeholder text style. |
+| textFont | [Font](ts-types.md#font) | - | Text font for the search text box. |
## Events
-| Name | Description |
-| -------- | -------- |
-| onSubmit(callback: (value: string) => void) | Triggered when users click the search icon or the search button, or tap the search button on a soft keyboard. - **value**: current text input. |
-| onChange(callback: (value: string) => void) | Triggered when the input in the text box changes. - **value**: current text input. |
-| onCopy(callback: (value: string) => void) | Triggered when data is copied to the pasteboard. - **value**: text copied. |
-| onCut(callback: (value: string) => void) | Triggered when data is cut from the pasteboard. - **value**: text cut. |
-| onPaste(callback: (value: string) => void) | Triggered when data is pasted from the pasteboard. - **value**: text pasted. |
+| Name | Description |
+| ---------------------------------------- | ---------------------------------------- |
+| onSubmit(callback: (value: string) => void) | Triggered when users click the search icon or the search button, or touch the search button on a soft keyboard. -**value**: current text input.|
+| onChange(callback: (value: string) => void) | Triggered when the input in the text box changes. -**value**: current text input. |
+| onCopy(callback: (value: string) => void) | Triggered when data is copied to the pasteboard. -**value**: text copied. |
+| onCut(callback: (value: string) => void) | Triggered when data is cut from the pasteboard. -**value**: text cut. |
+| onPaste(callback: (value: string) => void) | Triggered when data is pasted from the pasteboard. -**value**: text pasted. |
## SearchController
@@ -61,11 +61,11 @@ caretPosition(value: number): void
Sets the position of the caret.
-- Parameters
+**Parameters**
- | Name | Type | Mandatory | Default Value | Description |
- | ---- | ------ | ---- | ---- | --------------------- |
- | value | number | Yes | - | Length from the start of the text string to the position where the caret is located. |
+| Name | Type | Mandatory | Default Value | Description |
+| ----- | ------ | ---- | ---- | ----------------- |
+| value | number | Yes | - | Length from the start of the character string to the position where the caret is located.|
@@ -76,29 +76,30 @@ Sets the position of the caret.
@Entry
@Component
struct SearchExample {
- @State changevalue: string = ''
- @State submitvalue: string = ''
+ @State changeValue: string = ''
+ @State submitValue: string = ''
controller: SearchController = new SearchController()
build() {
Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
- Text(this.submitvalue)
- Text(this.changevalue)
- Search({value: '', placeholder: 'Type to search', controller: this.controller})
+ Text(this.submitValue)
+ Text(this.changeValue)
+ Search({value: this.changeValue, placeholder: 'Type to search', controller: this.controller})
.searchButton('Search')
.width(400)
.height(35)
.backgroundColor(Color.White)
.placeholderColor(Color.Grey)
- .placeholderFont({ size: 50, weight: 10, family: 'serif', style: FontStyle.Normal })
+ .placeholderFont({ size: 26, weight: 10, family: 'serif', style: FontStyle.Normal })
.onSubmit((value: string) => {
- this.submitvalue = value
+ this.submitValue = value
})
.onChange((value: string) => {
- this.changevalue = value
+ this.changeValue = value
})
- .margin({ top: 30 })
+ .margin({ top: 30, left:10, right:10 })
}
}
}
```
+
diff --git a/en/application-dev/reference/arkui-ts/ts-container-swiper.md b/en/application-dev/reference/arkui-ts/ts-container-swiper.md
index 161e30cef3b73797b6e14be707306f38eb80b175..b744026aba94054602fae5d4387aa24da4a6240d 100644
--- a/en/application-dev/reference/arkui-ts/ts-container-swiper.md
+++ b/en/application-dev/reference/arkui-ts/ts-container-swiper.md
@@ -33,23 +33,23 @@ Swiper(value:{controller?: SwiperController})
[Menu control](ts-universal-attributes-menu.md) is not supported.
-| Name | Type | Description |
-| --------------------------- | ---------------------------------------- | ---------------------------------------- |
-| index | number | Index of the child component currently displayed in the container. Default value: **0** |
-| autoPlay | boolean | Whether to enable automatic playback for child component switching. If this attribute is **true**, the navigation dots indicator does not take effect. Default value: **false** |
-| interval | number | Interval for automatic playback, in ms. Default value: **3000** |
-| indicator | boolean | Whether to enable the navigation dots indicator. Default value: **true** |
-| loop | boolean | Whether to enable loop playback. The value **true** means to enable loop playback. When LazyForEach is used, it is recommended that the number of the components to load exceed 5. Default value: **true**|
-| duration | number | Duration of the animation for switching child components, in ms. Default value: **400** |
-| vertical | boolean | Whether vertical swiping is used. Default value: **false** |
-| itemSpace | Length | Space between child components. Default value: **0** |
-| displayMode | SwiperDisplayMode | Mode in which elements are displayed along the main axis. This attribute takes effect only when **displayCount** is not set. Default value: **SwiperDisplayMode.Stretch**|
-| cachedCount8+ | number | Number of child components to be cached. Default value: **1** |
-| disableSwipe8+ | boolean | Whether to disable the swipe feature. Default value: **false** |
-| curve8+ | [Curve](ts-animatorproperty.md#Curve) \| string | Animation curve. The ease-in/ease-out curve is used by default. For details about common curves, see [Curve enums](ts-animatorproperty.md#curve-enums). You can also create custom curves ([interpolation curve objects](ts-interpolation-calculation.md)) by using the API provided by the interpolation calculation module. Default value: **Curve.Ease**|
-| indicatorStyle8+ | { left?: Length, top?: Length, right?: Length, bottom?: Length, size?: Length, color?: Color, selectedColor?: Color } | Style of the navigation dots indicator. - **left**: distance between the navigation dots indicator and the left edge of the **\** component. - **top**: distance between the navigation dots indicator and the top edge of the **\** component. - **right**: distance between the navigation dots indicator and the right edge of the **\** component. - **bottom**: distance between the navigation dots indicator and the bottom edge of the **\** component. - **size**: diameter of the navigation dots indicator. - **color**: color of the navigation dots indicator. - **selectedColor**: color of the selected navigation dot.|
-| displayCount8+ | number\|string | Number of elements to display. Default value: **1** |
-| effectMode8+ | EdgeEffect | Swipe effect. For details, see **EdgeEffect**. Default value: **EdgeEffect.Spring**|
+| Name | Type | Default Value | Description |
+| --------------------------- | ---------------------------------------- | ---------------------------------------- | ---------------------------------------- |
+| index | number | 0 | Index of the child component currently displayed in the container. |
+| autoPlay | boolean | false | Whether to enable automatic playback for child component switching. If this attribute is **true**, the navigation dots indicator does not take effect. |
+| interval | number | 3000 | Interval for automatic playback, in ms. |
+| indicator | boolean | true | Whether to enable the navigation dots indicator. |
+| loop | boolean | true | Whether to enable loop playback. The value **true** means to enable loop playback. When LazyForEach is used, it is recommended that the number of the components to load exceed 5. |
+| duration | number | 400 | Duration of the animation for switching child components, in ms. |
+| vertical | boolean | false | Whether vertical swiping is used. |
+| itemSpace | number \| string | 0 | Space between child components. |
+| displayMode | SwiperDisplayMode | SwiperDisplayMode.Stretch | Mode in which elements are displayed along the main axis. This attribute takes effect only when **displayCount** is not set. |
+| cachedCount8+ | number | 1 | Number of child components to be cached. |
+| disableSwipe8+ | boolean | false | Whether to disable the swipe feature. |
+| displayCount8+ | number \| string | 1 | Number of elements to display. |
+| effectMode8+ | EdgeEffect | EdgeEffect.Spring | Swipe effect. For details, see **EdgeEffect**. |
+| curve8+ | [Curve](ts-appendix-enums.md#curve) \| string | Curve.Ease | Animation curve. The ease-in/ease-out curve is used by default. For details about common curves, see [Curve](ts-appendix-enums.md#curve). You can also create custom curves ([interpolation curve objects](ts-interpolation-calculation.md)) by using the API provided by the interpolation calculation module. |
+| indicatorStyle8+ | { left?: [Length](ts-types.md#length), top?: [Length](ts-types.md#length), right?: [Length](ts-types.md#length), bottom?: [Length](ts-types.md#length), size?: [Length](ts-types.md#length), mask?: boolean, color?: [ResourceColor](ts-types.md#resourcecolor8), selectedColor?: [ResourceColor](ts-types.md#resourcecolor8) } | - | Style of the navigation dots indicator. - **left**: distance between the navigation dots indicator and the left edge of the **\** component. - **top**: distance between the navigation dots indicator and the top edge of the **\** component. - **right**: distance between the navigation dots indicator and the right edge of the **\** component. - **bottom**: distance between the navigation dots indicator and the bottom edge of the **\** component. - **size**: diameter of the navigation dots indicator. - **color**: color of the navigation dots indicator. - **selectedColor**: color of the selected navigation dot.|
## SwiperDisplayMode
@@ -98,7 +98,7 @@ Stops this animation.
### onChange
-onChange( index: number) => void
+onChange( index: number) => void
Triggered when the index of the currently displayed component changes.
diff --git a/en/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md b/en/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md
index 5efa02368bf4eb70bca06a7e6a71473853692571..0bebd949e8f8e05dc992f0d78e1d52a8c3745ad9 100644
--- a/en/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md
+++ b/en/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md
@@ -1,7 +1,9 @@
-# Image Effect Configuration
+# Image Effects
+Image effects include background blur, content blur, grayscale, and much more.
> **NOTE**
+>
> This attribute is supported since API version 7. Updates will be marked with a superscript to indicate their earliest API version.
@@ -15,28 +17,30 @@ None
| Name | Type | Default Value | Description |
| -------- | -------- | -------- | -------- |
-| blur | number | - | Adds the content blurring for the current component. The input parameter is the blur radius. The larger the radius is, the more blurred the content is. If the value is **0**, the content is not blurred. |
-| backdropBlur | number | - | Adds the background blur effect for the current component. The input parameter is the blur radius. The larger the radius is, the more blurred the background is. If the value is **0**, the background is not blurred. |
-| shadow | { radius: number, color?: Color, offsetX?: number, offsetY?: number } | - | Adds the shadow effect to the current component. The input parameters are the fuzzy radius (mandatory), shadow color (optional; gray by default), X-axis offset (optional and 0 by default), and Y-axis offset (optional; 0 by default). The offset unit is px. |
-| grayscale | number | 0.0 | The value indicates the grayscale conversion ratio. If the input value is **1.0**, the image is converted into a grayscale image. If the input value is **0.0**, the image does not change. If the input value is between **0.0** and **1.0**, the effect changes in linear mode. The unit is percentage. The unit is percentage. |
+| blur | number | - | Adds the content blur effect to the current component. The input parameter is the blur radius. The larger the radius is, the more blurred the content is. If the value is **0**, the content is not blurred. |
+| backdropBlur | number | - | Adds the background blur effect to the current component. The input parameter is the blur radius. The larger the radius is, the more blurred the background is. If the value is **0**, the background is not blurred. |
+| shadow | { radius: number, color?: Color \| string \| [Resource](../../ui/ts-types.md#resource-type), offsetX?: number, offsetY?: number } | - | Adds the shadow effect to the current component. The input parameters are the fuzzy radius (mandatory), shadow color (optional; gray by default), X-axis offset (optional and 0 by default), and Y-axis offset (optional; 0 by default). The offset unit is px. |
+| grayscale | number | 0.0 | Converts the input image to grayscale. The value indicates the grayscale conversion ratio. If the input value is **1.0**, the image is converted into a grayscale image. If the input value is **0.0**, the image does not change. If the input value is between **0.0** and **1.0**, the effect changes in linear mode. The unit is percentage. The unit is percentage. |
| brightness | number | 1.0 | Adds a brightness to the current component. The input parameter is a brightness ratio. The value **1** indicates no effects. The value **0** indicates the complete darkness. If the value is less than **1**, the brightness decreases. If the value is greater than **1**, the brightness increases. A larger value indicates a higher brightness. |
| saturate | number | 1.0 | Adds the saturation effect to the current component. The saturation is the ratio of the chromatic component to the achromatic component (gray) in a color. When the input value is **1**, the source image is displayed. When the input value is greater than **1**, a higher percentage of the chromatic component indicates a higher saturation. When the input value is less than **1**, a higher percentage of the achromatic component indicates a lower saturation. The unit is percentage. |
| contrast | number | 1.0 | Adds the contrast effect to the current component. The input parameter is a contrast value. If the value is **1**, the source image is displayed. If the value is greater than **1**, a larger value indicates a higher contrast and a clearer image. If the value is less than **1**, a smaller value indicates a lower contrast is. If the value is **0**, the image becomes all gray. The unit is percentage. |
| invert | number | 0 | Inverts the input image. The input parameter is an image inversion ratio. The value **1** indicates complete inversion. The value **0** indicates that the image does not change. The unit is percentage. |
-| colorBlend 8+ | Color | - | Adds the color blend effect to the current component. The input parameter is the blended color. |
+| colorBlend8+ | Color | - | Adds the color blend effect to the current component. The input parameter is the blended color. |
| sepia | number | 0 | Converts the image color to sepia. The input parameter is an image inversion ratio. The value **1** indicates the image is completely sepia. The value **0** indicates that the image does not change. The unit is percentage. |
-| hueRotate | number \| string | '0deg' |Adds the hue rotation effect to the current component. The input parameter is a rotation angle. If the input value is **0deg**, the image does not change (because the default rotation angle is **0deg**). The input parameter does not have the maximum value. If the value exceeds **360deg**, the image is rotated for one more circle. In other words, the value **370deg** has the same effect as **10deg**.|
+| hueRotate | number \| string | '0deg' | Adds the hue rotation effect to the current component. The input parameter is a rotation angle. If the input value is **0deg**, the image does not change (because the default rotation angle is **0deg**). The input parameter does not have the maximum value. If the value exceeds **360deg**, the image is rotated for one more circle. In other words, the value **370deg** has the same effect as **10deg**.|
## Example
+You can preview how this component looks on a real device. The preview is not yet available in the DevEco Studio Previewer.
-```
+```ts
+// xxx.ets
@Entry
@Component
struct ImageEffectsExample {
build() {
-Column({space: 10}) {
+ Column({space: 10}) {
// Blur the font.
Text('font blur').fontSize(15).fontColor(0xCCCCCC).width('90%')
Text('text').blur(3).width('90%').height(40)
diff --git a/en/application-dev/reference/native-lib/Readme-EN.md b/en/application-dev/reference/native-lib/Readme-EN.md
index 536c57df0429482b768daa51775f5bb8bede353a..4a6d86ae4beb3d6bd93521604ec6ffbd36795389 100644
--- a/en/application-dev/reference/native-lib/Readme-EN.md
+++ b/en/application-dev/reference/native-lib/Readme-EN.md
@@ -1,6 +1,9 @@
# Standard Libraries Supported by Native APIs
-- [Standard Libraries](third_party_libc/musl.md)
- [Node_API](third_party_napi/napi.md)
- [libuv](third_party_libuv/libuv.md)
-- [Native API Symbols Not Exported](third_party_libc/musl-peculiar-symbol.md)
\ No newline at end of file
+- [Standard Libraries](third_party_libc/musl.md)
+- Appendix
+- [Native API Symbols Not Exported](third_party_libc/musl-peculiar-symbol.md)
+ - [EGL Symbols Exported from Native APIs](third_party_opengl/egl-symbol.md)
+ - [OpenGL ES 3.0 Symbols Exported from Native APIs](third_party_opengl/openglesv3-symbol.md)
\ No newline at end of file
diff --git a/en/application-dev/reference/third_party_opengl/egl-symbol.md b/en/application-dev/reference/native-lib/third_party_opengl/egl-symbol.md
similarity index 100%
rename from en/application-dev/reference/third_party_opengl/egl-symbol.md
rename to en/application-dev/reference/native-lib/third_party_opengl/egl-symbol.md
diff --git a/en/application-dev/reference/third_party_opengl/openglesv3-symbol.md b/en/application-dev/reference/native-lib/third_party_opengl/openglesv3-symbol.md
similarity index 100%
rename from en/application-dev/reference/third_party_opengl/openglesv3-symbol.md
rename to en/application-dev/reference/native-lib/third_party_opengl/openglesv3-symbol.md
diff --git a/en/application-dev/ui/Readme-EN.md b/en/application-dev/ui/Readme-EN.md
index 9d615148f375ab85d5609f0e2fc0c18ba7acedad..8c41acc214947881abfc99bc2ec6b59ca55b7662 100644
--- a/en/application-dev/ui/Readme-EN.md
+++ b/en/application-dev/ui/Readme-EN.md
@@ -1,6 +1,75 @@
# UI Development
- [ArkUI Overview](arkui-overview.md)
+- TypeScript-based Declarative Development Paradigm
+ - [Overview](ui-ts-overview.md)
+ - Framework Overview
+ - File Organization
+ - [Directory Structure](ts-framework-directory.md)
+ - [Rules for Accessing Application Code Files](ts-framework-file-access-rules.md)
+ - ["js" Tag](ts-framework-js-tag.md)
+ - Resource Management
+ - [Resource File Categories](ui-ts-basic-resource-file-categories.md)
+ - [Accessing Resources](ts-resource-access.md)
+ - [Pixel Units](ts-pixel-units.md)
+ - Declarative Syntax
+ - [Overview](ts-syntax-intro.md)
+ - General UI Description Specifications
+ - [Basic Concepts](ts-general-ui-concepts.md)
+ - Declarative UI Description Specifications
+ - [Configuration Without Parameters](ts-parameterless-configuration.md)
+ - [Configuration with Mandatory Parameters](ts-configuration-with-mandatory-parameters.md)
+ - [Attribute Configuration](ts-attribution-configuration.md)
+ - [Event Configuration](ts-event-configuration.md)
+ - [Child Component Configuration](ts-child-component-configuration.md)
+ - Componentization
+ - [@Component](ts-component-based-component.md)
+ - [@Entry](ts-component-based-entry.md)
+ - [@Preview](ts-component-based-preview.md)
+ - [@Builder](ts-component-based-builder.md)
+ - [@Extend](ts-component-based-extend.md)
+ - [@CustomDialog](ts-component-based-customdialog.md)
+ - [@Styles](ts-component-based-styles.md)
+ - About UI State Management
+ - [Basic Concepts](ts-ui-state-mgmt-concepts.md)
+ - Managing Component States
+ - [@State](ts-component-states-state.md)
+ - [@Prop](ts-component-states-prop.md)
+ - [@Link](ts-component-states-link.md)
+ - Managing Application States
+ - [AppStorage](ts-application-states-appstorage.md)
+ - [PersistentStorage](ts-application-states-apis-persistentstorage.md)
+ - [Environment](ts-application-states-apis-environment.md)
+ - Managing Other States
+ - [@Observed and @ObjectLink](ts-other-states-observed-objectlink.md)
+ - [@Consume and @Provide](ts-other-states-consume-provide.md)
+ - [@Watch](ts-other-states-watch.md)
+ - About Rendering Control Syntax
+ - [if/else](ts-rending-control-syntax-if-else.md)
+ - [ForEach](ts-rending-control-syntax-foreach.md)
+ - [LazyForEach](ts-rending-control-syntax-lazyforeach.md)
+ - About @Component
+ - [build Function](ts-function-build.md)
+ - [Initialization of Custom Components' Member Variables](ts-custom-component-initialization.md)
+ - [Custom Component Lifecycle Callbacks](ts-custom-component-lifecycle-callbacks.md)
+ - [Component Creation and Re-initialization](ts-component-creation-re-initialization.md)
+ - [About Syntactic Sugar](ts-syntactic-sugar.md)
+ - Common Component Development Guidelines
+ - [Button](ui-ts-basic-components-button.md)
+ - [Web](ui-ts-components-web.md)
+ - Common Layout Development Guidelines
+ - [Flex Layout](ui-ts-layout-flex.md)
+ - [Grid Layout](ui-ts-layout-grid-container.md)
+ - [Media Query](ui-ts-layout-mediaquery.md)
+ - Experiencing the Declarative UI
+ - [Creating a Declarative UI Project](ui-ts-creating-project.md)
+ - [Getting to Know Components](ui-ts-components.md)
+ - [Creating a Simple Page](ui-ts-creating-simple-page.md)
+ - Defining Page Layout and Connection
+ - [Building a Food Data Model](ui-ts-building-data-model.md)
+ - [Building a Food Category List Layout](ui-ts-building-category-list-layout.md)
+ - [Building a Food Category Grid Layout](ui-ts-building-category-grid-layout.md)
+ - [Implementing Page Redirection and Data Transmission](ui-ts-page-redirection-data-transmission.md)
- JavaScript-based Web-like Development Paradigm
- [Overview](ui-js-overview.md)
- Framework
@@ -73,73 +142,3 @@
- [Animation Effect](ui-js-animate-dynamic-effects.md)
- [Animation Frame](ui-js-animate-frame.md)
- [Custom Components](ui-js-custom-components.md)
-- TypeScript-based Declarative Development Paradigm
- - [Overview](ui-ts-overview.md)
- - Framework Overview
- - File Organization
- - [Directory Structure](ts-framework-directory.md)
- - [Rules for Accessing Application Code Files](ts-framework-file-access-rules.md)
- - ["js" Tag](ts-framework-js-tag.md)
- - Resource Management
- - [Resource File Categories](ui-ts-basic-resource-file-categories.md)
- - [Accessing Resources](ts-resource-access.md)
- - [Pixel Units](ts-pixel-units.md)
- - [Types](ts-types.md)
- - Declarative Syntax
- - [Overview](ts-syntax-intro.md)
- - General UI Description Specifications
- - [Basic Concepts](ts-general-ui-concepts.md)
- - Declarative UI Description Specifications
- - [Configuration Without Parameters](ts-parameterless-configuration.md)
- - [Configuration with Mandatory Parameters](ts-configuration-with-mandatory-parameters.md)
- - [Attribute Configuration](ts-attribution-configuration.md)
- - [Event Configuration](ts-event-configuration.md)
- - [Child Component Configuration](ts-child-component-configuration.md)
- - Componentization
- - [@Component](ts-component-based-component.md)
- - [@Entry](ts-component-based-entry.md)
- - [@Preview](ts-component-based-preview.md)
- - [@Builder](ts-component-based-builder.md)
- - [@Extend](ts-component-based-extend.md)
- - [@CustomDialog](ts-component-based-customdialog.md)
- - [@Styles](ts-component-based-styles.md)
- - About UI State Management
- - [Basic Concepts](ts-ui-state-mgmt-concepts.md)
- - Managing Component States
- - [@State](ts-component-states-state.md)
- - [@Prop](ts-component-states-prop.md)
- - [@Link](ts-component-states-link.md)
- - Managing Application States
- - [AppStorage](ts-application-states-appstorage.md)
- - [PersistentStorage](ts-application-states-apis-persistentstorage.md)
- - [Environment](ts-application-states-apis-environment.md)
- - Managing Other States
- - [@Observed and @ObjectLink](ts-other-states-observed-objectlink.md)
- - [@Consume and @Provide](ts-other-states-consume-provide.md)
- - [@Watch](ts-other-states-watch.md)
- - About Rendering Control Syntax
- - [if/else](ts-rending-control-syntax-if-else.md)
- - [ForEach](ts-rending-control-syntax-foreach.md)
- - [LazyForEach](ts-rending-control-syntax-lazyforeach.md)
- - About @Component
- - [build Function](ts-function-build.md)
- - [Initialization of Custom Components' Member Variables](ts-custom-component-initialization.md)
- - [Custom Component Lifecycle Callbacks](ts-custom-component-lifecycle-callbacks.md)
- - [Component Creation and Re-initialization](ts-component-creation-re-initialization.md)
- - [About Syntactic Sugar](ts-syntactic-sugar.md)
- - Common Component Development Guidelines
- - [Button](ui-ts-basic-components-button.md)
- - [Web](ui-ts-components-web.md)
- - Common Layout Development Guidelines
- - [Flex Layout](ui-ts-layout-flex.md)
- - [Grid Layout](ui-ts-layout-grid-container.md)
- - [Media Query](ui-ts-layout-mediaquery.md)
- - Experiencing the Declarative UI
- - [Creating a Declarative UI Project](ui-ts-creating-project.md)
- - [Getting to Know Components](ui-ts-components.md)
- - [Creating a Simple Page](ui-ts-creating-simple-page.md)
- - Defining Page Layout and Connection
- - [Building a Food Data Model](ui-ts-building-data-model.md)
- - [Building a Food Category List Layout](ui-ts-building-category-list-layout.md)
- - [Building a Food Category Grid Layout](ui-ts-building-category-grid-layout.md)
- - [Implementing Page Redirection and Data Transmission](ui-ts-page-redirection-data-transmission.md)
diff --git a/en/application-dev/ui/js-framework-syntax-css.md b/en/application-dev/ui/js-framework-syntax-css.md
index 1ad94016b7e7100fb77353e562f03090f4c9e1c3..46fcc170df8f4688da555b6874a6842c1c6806e8 100644
--- a/en/application-dev/ui/js-framework-syntax-css.md
+++ b/en/application-dev/ui/js-framework-syntax-css.md
@@ -85,11 +85,11 @@ The following is an example:
```css
/* Page style xxx.css */
-/\* Set the style for all
components. \*/
+/* Set the style for all
components. */
div {
flex-direction: column;
}
-/* Set the style for the component whose class is title. */
+/* Set the style for the component whose class is title.*/
.title {
font-size: 30px;
}
@@ -101,13 +101,13 @@ div {
.title, .content {
padding: 5px;
}
-/\* Set the style for all texts of components whose class is container.\*/
+/* Set the style for all texts of components whose class is container.*/
.container text {
color: \#007dff;
}
-/\* Set the style for direct descendant texts of components whose class is container.\*/
+/* Set the style for direct descendant texts of components whose class is container.*/
.container > text {
- color: \#fa2a2d;
+ color: #fa2a2d;
}
```
@@ -128,7 +128,7 @@ When multiple selectors point to the same element, their priorities are as follo
A CSS pseudo-class is a keyword added to a selector that specifies a special state of the selected element(s). For example, :disabled can be used to select the element whose disabled attribute is true.
-In addition to a single pseudo-class, a combination of pseudo-classes is supported. For example, **:focus:checked** selects the element whose focus and checked attributes are both set to true. The following table lists the supported single pseudo-class in descending order of priority.
+In addition to a single pseudo-class, a combination of pseudo-classes is supported. For example, :focus:checked selects the element whose focus and checked attributes are both set to true. The following table lists the supported single pseudo-class in descending order of priority.
| Pseudo-class | Available Components | Description |
diff --git a/en/application-dev/ui/ts-application-states-appstorage.md b/en/application-dev/ui/ts-application-states-appstorage.md
index ac77b40dd5c85a7494e094b8dc698715786413f8..5877f75ca55ad03cafb78eda50c0b26475f3033e 100644
--- a/en/application-dev/ui/ts-application-states-appstorage.md
+++ b/en/application-dev/ui/ts-application-states-appstorage.md
@@ -21,7 +21,7 @@ By default, the attributes in the AppStorage are changeable. If needed, AppStora
| Set | key: string, newValue: T | void | Replaces the value of a saved key. |
| Link | key: string | @Link | Returns two-way binding to this attribute if there is data with a given key. This means that attribute changes made by a variable or component will be synchronized to the AppStorage, and attribute changes made through the AppStorage will be synchronized to the variable or component. If the attribute with this key does not exist or is read-only, undefined is returned. |
| SetAndProp | propName: string, defaultValue: S | @Prop | Works in a way similar to the Prop API. If the current key is stored in the AppStorage, the value corresponding to the key is returned. If the key has not been created, a Prop instance corresponding to the default value is created and returned. |
-| Prop | key: string | @Prop | Returns one-way binding to an attribute with a given key if the attribute exists. This means that attribute changes made through the AppStorage will be synchronized to the variable or component, but attribute changes made by the variable or component will be synchronized to the AppStorage. The variable returned by this method is an immutable one, which is applicable both to the variable and immutable state attributes. If the attribute with the specified key does not exist, undefined is returned. >  **NOTE**: > The attribute value used in the prop method must be of a simple type. |
+| Prop | key: string | @Prop | Returns one-way binding to an attribute with a given key if the attribute exists. This means that attribute changes made through the AppStorage will be synchronized to the variable or component, but attribute changes made by the variable or component will be synchronized to the AppStorage. The variable returned by this method is an immutable one, which is applicable both to the variable and immutable state attributes. If the attribute with the specified key does not exist, undefined is returned. **NOTE** The attribute value used in the prop method must be of a simple type. |
| SetOrCreate | key: string, newValue: T | boolean | If an attribute that has the same name as the specified key exists: replaces the value of the attribute and returns true when the attribute can be modified; retains the original value of the attribute and returns false otherwise. If an attribute that has the same name as the specified key does not exist: creates an attribute whose key is key and value is newValue. The values null and undefined are not supported. |
| Get | key: string | T or undefined | Obtains the value of the specified key. |
| Has | propName: string | boolean | Checks whether the attribute corresponding to the specified key value exists. |
@@ -51,9 +51,8 @@ One-way data binding can be established between components and the AppStorage th
## Example
-```
-let varA = AppStorage.Link('varA')
-let envLang = AppStorage.Prop('languageCode')
+```ts
+// xxx.ets
@Entry
@Component
diff --git a/en/application-dev/ui/ts-resource-access.md b/en/application-dev/ui/ts-resource-access.md
index 82d53954d3fc86878a48222e449428faf1a341d1..5b4a7627f6b810bf87e457b2b0042f6b806dfc15 100644
--- a/en/application-dev/ui/ts-resource-access.md
+++ b/en/application-dev/ui/ts-resource-access.md
@@ -5,10 +5,13 @@
To reference an application resource in a project, use the `"$r('app.type.name')"` format. **app** indicates the resource defined in the **resources** directory of the application. **type** indicates the resource type (or the location where the resource is stored). The value can be **color**, **float**, **string**, **plural**, or **media**. **name** indicates the resource name, which you set when defining the resource.
-When referencing resources in the **rawfile** sub-directory, use the `"$rawfile('filename')"` format. Currently, **$rawfile** allows only the **\** component to reference image resources. **filename** indicates the relative path of a file in the **rawfile** directory, and the file name must contain the file name extension. Note that the relative path cannot start with a slash (/).
+When referencing resources in the **rawfile** sub-directory, use the ```"$rawfile('filename')"``` format. **filename** indicates the relative path of a file in the **rawfile** directory, and the file name must contain the file name extension. Note that the relative path cannot start with a slash (/).
> **NOTE**
+>
> Resource descriptors accept only strings, such as `'app.type.name'`, and cannot be combined.
+>
+> `$r` returns a **Resource** object. To obtain the corresponding string, use [getString](../reference/apis/js-apis-resource-manager.md#getstring).
In the **.ets** file, you can use the resources defined in the **resources** directory.
@@ -47,7 +50,7 @@ Image($rawfile('newDir/newTest.png')) // Reference an image in the rawfile direc
System resources include colors, rounded corners, fonts, spacing, character strings, and images. By using system resources, you can develop different applications with the same visual style.
-To reference a system resource, use the "$r('sys.type.resource_id')" format. Wherein: sys indicates a system resource; type indicates the resource type, which can be color, float, string, or media; resource_id indicates the resource ID, which is determined when the system resource is provided. For details about available system resource IDs.
+To reference a system resource, use the ```"$r('sys.type.resource_id')"``` format. Wherein: **sys** indicates a system resource; **type** indicates the resource type, which can be **color**, **float**, **string**, or **media**; **resource_id** indicates the resource ID.
```ts
Text('Hello')
diff --git a/en/application-dev/ui/ts-syntactic-sugar.md b/en/application-dev/ui/ts-syntactic-sugar.md
index 78b908edf1f85a6deaa9fc37b8e7d029d977cab5..de6d2f0cdb280e9160ff3ee4aa6f4895b505fc32 100644
--- a/en/application-dev/ui/ts-syntactic-sugar.md
+++ b/en/application-dev/ui/ts-syntactic-sugar.md
@@ -1,32 +1,35 @@
# About Syntactic Sugar
-
## Decorators
-A decorator @Decorator can decorate a class, structure, or class attribute. Multiple decorators can be applied to the same target element and defined on a single line or multiple lines. It is recommended that the decorators be defined on multiple lines.
-In the example below, the elements decorated by @Component take on the form of a component, and the variables decorated by @State can be used to represent states.
+A decorator **@Decorator** can decorate a class, structure, or class attribute. Multiple decorators can be applied to the same target element and defined on a single line or multiple lines. It is recommended that the decorators be defined on multiple lines.
-```
+In the example below, the elements decorated by **@Component** take on the form of a component, and the variables decorated by **@State** can be used to represent states.
+
+
+```ts
@Component
struct MyComponent {
@State count: number = 0
}
```
+
Multiple decorators can be defined on a single line, as shown below:
-```
+```ts
@Entry @Component struct MyComponent {
}
```
+
However, you are advised to define the decorators on multiple lines, as shown below:
-```
+```ts
@Entry
@Component
struct MyComponent {
@@ -36,30 +39,29 @@ struct MyComponent {
### Supported Decorators
- | Decorator | Decorates... | Description |
-| -------- | -------- | -------- |
-| @Component | struct | The decorated structure has the component-based capability. The build method must be implemented to update the UI. |
-| @Entry | struct | The decorated component is used as the entry of a page. The component is rendered and displayed when the page is loaded. |
-| @Preview | struct | Custom components decorated by @Preview can be previewed in the Previewer of DevEco Studio. When the page is loaded, the custom components decorated by @Preview are created and displayed. |
-| @Builder | Methods | In the decorated method, you can use the declarative UI description to quickly generate multiple layouts in a custom component. |
-| @Extend | Methods | This decorator adds new attribute functions to a preset component, allowing you to quickly define and reuse the custom style of the component. |
-| @CustomDialog | struct | This decorator is used to decorate custom pop-up dialog boxes. |
-| @State | Primitive data types, classes, and arrays | If the decorated state data is modified, the build method of the component will be called to update the UI. |
-| @Prop | Primitive data types | This decorator is used to establish one-way data binding between the parent and child components. When the data associated with the parent component is modified, the UI of the current component is updated. |
-| @Link | Primitive data types, classes, and arrays | This decorator is used to establish two-way data binding between the parent and child components. The internal state data of the parent component is used as the data source. Any changes made to one component will be reflected to the other. |
-| @Observed | Classes | This decorator is used to indicate that the data changes in the class will be managed by the UI page. |
-| @ObjectLink | Objects of @Observed decorated classes | When the decorated state variable is modified, the parent and sibling components that have the state variable will be notified for UI re-rendering. |
-| @Consume | Primitive data types, classes, and arrays | When the @Consume decorated variable detects the update of the @Provide decorated variable, the re-rendering of the current custom component is triggered. |
-| @Provide | Primitive data types, classes, and arrays | As the data provider, @Provide can update the data of child nodes and trigger page rendering. |
-| @Watch | Variables decorated by @State, @Prop, @Link, @ObjectLink, @Provide, @Consume, @StorageProp, or @StorageLink | This decorator is used to listen for the changes of the state variables. The application can register a callback method through @Watch. |
+| Decorator | Decorates... | Description |
+| ------------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| @Component | struct | The decorated structure has the component-based capability. The **build** method must be implemented to update the UI.|
+| @Entry | struct | The decorated component is used as the entry of a page. The component is rendered and displayed when the page is loaded. |
+| @Preview | struct | Custom components decorated by **@Preview** can be previewed in DevEco Studio. When the target page is loaded, the custom components decorated by **@Preview** are created and displayed.|
+| @Builder | Methods | In the decorated method, you can use the declarative UI description to quickly generate multiple layouts in a custom component.|
+| @Extend | Methods | This decorator adds attribute functions to a preset component, allowing you to quickly define and reuse the custom style of the component.|
+| @CustomDialog | struct | This decorator is used to decorate custom pop-up dialog boxes. |
+| @State | Primitive data types, classes, and arrays | If the decorated state data is modified, the **build** method of the component will be called to update the UI. |
+| @Prop | Primitive data types | This decorator is used to establish one-way data binding between the parent and child components. When the data associated with the parent component is modified, the UI of the current component is updated.|
+| @Link | Primitive data types, classes, and arrays | This decorator is used to establish two-way data binding between the parent and child components. The internal state data of the parent component is used as the data source. Any changes made to one component will be reflected to the other.|
+| @Observed | Classes | This decorator is used to indicate that the data changes in the class will be managed by the UI page. |
+| @ObjectLink | Objects of **@Observed** decorated classes | When the decorated state variable is modified, the parent and sibling components that have the state variable will be notified for UI re-rendering.|
+| @Consume | Primitive data types, classes, and arrays | When the **@Consume** decorated variable detects the update of the **@Provide** decorated variable, the re-rendering of the current custom component is triggered.|
+| @Provide | Primitive data types, classes, and arrays | As the data provider, **@Provide** can update the data of child nodes and trigger page rendering.|
+| @Watch | Variables decorated by **@State**, **@Prop**, **@Link**, **@ObjectLink**, **@Provide**, **@Consume**, **@StorageProp**, or **@StorageLink** | This decorator is used to listen for the changes of the state variables. The application can register a callback method through **@Watch**. |
## Chain Call
You can configure the UI structure and its attributes and events and separate them with a dot(.) to implement chain call.
-
-```
+```ts
Column() {
Image('1.jpg')
.alt('error.jpg')
@@ -71,10 +73,9 @@ Column() {
## struct
-Components can be implemented based on structs. Components cannot inherit from each other. The structs implemented components can be created and destroyed more quickly than class implemented components.
+Components can be implemented based on **struct**s. Components cannot inherit from each other. The **struct**s implemented components can be created and destroyed more quickly than **class** implemented components.
-
-```
+```ts
@Component
struct MyComponent {
@State data: string = ''
@@ -87,10 +88,9 @@ struct MyComponent {
## Instantiating a struct Without the new Keyword
-You can omit the new keyword when instantiating a struct.
-
+You can omit the **new** keyword when instantiating a **struct**.
-```
+```ts
// Definition
@Component
struct MyComponent {
@@ -98,7 +98,7 @@ struct MyComponent {
}
}
-// Use
+// Usage
Column() {
MyComponent()
}
@@ -114,23 +114,22 @@ new Column() {
TypeScript has the following restrictions on generators:
-- Expressions can be used only in character strings (${expression}), if conditions, ForEach parameters, and component parameters.
+- Expressions can be used only in character strings (${expression}), **if** conditions, **ForEach** parameters, and component parameters.
-- No expressions should cause any application state variables (@State, @Link, and @Prop) to change. Otherwise, undefined and potentially unstable framework behavior may occur.
+- No expressions should cause any application state variables (**@State**, **@Link**, and **@Prop**) to change. Otherwise, undefined and potentially unstable framework behavior may occur.
- The generator function cannot contain local variables.
-None of the above restrictions apply to anonymous function implementations of event-handling functions (such as onClick)
+None of the above restrictions apply to anonymous function implementations of event-handling functions (such as **onClick**)
Incorrect:
-
-```
+```ts
build() {
let a: number = 1 // invalid: variable declaration not allowed
Column() {
- Text('Hello ${this.myName.toUpperCase()}') // ok.
- ForEach(this.arr.reverse(), ..., ...) // invalid: Array.reverse modifies the @State array varible in place
+ Text(`Hello ${this.myName.toUpperCase()}`) // ok.
+ ForEach(this.arr.reverse(), ..., ...) // invalid: Array.reverse modifies the @State array variable in place
}
buildSpecial() // invalid: no function calls
Text(this.calcTextValue()) // this function call is ok.
@@ -139,11 +138,13 @@ build() {
## $$
-$$ supports two-way binding for simple variables and @State, @Link, and @Prop decorated variables.
+**$$** supports two-way binding for simple variables and **@State**, **@Link**, and **@Prop** decorated variables.
-Currently, $$ supports only the rendering between the show parameter of the bindPopup attribute and the @State decorated variable, and the checked attribute of the \ component.
+Currently, **$$** supports only the rendering between the **show** parameter of the **[bindPopup](../reference/arkui-ts/ts-universal-attributes-popup.md)** attribute and the **@State** decorated variable, and the **checked** attribute of the **\** component.
-```
+
+```ts
+// xxx.ets
@Entry
@Component
struct bindPopup {
@@ -166,3 +167,29 @@ struct bindPopup {
}
```
+## Restrictions on Declaring Multiple Data Types of State Variables
+
+If a **@State**, **@Provide**, **@Link**, or **@Consume** decorated state variable supports multiple data types, they must be all simple data types or references at one time.
+
+Example:
+
+```ts
+@Entry
+@Component
+struct Index {
+ // Incorrect: @State message: string | Resource = 'Hello World'
+ @State message: string = 'Hello World'
+
+ build() {
+ Row() {
+ Column() {
+ Text(`${ this.message }`)
+ .fontSize(50)
+ .fontWeight(FontWeight.Bold)
+ }
+ .width('100%')
+ }
+ .height('100%')
+ }
+}
+```
diff --git a/en/application-dev/ui/ts-types.md b/en/application-dev/ui/ts-types.md
deleted file mode 100644
index ae21d3db3b49db9e89d9d0ede5daf8a174cf91db..0000000000000000000000000000000000000000
--- a/en/application-dev/ui/ts-types.md
+++ /dev/null
@@ -1,168 +0,0 @@
-# Types
-
-## Length Type
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| Length | string \| number | Length unit. If the input is a number, use vp. If the input is a string, explicitly specify the unit, for example, '10px', or specify the length in percentage, for example, '100%'.|
-
-
-## Angle Type
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| Angle | string \| number | Angle unit. If the input is a number, use deg. If the input is a string, use either of the following angle units: - deg: for example, '100deg' - rad: for example, '3.14rad' |
-
-
-## Point Type
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| Point | [Length, Length] | Coordinates of a point. The first value is the x-axis coordinate, and the second value is the y-axis coordinate.|
-
-
-## Color Type
-
-The Color type used by component attribute methods is described as follows:
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| Color | string \| number \| Color | Color information. If the input is a string, use rgb or rgba to specify the color. If the input is a number, use Hex format to specify the color. If the input is a Color enum, use a color value to specify the color. - 'rgb(255, 255, 255)' - 'rgba(255, 255, 255, 1.0)' - Hex format: 0xrrggbb, 0xaarrggbb, '\#FFFFFF' - Enum: Color.Black, Color.White |
-
-
-The supported Color enums are described as follows:
-
-
-| Color| Value| Illustration|
-| -------- | -------- | -------- |
-| Black | 0x000000 |  |
-| Blue | 0x0000ff |  |
-| Brown | 0xa52a2a |  |
-| Gray | 0x808080 |  |
-| Green | 0x008000 |  |
-| Orange | 0xffa500 |  |
-| Pink | 0xffc0cb |  |
-| Red | 0xff0000 |  |
-| White | 0xffffff |  |
-| Yellow | 0xffff00 |  |
-
-
-## ColorStop Type
-
-ColorStop is used to describe the progressive color stop.
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| ColorStop | [Color, number] | Type of the progressive color stop. The first parameter specifies the color value, and the second parameter specifies the ratio of 0 to 1.|
-
-
-## Resource Type
-
-The Resource type is used to reference resources for setting the value of a component attribute.
-
-You can use ` $r ` or ` $rawfile ` to create a Resource object. For details, see [Resource Access](ts-application-resource-access.md).
-
-- ` $r('belonging.type.name') `
-
- ` belonging ` : system or application resource. The value can be 'sys' or 'app'.
-
- ` type ` : resource type, which can be 'color', 'float', 'string', or 'media'.
-
- ` name ` : resource name, which is determined during resource definition.
-
-- ` $rawfile('filename') `
-
- ` filename ` : name of the file in resources/rawfile of the project.
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| Resource | { readonly id: [number]; readonly type: [number]; readonly params?: any[]; } | **id**: resource ID. **type**: resource type (enumerated value). **params**: optional parameters. After a **Resource** object is created using `$r` or `$rawfile`, modifying attribute values of the object is prohibited. |
-
-
-## ResourceStr Type8+
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| ResourceStr | string \| Resource| Resource string.|
-
-
-## ResourceColor Type8+
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| ResourceColor | Color \| number \| string \| Resource | Resource color.|
-
-## Font Type8+
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| Font | { size?: Length; weight?: FontWeight \| number \| string; family?: string \| Resource; style?: FontStyle; } | Text style. **size**: font size. For the number type, use the unit fp. weight: font weight. For the number type, the value ranges from 100 to 900, at an interval of 100. The default value is 400. A larger value indicates a larger font weight. **family**: font family. Use commas (,) to separate multiple fonts. The priority of the fonts is the sequence in which they are placed. An example value is **'Arial, sans-serif'**. **style**: font style. |
-
-## CustomBuilder Type8+
-
-You can use CustomBuilder to define custom UI descriptions in component attribute methods.
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| CustomBuilder | () => any | Builder of component attribute methods for defining custom UI descriptions. This type of method must be decorated by @Builder. For details, see [@Builder](ts-component-based-builder.md).|
-
-
-## Example
-
-```
-@Entry
-@Component
-struct dataTypeExample {
- build() {
- Column({ space: 5 }) {
- Text('Length').fontColor(0xCCCCCC).fontSize(9).width('90%')
- Text('90%').width('90%').height(40).backgroundColor(0xF9CF93)
- .textAlign(TextAlign.Center).fontColor(Color.White)
- Text('320').width(320).height(40).backgroundColor(0xF9CF93)
- .textAlign(TextAlign.Center).fontColor(Color.White)
- Text('1000px').width('1000px').height(40).backgroundColor(0xF9CF93)
- .textAlign(TextAlign.Center).fontColor(Color.White)
-
- Text('Angle').fontColor(0xCCCCCC).fontSize(9).width('90%')
- Text('45deg')
- .width(40).height(40)
- .rotate({ x: 0, y: 0, z: 1, angle: 45, centerX: '50%', centerY: '50%' })
- .fontColor(Color.White)
- .backgroundColor(0xF9CF93).textAlign(TextAlign.Center)
-
- Text('45rad')
- .width(40).height(40)
- .rotate({ x: 0, y: 0, z: 1, angle: '45rad', centerX: '50%', centerY: '50%' })
- .fontColor(Color.White)
- .backgroundColor(0xF9CF93).textAlign(TextAlign.Center).margin({ top: 30 })
-
- Text('Point').fontColor(0xCCCCCC).fontSize(9).width('90%')
- Line().width(300).height(40).startPoint([0, 20]).endPoint([300, 20])
-
- Text('Color').fontColor('#CCCCCC').fontSize(9).width('90%')
- Text('0xF9CF93')
- .fontColor(Color.White).textAlign(TextAlign.Center)
- .width('90%').height(40).backgroundColor(0xF9CF93)
-
- Text('#F9CF93')
- .fontColor(Color.White).textAlign(TextAlign.Center)
- .width('90%').height(40).backgroundColor('#F9CF93')
-
- Text('rgb(249, 207, 147)')
- .fontColor(Color.White).textAlign(TextAlign.Center)
- .width('90%').height(40).backgroundColor('rgb(249, 207, 147)')
-
- Text('rgba(249, 207, 147, 1.0)')
- .fontColor(Color.White).textAlign(TextAlign.Center)
- .width('90%').height(40).backgroundColor('rgba(249, 207, 147, 1.0)')
-
- Text('Color.Yellow')
- .textAlign(TextAlign.Center)
- .width('90%').height(40).backgroundColor(Color.Yellow)
- }
- .width('100%').margin({ top: 5 })
- }
-}
-```
-
-
diff --git a/en/application-dev/ui/ui-js-components-switch.md b/en/application-dev/ui/ui-js-components-switch.md
index 4eeffd99b1bac376b5d8e6db2298ec9232003c70..23d0f4285c18022e383d8734784f5d46e56bf445 100644
--- a/en/application-dev/ui/ui-js-components-switch.md
+++ b/en/application-dev/ui/ui-js-components-switch.md
@@ -9,14 +9,15 @@ The **<switch>** component is used to switch between the on and off states
Create a **<switch>** component in the .hml file under **pages/index**.
-```
+```html
+
```
-```
+```css
/* xxx.css */
.container {
flex-direction: column;
@@ -31,9 +32,9 @@ Create a **<switch>** component in the .hml file under **pages/index**.
## Adding Attributes and Methods
- Use the **textoff** and **showtext** attributes to set the status when text is selected and unselected. Set the **checked** attribute to **true** (indicating that the component is on). Add the **change** event that is triggered when the component status changes. After the event is triggered, the **switchChange** function is executed to obtain the current component status (on or off).
+Use the **textoff** and **showtext** attributes to set the status when text is selected and unselected. Set the **checked** attribute to **true** (indicating that the component is on). Add the **change** event that is triggered when the component status changes. After the event is triggered, the **switchChange** function is executed to obtain the current component status (on or off).
-```
+```html
@@ -41,28 +42,26 @@ Create a **<switch>** component in the .hml file under **pages/index**.
```
-```
+```css
/* xxx.css */
.container {
width: 100%;
- height: 100%;
+ height: 100%;
display: flex;
justify-content: center;
align-items: center;
background-color: #F1F3F5;
}
-switch{
- // Color of the selected text
+switch {
texton-color: #002aff;
- // Color of the unselected text
-textoff-color: silver;
+ textoff-color: silver;
text-padding: 20px;
font-size: 50px;
}
```
-```
+```js
// xxx.js
import prompt from '@system.prompt';
export default {
@@ -84,7 +83,8 @@ export default {

->  **NOTE:**
+> **NOTE**
+>
> The text set by **texton** and **textoff** takes effect only when **showtext** is set to **true**.
@@ -94,7 +94,7 @@ Turn on the switch and the default delivery address is used. When the switch is
Implementation method: Create a **<switch>** component, set the **checked** attribute to **true**, and change the delivery address through data binding. Set the **display** attribute (the default value is **none**). When the switch is turned off and the **display** attribute is set to **flex**, the address module is displayed and clicking the button can change the color.
-```
+```html
@@ -113,11 +113,11 @@ Turn on the switch and the default delivery address is used. When the switch is
```
-```
+```css
/* xxx.css */
.container {
width: 100%;
- height: 100%;
+ height: 100%;
background-color: #F1F3F5;
flex-direction: column;
padding: 50px;
@@ -168,7 +168,7 @@ switch{
```
-```
+```js
// xxx.js
import prompt from '@system.prompt';
export default {
diff --git a/en/application-dev/website.md b/en/application-dev/website.md
index 69c3b77653cc9351de9e2e58c2ee12aebeabbafe..0e86b728c9585957b54f187c9fa2677bd33b2656 100644
--- a/en/application-dev/website.md
+++ b/en/application-dev/website.md
@@ -11,7 +11,6 @@
- Development Fundamentals
- [Application Package Structure Configuration File (FA Model)](quick-start/package-structure.md)
- [Application Package Structure Configuration File (Stage Model)](quick-start/stage-structure.md)
- - [Resource File Categories](quick-start/basic-resource-file-categories.md)
- [SysCap](quick-start/syscap.md)
- Development
- Ability Development
@@ -43,12 +42,11 @@
- [Rules for Accessing Application Code Files](ui/ts-framework-file-access-rules.md)
- ["js" Tag](ui/ts-framework-js-tag.md)
- Resource Access
- - [Accessing Application Resources](ui/ts-application-resource-access.md)
- - [Accessing System Resources](ui/ts-system-resource-access.md)
- - [Media Resource Types](ui/ts-media-resource-type.md)
+ - [Resource File Categories](ui/ui-ts-basic-resource-file-categories.md)
+ - [Accessing Application Resources](ui/ts-resource-access.md)
- [Pixel Units](ui/ts-pixel-units.md)
- - [Types](ui/ts-types.md)
- Declarative Syntax
+
- [Overview](ui/ts-syntax-intro.md)
- General UI Description Specifications
- [Basic Concepts](ui/ts-general-ui-concepts.md)
@@ -180,22 +178,15 @@
- [Custom Components](ui/ui-js-custom-components.md)
- Common Event and Notification
- [Common Event and Notification Overview](notification/notification-brief.md)
- - Common Event
- - [Common Event Development](notification/common-event.md)
- - Notification
- - [Notification Development](notification/notification.md)
- - Debugging Tools
+ - [Common Event Development](notification/common-event.md)
+ - [Notification Development](notification/notification-guidelines.md)
+ - Agent-Powered Scheduled Reminder
+ - [Agent-Powered Scheduled Reminder Overview](notification/background-agent-scheduled-reminder-overview.md)
+ - [Agent-Powered Scheduled Reminder Development](notification/background-agent-scheduled-reminder-guide.md)
- [Debugging Assistant Usage](notification/assistant-guidelines.md)
- Window Manager
- - Window
- - [Window Overview](windowmanager/window-overview.md)
- - [Window Development](windowmanager/window-guidelines.md)
- - Display
- - [Display Overview](windowmanager/display-overview.md)
- - [Display Development](windowmanager/display-guidelines.md)
- - Screenshot
- - [Screenshot Overview](windowmanager/screenshot-overview.md)
- - [Screenshot Development](windowmanager/screenshot-guidelines.md)
+ - [Window Overview](windowmanager/window-overview.md)
+ - [Window Development](windowmanager/window-guidelines.md)
- WebGL
- [WebGL Overview](webgl/webgl-overview.md)
- [WebGL Development](webgl/webgl-guidelines.md)
@@ -212,6 +203,10 @@
- Image
- [Image Development](media/image.md)
- Security
+ - Access Control
+ - [Access Control Overview](security/accesstoken-overview.md)
+ - [Access Control Development](security/accesstoken-guidelines.md)
+ - [Permission List](security/permission-list.md)
- User Authentication
- [User Authentication Overview](security/userauth-overview.md)
- [User Authentication Development](security/userauth-guidelines.md)
@@ -220,9 +215,6 @@
- [HUKS Development](security/huks-guidelines.md)
- hapsigner
- [hapsigner Guide](security/hapsigntool-guidelines.md)
- - Access Control
- - [Access Control Overview](security/accesstoken-overview.md)
- - [Access Control Development](security/accesstoken-guidelines.md)
- Connectivity
- Network Management
- [Network Management Overview](connectivity/net-mgmt-overview.md)
@@ -250,15 +242,13 @@
- Distributed Data Object
- [Distributed Data Object Overview](database/database-distributedobject-overview.md)
- [Distributed Data Object Development](database/database-distributedobject-guidelines.md)
- - Agent-Powered Scheduled Reminders
- - [Agent-Powered Scheduled Reminder Overview](background-agent-scheduled-reminder/background-agent-scheduled-reminder-overview.md)
- - [Agent-Powered Scheduled Reminder Development](background-agent-scheduled-reminder/background-agent-scheduled-reminder-guide.md)
- - Background Task Management
- - [Background Task Management Overview](background-task-management/background-task-overview.md)
- - [Background Task Management Development](background-task-management/background-task-dev-guide.md)
- - Work Scheduler
- - [Work Scheduler Overview](work-scheduler/work-scheduler-overview.md)
- - [Work Scheduler Development](work-scheduler/work-scheduler-dev-guide.md)
+ - Task Management
+ - Background Task Management
+ - [Background Task Management Overview](background-task-management/background-task-overview.md)
+ - [Background Task Management Development](background-task-management/background-task-dev-guide.md)
+ - Work Scheduler
+ - [Work Scheduler Overview](task-management/work-scheduler-overview.md)
+ - [Work Scheduler Development](task-management/work-scheduler-dev-guide.md)
- Device
- USB Service
- [USB Service Overview](device/usb-overview.md)
@@ -292,7 +282,10 @@
- [Internationalization Development (i18n)](internationalization/i18n-guidelines.md)
- Native APIs
- [Using Native APIs in Application Projects](napi/napi-guidelines.md)
-- Tools
+ - [Drawing Development](napi/drawing-guidelines.md)
+ - [Raw File Development](napi/rawfile-guidelines.md)
+ - [NativeWindow Development](napi/native-window-guidelines.md)
+- Tools
- [DevEco Studio (OpenHarmony) User Guide](quick-start/deveco-studio-user-guide-for-openharmony.md)
- Hands-On Tutorials
- [Samples](https://gitee.com/openharmony/app_samples/blob/master/README.md)
@@ -562,8 +555,8 @@
- [@ohos.application.formError](reference/apis/js-apis-formerror.md)
- [@ohos.application.formHost](reference/apis/js-apis-formhost.md)
- [@ohos.application.formInfo](reference/apis/js-apis-formInfo.md)
- - [@ohos.application.missionManager](reference/apis/js-apis-missionManager.md)
- [@ohos.application.formProvider](reference/apis/js-apis-formprovider.md)
+ - [@ohos.application.missionManager](reference/apis/js-apis-missionManager.md)
- [@ohos.ability.particleAbility](reference/apis/js-apis-particleAbility.md)
- [@ohos.application.ServiceExtensionAbility](reference/apis/js-apis-service-extension-ability.md)
- [@ohos.application.StartOptions](reference/apis/js-apis-application-StartOptions.md)
@@ -575,19 +568,23 @@
- [AbilityContext](reference/apis/js-apis-ability-context.md)
- [abilityDelegator](reference/apis/js-apis-application-abilityDelegator.md)
- [abilityDelegatorArgs](reference/apis/js-apis-application-abilityDelegatorArgs.md)
+ - [AbilityManager](reference/apis/js-apis-abilityManager.md)
- [abilityMonitor](reference/apis/js-apis-application-abilityMonitor.md)
- [AbilityRunningInfo](reference/apis/js-apis-abilityrunninginfo.md)
- [AbilityStageContext](reference/apis/js-apis-abilitystagecontext.md)
- [Context](reference/apis/js-apis-application-context.md)
+ - [ExtensionAbilityContext](reference/apis/js-apis-extension-ability-context.md)
+ - [ExtensionAbilityInfo](reference/apis/js-apis-extensionAbilityInfo.md)
- [ExtensionContext](reference/apis/js-apis-extension-context.md)
- [ExtensionRunningInfo](reference/apis/js-apis-extensionrunninginfo.md)
- [FormExtensionContext](reference/apis/js-apis-formextensioncontext.md)
+ - [MissionInfo](reference/apis/js-apis-application-missionInfo.md)
- [MissionSnapshot](reference/apis/js-apis-application-MissionSnapshot.md)
- [PermissionRequestResult](reference/apis/js-apis-permissionrequestresult.md)
- [ProcessRunningInfo](reference/apis/js-apis-processrunninginfo.md)
+ - [ServiceExtAbilityContext](reference/apis/js-apis-serviceExtAbilityContext.md)
- [ServiceExtensionContext](reference/apis/js-apis-service-extension-context.md)
- [shellCmdResult](reference/apis/js-apis-application-shellCmdResult.md)
- - [AbilityStageContext](reference/apis/js-apis-abilityStageContext.md)
- Common Event and Notification
- [@ohos.commonEvent](reference/apis/js-apis-commonEvent.md)
- [@ohos.events.emitter](reference/apis/js-apis-emitter.md)
@@ -598,6 +595,14 @@
- [@ohos.bundle](reference/apis/js-apis-Bundle.md)
- [@ohos.bundleState ](reference/apis/js-apis-deviceUsageStatistics.md)
- [@ohos.zlib](reference/apis/js-apis-zlib.md)
+ - [AbilityInfo](reference/apis/js-apis-bundle-AbilityInfo.md)
+ - [ApplicationInfo](reference/apis/js-apis-bundle-ApplicationInfo.md)
+ - [BundleInfo](reference/apis/js-apis-bundle-BundleInfo.md)
+ - [CustomizeData](reference/apis/js-apis-bundle-CustomizeData.md)
+ - [ExtensionAbilityInfo](reference/apis/js-apis-bundle-ExtensionAbilityInfo.md)
+ - [HapModuleInfo](reference/apis/js-apis-bundle-HapModuleInfo.md)
+ - [Metadata](reference/apis/js-apis-bundle-Metadata.md)
+ - [ModuleInfo](reference/apis/js-apis-bundle-ModuleInfo.md)
- UI Page
- [@ohos.animator](reference/apis/js-apis-animator.md)
- [@ohos.mediaquery](reference/apis/js-apis-mediaquery.md)
@@ -611,7 +616,6 @@
- [webgl2](reference/apis/js-apis-webgl2.md)
- Media
- [@ohos.multimedia.audio](reference/apis/js-apis-audio.md)
- - [@ohos.multimedia.camera](reference/apis/js-apis-camera.md)
- [@ohos.multimedia.image](reference/apis/js-apis-image.md)
- [@ohos.multimedia.media](reference/apis/js-apis-media.md)
- [@ohos.multimedia.medialibrary](reference/apis/js-apis-medialibrary.md)
@@ -635,7 +639,6 @@
- [@ohos.data.distributedData](reference/apis/js-apis-distributed-data.md)
- [@ohos.data.distributedDataObject](reference/apis/js-apis-data-distributedobject.md)
- [@ohos.data.rdb](reference/apis/js-apis-data-rdb.md)
- - [@ohos.settings](reference/apis/js-apis-settings.md)
- [@ohos.data.storage](reference/apis/js-apis-data-storage.md)
- [resultSet](reference/apis/js-apis-data-resultset.md)
- File Management
@@ -643,6 +646,7 @@
- [@ohos.environment](reference/apis/js-apis-environment.md)
- [@ohos.fileio](reference/apis/js-apis-fileio.md)
- [@ohos.fileManager](reference/apis/js-apis-filemanager.md)
+ - [@ohos.securityLabel](reference/apis/js-apis-securityLabel.md)
- [@ohos.statfs](reference/apis/js-apis-statfs.md)
- [@ohos.storageStatistics](reference/apis/js-apis-storage-statistics.md)
- [@ohos.volumeManager](reference/apis/js-apis-volumemanager.md)
@@ -657,12 +661,15 @@
- Network Management
- [@ohos.net.connection](reference/apis/js-apis-net-connection.md)
- [@ohos.net.http](reference/apis/js-apis-http.md)
- - [@ohos.request](reference/apis/js-apis-request.md)
- [@ohos.net.socket](reference/apis/js-apis-socket.md)
- [@ohos.net.webSocket](reference/apis/js-apis-webSocket.md)
+ - [@ohos.request](reference/apis/js-apis-request.md)
- Connectivity
- [@ohos.bluetooth](reference/apis/js-apis-bluetooth.md)
- [@ohos.connectedTag](reference/apis/js-apis-connectedTag.md)
+ - [@ohos.nfc.cardEmulation](reference/apis/js-apis-cardEmulation.md)
+ - [@ohos.nfc.controller](reference/apis/js-apis-nfcController.md)
+ - [@ohos.nfc.tag](reference/apis/js-apis-nfcTag.md)
- [@ohos.rpc](reference/apis/js-apis-rpc.md)
- [@ohos.wifi](reference/apis/js-apis-wifi.md)
- [@ohos.wifiext](reference/apis/js-apis-wifiext.md)
@@ -681,6 +688,7 @@
- [@ohos.screenLock](reference/apis/js-apis-screen-lock.md)
- [@ohos.systemTime](reference/apis/js-apis-system-time.md)
- [@ohos.wallpaper](reference/apis/js-apis-wallpaper.md)
+ - [console](reference/apis/js-apis-logs.md)
- [Timer](reference/apis/js-apis-timer.md)
- Device Management
- [@ohos.batteryInfo ](reference/apis/js-apis-battery-info.md)
@@ -695,6 +703,7 @@
- [@ohos.power](reference/apis/js-apis-power.md)
- [@ohos.runningLock](reference/apis/js-apis-runninglock.md)
- [@ohos.sensor](reference/apis/js-apis-sensor.md)
+ - [@ohos.settings](reference/apis/js-apis-settings.md)
- [@ohos.systemParameter](reference/apis/js-apis-system-parameter.md)
- [@ohos.thermal](reference/apis/js-apis-thermal.md)
- [@ohos.update](reference/apis/js-apis-update.md)
@@ -751,4 +760,3 @@
- [@system.sensor](reference/apis/js-apis-system-sensor.md)
- [@system.storage](reference/apis/js-apis-system-storage.md)
- [@system.vibrator](reference/apis/js-apis-system-vibrate.md)
- - [console](reference/apis/js-apis-logs.md)
\ No newline at end of file
diff --git a/en/application-dev/windowmanager/Readme-EN.md b/en/application-dev/windowmanager/Readme-EN.md
index 188b3d734af30592e6a886093e8193636cae6357..815370f404a70555c2811d6dba01f8adb45a947a 100644
--- a/en/application-dev/windowmanager/Readme-EN.md
+++ b/en/application-dev/windowmanager/Readme-EN.md
@@ -1,12 +1,5 @@
# Window Manager
-* Window
- * [Window Overview](window-overview.md)
- * [Window Development](window-guidelines.md)
-* Display
- * [Display Overview](display-overview.md)
- * [Display Development](display-guidelines.md)
-* Screenshot
- * [Screenshot Overview](screenshot-overview.md)
- * [Screenshot Development](screenshot-guidelines.md)
+- [Window Overview](window-overview.md)
+- [Window Development](window-guidelines.md)
diff --git a/en/application-dev/windowmanager/display-guidelines.md b/en/application-dev/windowmanager/display-guidelines.md
deleted file mode 100644
index 46fe89f6ceab7768187a5a2f0f5a342208d4715b..0000000000000000000000000000000000000000
--- a/en/application-dev/windowmanager/display-guidelines.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Display Development
-
-## When to Use
-
-An application can obtain the default display object or all display objects by calling the **Display** APIs.
-
-## Available APIs
-
-For details about the APIs, see [Display](../reference/apis/js-apis-display.md).
-
-## How to Develop
-
-Call **getDefaultDisplay(): Promise\** to obtain the default display object. An example code snippet is as follows:
-
-```js
-import display from '@ohos.display' // Import the module.
-
-let disp; // disp is used to save the default display object.
-display.getDefaultDisplay().then((disp) => {
- console.log('display.getDefaultDisplay success, display :' + JSON.stringify(disp));
-}, (err) => {
- console.log('display.getDefaultDisplay failed, error : ' + JSON.stringify(err));
-})
-```
diff --git a/en/application-dev/windowmanager/display-overview.md b/en/application-dev/windowmanager/display-overview.md
deleted file mode 100644
index 702ff0961e6111f0d73f16f81e52cf7fcaca444f..0000000000000000000000000000000000000000
--- a/en/application-dev/windowmanager/display-overview.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Display Overview
-
-The **Display** APIs present the window layout of an application. The display attributes include the display ID, name, active status, state, refresh rate, rotation angle, width, height, pixel density, font scaling factor, and exact physical dots per inch.
-
-## Basic Concepts
-
-**Display**: a screen visible to an application. It can be used as a window container. It is an abstract concept that is different from a physical screen.
diff --git a/en/application-dev/windowmanager/screenshot-guidelines.md b/en/application-dev/windowmanager/screenshot-guidelines.md
deleted file mode 100644
index a5023d76ec0645511de1c9a0a5f39779363a5729..0000000000000000000000000000000000000000
--- a/en/application-dev/windowmanager/screenshot-guidelines.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Screenshot Development
-
-## When to Use
-
-You can specify a display device to take screenshots, with screenshot parameters specified.
-
-## Available APIs
-
-For details about the APIs, see [Screenshot](../reference/apis/js-apis-screenshot.md).
-
-## How to Develop
-
-Call **save(options?: ScreenshotOptions): Promise** to take a screenshot. In this API, **options** is a predefined screenshot parameter. If **options** is unspecified, the entire screen is captured by default. An example code snippet is as follows:
-
-```js
-import screenshot from '@ohos.screenshot' // Import the module.
-
-// Set screenshot parameters.
-var ScreenshotOptions = {
- "screenRect": {
- "left": 200,
- "top": 100,
- "width": 200,
- "height": 200},
- "imageSize": {
- "width": 300,
- "height": 300},
- "rotation": 0
-};
-
-let image; // image is used to save the screenshot.
-screenshot.save(ScreenshotOptions).then((image) => {
- console.log('screenshot.save success, screenshot image :' + JSON.stringify(image));
-}, (err) => {
- console.log('screenshot.save failed, error : ' + JSON.stringify(err));
-})
-```
diff --git a/en/application-dev/windowmanager/screenshot-overview.md b/en/application-dev/windowmanager/screenshot-overview.md
deleted file mode 100644
index 8f1a485a711e031dfc9762fb803d41c55c4380fd..0000000000000000000000000000000000000000
--- a/en/application-dev/windowmanager/screenshot-overview.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Screenshot Overview
-
-The screenshot APIs, with parameters, enable you to take screenshots on display devices.
-
-## Basic Concepts
-
-Screenshot: provides the screenshot capability.
diff --git a/en/device-dev/driver/driver-platform-uart-des.md b/en/device-dev/driver/driver-platform-uart-des.md
index 20340bfd49d68136a9ca711cca35ca5c2cdb0834..3ddb92b532569df4718931c9c3ca32b7e7e010c1 100644
--- a/en/device-dev/driver/driver-platform-uart-des.md
+++ b/en/device-dev/driver/driver-platform-uart-des.md
@@ -1,156 +1,86 @@
-# UART
+# UART
-## Overview
-The Universal Asynchronous Receiver/Transmitter \(UART\) is a universal serial data bus used for asynchronous communication. It enables bi-directional communication between devices in full-duplex mode.
+## Overview
+
+The Universal Asynchronous Receiver/Transmitter (UART) is a universal serial data bus used for asynchronous communication. It enables bi-directional communication between devices in full-duplex mode.
+
UART is widely used to print information for debugging or to connect to various external modules such as GPS and Bluetooth.
-A UART is connected to other modules through two wires \(as shown in [Figure 1](#fig68294715408)\) or four wires \(as shown in [Figure 2](#fig179241542163112)\).
-- TX: TX pin of the transmitting UART. It is connected to the RX pin of the peer UART.
-- RX: RX pin of the receiving UART. It is connected to the TX pin of the peer UART.
-- RTS: Request to Send signal pin. It is connected to the CTS pin of the peer UART and is used to indicate whether the local UART is ready to receive data.
-- CTS: Clear to Send signal pin. It is connected to the RTS pin of the peer UART and is used to indicate whether the local UART is allowed to send data to the peer end.
-
- **Figure 1** 2-wire UART communication
- 
-
- **Figure 2** 4-wire UART communication
- 
-
-
-The transmitting and receiving UARTs must ensure that they have the same settings on particular attributes such as the baud rate and data format \(start bit, data bit, parity bit, and stop bit\) before they start to communicate. During data transmission, a UART sends data to the peer end over the TX pin and receives data from the peer end over the RX pin. When the size of the buffer used by a UART for storing received data reaches the preset threshold, the RTS signal of the UART changes to **1** \(data cannot be received\), and the peer UART stops sending data to it because its CTS signal does not allow it to send data.
-
-
-## Available APIs
-
-The UART interface defines a set of common functions for operating a UART port, including obtaining and releasing device handles, reading and writing data of a specified length, and obtaining and setting the baud rate, as well as the device attributes.
-
-**Table 1** APIs for the UART driver
-
-
-
Capability
-
-
Function
-
-
Description
-
-
-
-
Obtaining and releasing device handles
-
-
-
UartOpen
-
-
Obtains the UART device handle.
-
-
-
UartClose
-
-
Releases a specified UART device handle.
-
-
-
Reading and writing data
-
-
-
UartRead
-
-
Reads data of a specified length from a UART device.
-
-
-
UartWrite
-
-
Writes data of a specified length into a UART device.
-
-
-
Obtaining and setting the baud rate
-
-
UartGetBaud
-
-
Obtains the UART baud rate.
-
-
-
UartSetBaud
-
-
Sets the UART baud rate.
-
-
-
Obtaining and setting device attributes
-
-
-
UartGetAttribute
-
-
Obtains the UART device attributes.
-
-
-
UartSetAttribute
-
-
Sets the UART device attributes.
-
-
-
Setting the transmission mode
-
-
UartSetTransMode
-
-
Sets the UART transmission mode.
-
-
-
-
-
-> **NOTE**
->All functions provided in this document can be called only in kernel space.
-
-## Usage Guidelines
-
-### How to Use
+
+A UART is connected to other modules through two wires (as shown in Figure 1) or four wires (as shown in Figure 2).
+ - TX: TX pin of the transmitting UART. It is connected to the RX pin of the peer UART.
+ - RX: RX pin of the receiving UART. It is connected to the TX pin of the peer UART.
+ - RTS: Request to Send signal pin. It is connected to the CTS pin of the peer UART and is used to indicate whether the local UART is ready to receive data.
+ - CTS: Clear to Send signal pin. It is connected to the RTS pin of the peer UART and is used to indicate whether the local UART is allowed to send data to the peer end.
+
+ **Figure 1** Two-wire UART communication
+
+ 
+
+ **Figure 2** Four-wire UART communication
+
+ 
+
+- The transmitting and receiving UARTs must ensure that they have the same settings on particular attributes such as the baud rate and data format (start bit, data bit, parity bit, and stop bit) before they start to communicate. During data transmission, a UART sends data to the peer end over the TX pin and receives data from the peer end over the RX pin. When the size of the buffer used by a UART for storing received data reaches the preset threshold, the RTS signal of the UART changes to **1** (data cannot be received), and the peer UART stops sending data to it because its CTS signal does not allow it to send data.
+
+- The UART interface defines a set of common functions for operating a UART port, including obtaining and releasing device handles, reading and writing data of a specified length, and obtaining and setting the baud rate, as well as the device attributes.
+
+
+## Available APIs
+
+ **Table 1** UART driver APIs
+
+| API| Description|
+| -------- | -------- |
+| UartOpen | Obtains a UART device handle.|
+| UartClose | Releases a UART device handle.|
+| UartRead | Reads data of the specified length from a UART device.|
+| UartWrite | Writes data of the specified length to a UART device.|
+| UartGetBaud | Obtains the UART baud rate.|
+| UartSetBaud | Sets the UART baud rate.|
+| UartGetAttribute | Obtains UART device attributes.|
+| UartSetAttribute | Sets UART device attributes.|
+| UartSetTransMode | Sets the UART transmission mode.|
+
+>  **NOTE**
+> All APIs described in this document can be called only in kernel mode.
+
+
+## Usage Guidelines
+
+
+### How to Use
The figure below illustrates how to use the APIs.
-**Figure 3** Using UART driver APIs
-
-
-### Obtaining a UART Device Handle
-
-Before performing UART communication, call **UartOpen** to obtain a UART device handle. This function returns the pointer to the UART device handle with a specified port number.
-
-DevHandle UartOpen\(uint32\_t port\);
-
-**Table 2** Description of UartOpen
-
-
-
Parameter
-
-
Description
-
-
-
-
port
-
-
UART port number.
-
-
-
Return Value
-
-
Description
-
-
-
NULL
-
-
Failed to obtain the UART device handle.
-
-
-
Device handle
-
-
UART device handle.
-
-
-
-
-
-The following example shows how to obtain a UART device handle based on the assumption that the UART port number is **3**:
-
-```
-DevHandle handle = NULL; /* The UART device handle */
-uint32_t port = 3; /* UART port number */
+ **Figure 3** Using UART driver APIs
+
+ 
+
+
+### Opening a UART Device Handle
+
+Before performing UART communication, call **UartOpen** to obtain a UART device handle. This function returns the pointer to the UART device handle with the specified port number.
+
+
+```
+DevHandle UartOpen(uint32_t port);
+```
+
+ **Table 2** Description of UartOpen
+
+| Parameter| Description|
+| -------- | -------- |
+| port | UART port number.|
+| **Return Value**| **Description**|
+| NULL | The operation failed.|
+| Device handle| The operation is successful. The obtained UART device handle is returned.|
+
+ Example: Obtain the device handle of UART port 3.
+
+```
+DevHandle handle = NULL; /* UART device handle */
+uint32_t port = 3; /* UART port number */
handle = UartOpen(port);
if (handle == NULL) {
HDF_LOGE("UartOpen: failed!\n");
@@ -158,51 +88,29 @@ if (handle == NULL) {
}
```
-### Setting the UART Baud Rate
-
-After obtaining the UART device handle, set the UART baud rate by calling the following function:
-
-int32\_t UartSetBaud\(DevHandle handle, uint32\_t baudRate\);
-
-**Table 3** Description of UartSetBaud
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
baudRate
-
-
Baud rate of the UART to set.
-
-
-
Return Value
-
-
Description
-
-
-
0
-
-
Succeeded in setting the UART baud rate.
-
-
-
Negative value
-
-
Failed to set the UART baud rate.
-
-
-
-
-
-The following example shows how to set the UART baud rate to **9600**:
+### Setting the UART Baud Rate
+
+Call **UartSetBaud()** to set the UART baud rate.
+
+
+```
+int32_t UartSetBaud(DevHandle handle, uint32_t baudRate);
+```
+
+ **Table 3** Description of UartSetBaud
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| baudRate | Baud rate to set.|
+| **Return Value**| **Description**|
+| 0 | The operation is successful.|
+| Negative value| The operation failed.|
+
+Example: Set the UART baud rate to **9600**.
+
+
```
int32_t ret;
/* Set the UART baud rate to 9600. */
@@ -212,51 +120,29 @@ if (ret != 0) {
}
```
-### Obtaining the UART Baud Rate
-
-After setting the UART baud rate, obtain the current baud rate by calling the following function:
-
-int32\_t UartGetBaud\(DevHandle handle, uint32\_t \*baudRate\);
-
-**Table 4** Description of UartGetBaud
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
baudRate
-
-
Pointer to the UART baud rate.
-
-
-
Return Value
-
-
Description
-
-
-
0
-
-
Succeeded in obtaining the UART baud rate.
-
-
-
Negative value
-
-
Failed to obtain the UART baud rate.
-
-
-
-
-
-The following example shows how to obtain the UART baud rate:
+### Obtaining the UART Baud Rate
+
+Call **UartGetBaud()** to obtain the UART baud rate.
+
+
+```
+int32_t UartGetBaud(DevHandle handle, uint32_t *baudRate);
+```
+
+ **Table 4** Description of UartGetBaud
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| baudRate | Pointer to the UART baud rate obtained.|
+| **Return Value**| **Description**|
+| 0 | The operation is successful.|
+| Negative value| The operation failed.|
+
+Example: Obtain the UART baud rate.
+
+
```
int32_t ret;
uint32_t baudRate;
@@ -267,168 +153,102 @@ if (ret != 0) {
}
```
-### Setting the UART Device Attributes
-
-Before performing UART communication, set the UART device attributes by calling the following function:
-
-int32\_t UartSetAttribute\(DevHandle handle, struct UartAttribute \*attribute\);
-
-**Table 5** Description of UartSetAttribute
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
attribute
-
-
Pointer to the UART device attributes to set.
-
-
-
Return Value
-
-
Description
-
-
-
0
-
-
Succeeded in setting the UART device attributes.
-
-
-
Negative value
-
-
Failed to set the UART device attributes.
-
-
-
-
-
-The following example shows how to set the UART device attributes:
+### Setting UART Device Attributes
+
+Call **UartSetAttribute()** to set UART device attributes.
+
+
+```
+int32_t UartSetAttribute(DevHandle handle, struct UartAttribute *attribute);
+```
+
+ **Table 5** Description of UartSetAttribute
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| attribute | Pointer to the UART device attributes to set.|
+| **Return Value**| **Description**|
+| 0 | The operation is successful.|
+| Negative value| The operation failed.|
+
+Example: Set UART device attributes.
+
+
```
int32_t ret;
struct UartAttribute attribute;
-attribute.dataBits = UART_ATTR_DATABIT_7; /* Set the number of data bits to 7. */
-attribute.parity = UART_ATTR_PARITY_NONE; /* Set the parity bit to no parity. */
+attribute.dataBits = UART_ATTR_DATABIT_7; /* Enable 7 bits to be transferred each time. */
+attribute.parity = UART_ATTR_PARITY_NONE; /* Disable parity check. */
attribute.stopBits = UART_ATTR_STOPBIT_1; /* Set the stop bit to 1. */
attribute.rts = UART_ATTR_RTS_DIS; /* Disable the RTS signal. */
attribute.cts = UART_ATTR_CTS_DIS; /* Disable the CTS signal. */
attribute.fifoRxEn = UART_ATTR_RX_FIFO_EN; /* Enable RX FIFO. */
attribute.fifoTxEn = UART_ATTR_TX_FIFO_EN; /* Enable TX FIFO. */
-/* Set the UART device attributes. */
+/* Set UART device attributes. */
ret = UartSetAttribute(handle, &attribute);
if (ret != 0) {
HDF_LOGE("UartSetAttribute: failed, ret %d\n", ret);
}
```
-### Obtaining UART Device Attributes
-
-After setting the UART device attributes, obtain the current device attributes by calling the following function:
-
-int32\_t UartGetAttribute\(DevHandle handle, struct UartAttribute \*attribute\);
-
-**Table 6** Description of UartGetAttribute
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
attribute
-
-
Pointer to the UART device attributes.
-
-
-
Return Value
-
-
Description
-
-
-
0
-
-
Succeeded in obtaining the UART device attributes.
-
-
-
Negative value
-
-
Failed to obtain the UART device attributes.
-
-
-
-
-
-The following example shows how to obtain the UART device attributes:
+### Obtaining UART Device Attributes
+
+Call **UartGetAttribute()** to obtain the current UART device attributes.
+
+
+```
+int32_t UartGetAttribute(DevHandle handle, struct UartAttribute *attribute);
+```
+
+ **Table 6** Description of UartGetAttribute
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| attribute | Pointer to the UART device attributes obtained.|
+| **Return Value**| **Description**|
+| 0 | The operation is successful.|
+| Negative value| The operation failed.|
+
+Example: Obtain UART device attributes.
+
+
```
int32_t ret;
struct UartAttribute attribute;
-/* Obtain the UART attributes. */
+/* Obtain UART device attributes. */
ret = UartGetAttribute(handle, &attribute);
if (ret != 0) {
HDF_LOGE("UartGetAttribute: failed, ret %d\n", ret);
}
```
-### Setting the UART Transmission Mode
-
-Before performing UART communication, set the UART transmission mode by calling the following function:
-
-int32\_t UartSetTransMode\(DevHandle handle, enum UartTransMode mode\);
-
-**Table 7** Description of UartSetTransMode
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
mode
-
-
UART transmission mode to set.
-
-
-
Return Value
-
-
Description
-
-
-
0
-
-
Succeeded in setting the UART transmission mode.
-
-
-
Negative value
-
-
Failed to set the UART transmission mode.
-
-
-
-
-
-The following example shows how to set the transmission mode to **UART\_MODE\_RD\_BLOCK**:
+### Setting the UART Transmission Mode
+
+Call **UartSetTransMode()** to set the UART transmission mode.
+
+
+```
+int32_t UartSetTransMode(DevHandle handle, enum UartTransMode mode);
+```
+
+ **Table 7** Description of UartSetTransMode
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| mode | UART transmission mode to set.|
+| **Return Value**| **Description**|
+| 0 | The operation is successful.|
+| Negative value| The operation failed.|
+
+Example: Set the UART transmission mode to **UART_MODE_RD_BLOCK**.
+
+
```
int32_t ret;
/* Set the UART transmission mode. */
@@ -438,116 +258,64 @@ if (ret != 0) {
}
```
-### Writing Data of a Specified Length into a UART Device
-
-To write data into a UART device, call the following function:
-
-int32\_t UartWrite\(DevHandle handle, uint8\_t \*data, uint32\_t size\);
-
-**Table 8** Description of UartWrite
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
data
-
-
Pointer to the data to write.
-
-
-
size
-
-
Length of the data to write.
-
-
-
Return Value
-
-
Description
-
-
-
0
-
-
Succeeded in writing data into the UART device.
-
-
-
Negative value
-
-
Failed to write data into the UART device.
-
-
-
-
-
-The following example shows how to write data of a specified length into the UART device:
+### Writing Data to a UART Device
+
+Call **UartWrite()** to write data of the specified length to a UART device.
+
+
+```
+int32_t UartWrite(DevHandle handle, uint8_t *data, uint32_t size);
+```
+
+ **Table 8** Description of UartWrite
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| data | Pointer to the data to write.|
+| size | Length of the data to write.|
+| **Return Value**| **Description**|
+| 0 | The operation is successful.|
+| Negative value| The operation failed.|
+
+Example: Write data to a UART device.
+
+
```
int32_t ret;
uint8_t wbuff[5] = {1, 2, 3, 4, 5};
-/* Write 5-byte data into the UART device. */
+/* Write 5-byte data to the UART device. */
ret = UartWrite(handle, wbuff, 5);
if (ret != 0) {
HDF_LOGE("UartWrite: failed, ret %d\n", ret);
}
```
-### Reading Data of a Specified Length from a UART Device
-
-To write data into a UART device, call the following function:
-
-int32\_t UartRead\(DevHandle handle, uint8\_t \*data, uint32\_t size\);
-
-**Table 9** Description of UartRead
-
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
data
-
-
Pointer to the buffer for receiving the data.
-
-
-
size
-
-
Length of the data to read.
-
-
-
Return Value
-
-
Description
-
-
-
Non-negative value
-
-
Length of the data read from the UART device.
-
-
-
Negative value
-
-
Failed to read data from the UART device.
-
-
-
-
-
-The following example shows how to read data of a specified length from the UART device:
+### Reading Data from a UART Device
+
+Call **UartRead()** to read data of the specified length from a UART device.
+
+
+```
+int32_t UartRead(DevHandle handle, uint8_t *data, uint32_t size);
+```
+
+ **Table 9** Description of UartRead
+
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle.|
+| data | Pointer to the buffer for receiving the data.|
+| size | Length of the data to read.|
+| **Return Value**| **Description**|
+| Non-negative value| The operation is successful. The length of the data read is returned.|
+| Negative value| The operation failed.|
+
+Example: Read data of the specified length from a UART device.
+
+
```
int32_t ret;
uint8_t rbuff[5] = {0};
@@ -558,44 +326,39 @@ if (ret < 0) {
}
```
-> **CAUTION:**
->Data is successfully read from the UART device if a non-negative value is returned. If the return value is **0**, no valid data can be read from the UART device. If the return value is greater than **0**, the return value is the length of the data actually read from the UART device. The length is less than or equal to the value of **size** and does not exceed the maximum length of data to read at a time specified by the UART controller in use.
+>  **CAUTION**
+> Data is successfully read from the UART device if a non-negative value is returned. If **0** is returned, no valid data can be read from the UART device. A value greater than **0** indicates the length of the data read from the UART device. The data length must be less than or equal to the value of **size** and cannot exceed the maximum length of the data to read at a time specified by the UART controller in use.
-### Destroying the UART Device Handle
-After the UART communication, destroy the UART device handle by calling the following function:
+### Closing a UART Device Handle
-void UartClose\(DevHandle handle\);
+Call **UartClose()** to close a UART device handle.
-This function will release the resources previously obtained.
+
+```
+void UartClose(DevHandle handle);
+```
-**Table 10** Description of UartClose
+This function releases the resources requested by **UartOpen**.
-
-
Parameter
-
-
Description
-
-
-
-
handle
-
-
UART device handle.
-
-
-
-
+ **Table 10** Description of UartClose
-The following example shows how to destroy the UART device handle:
+| Parameter| Description|
+| -------- | -------- |
+| handle | UART device handle to close.|
+Example: Close a UART device handle.
+
+
```
-UartClose(handle); /* Destroy the UART device handle. */
+UartClose(handle); /* Close the UART device handle. */
```
-## Usage Example
-The following is a usage example of a UART device, including how to obtain the UART device handle, set the baud rate, device attributes, and transmission mode, read data from or write data into the UART device, and then destroy the UART device handle.
+## Example
+ The following example shows how to open a UART device handle, set the baud rate, device attributes, and transmission mode, read data from or write data into the UART device, and then close the UART device handle.
+
```
#include "hdf_log.h"
#include "uart_if.h"
@@ -608,16 +371,16 @@ void UartTestSample(void)
uint8_t wbuff[5] = { 1, 2, 3, 4, 5 };
uint8_t rbuff[5] = { 0 };
struct UartAttribute attribute;
- attribute.dataBits = UART_ATTR_DATABIT_7; /* Set the number of data bits to 7. */
- attribute.parity = UART_ATTR_PARITY_NONE; /* Set the parity bit to no parity. */
+ attribute.dataBits = UART_ATTR_DATABIT_7; /* Enable 7 bits to be transferred each time. */
+ attribute.parity = UART_ATTR_PARITY_NONE; /* Disable parity check. */
attribute.stopBits = UART_ATTR_STOPBIT_1; /* Set the stop bit to 1. */
attribute.rts = UART_ATTR_RTS_DIS; /* Disable the RTS signal. */
attribute.cts = UART_ATTR_CTS_DIS; /* Disable the CTS signal. */
attribute.fifoRxEn = UART_ATTR_RX_FIFO_EN; /* Enable RX FIFO. */
attribute.fifoTxEn = UART_ATTR_TX_FIFO_EN; /* Enable TX FIFO. */
- /* Set the UART port number actually used. */
+ /* Enter the UART port number. */
port = 1;
- /* Obtain the UART device handle. */
+ /* Open the UART device handle based on the port number. */
handle = UartOpen(port);
if (handle == NULL) {
HDF_LOGE("UartOpen: failed!\n");
@@ -629,7 +392,7 @@ void UartTestSample(void)
HDF_LOGE("UartSetBaud: failed, ret %d\n", ret);
goto _ERR;
}
- /* Set the UART device attributes. */
+ /* Set UART device attributes. */
ret = UartSetAttribute(handle, &attribute);
if (ret != 0) {
HDF_LOGE("UartSetAttribute: failed, ret %d\n", ret);
@@ -641,7 +404,7 @@ void UartTestSample(void)
HDF_LOGE("UartSetTransMode: failed, ret %d\n", ret);
goto _ERR;
}
- /* Write 5-byte data into the UART device. */
+ /* Write 5-byte data to the UART device. */
ret = UartWrite(handle, wbuff, 5);
if (ret != 0) {
HDF_LOGE("UartWrite: failed, ret %d\n", ret);
@@ -654,7 +417,7 @@ void UartTestSample(void)
goto _ERR;
}
_ERR:
- /* Destroy the UART device handle. */
+ /* Close the UART device handle. */
UartClose(handle);
}
-```
\ No newline at end of file
+```
diff --git a/en/device-dev/driver/driver-platform-uart-develop.md b/en/device-dev/driver/driver-platform-uart-develop.md
index 5f5e3d25e3f8c801251fac77286bcc45489df717..cf3393d01505ceccb7c34b643a9ce218f148ce6c 100644
--- a/en/device-dev/driver/driver-platform-uart-develop.md
+++ b/en/device-dev/driver/driver-platform-uart-develop.md
@@ -14,7 +14,7 @@ In the Hardware Driver Foundation (HDF), the Universal Asynchronous Receiver/Tra
**UartHostMethod**:
-
+
```
struct UartHostMethod {
int32_t (*Init)(struct UartHost *host);
@@ -32,18 +32,18 @@ struct UartHostMethod {
**Table 1** Description of the callback functions in UartHostMethod
-| Function| Input Parameter| Output Parameter| Return Value| Description|
+| Function| Input Parameter| Output Parameter| Return Value| Description|
| -------- | -------- | -------- | -------- | -------- |
-| Init | **host**: structure pointer to the UART controller at the core layer.| –| HDF_STATUS| Initializes a UART device.|
-| Deinit | **host**: structure pointer to the UART controller at the core layer.| –| HDF_STATUS| Deinitializes a UART device.|
-| Read | **host**: structure pointer to the UART controller at the core layer. **size**: data size, which is of the uint32_t type.| **data**: pointer to the output data. The value is of the uint8_t type.| HDF_STATUS| Reads data.|
-| Write | **host**: structure pointer to the UART controller at the core layer. **data**: pointer to the input data. The value is of the uint8_t type. **size**: data size, which is of the uint32_t type.| –| HDF_STATUS| Writes data.|
-| SetBaud | **host**: structure pointer to the UART controller at the core layer. **baudRate**: pointer to the input baud rate. The value is of the uint32_t type. | –| HDF_STATUS| Sets the baud rate.|
-| GetBaud | **host**: structure pointer to the UART controller at the core layer.| **baudRate**: pointer to the output baud rate. The value is of the uint32_t type.| HDF_STATUS| Obtains the current baud rate.|
-| GetAttribute | **host**: structure pointer to the UART controller at the core layer.| **attribute**: structure pointer to the UART attributes. For details, see **UartAttribute** in **uart_if.h**.| HDF_STATUS| Obtains UART attributes.|
-| SetAttribute | **host**: structure pointer to the UART controller at the core layer. **attribute**: structure pointer to the UART attributes to set.| –| HDF_STATUS| Sets UART attributes.|
-| SetTransMode | **host**: structure pointer to the UART controller at the core layer. **mode**: transfer mode to set. For details, see **UartTransMode** in **uart_if.h**.| –| HDF_STATUS| Sets the UART transfer mode.|
-| PollEvent | **host**: structure pointer to the UART controller at the core layer. **filep**: void pointer to a file. **table**: void pointer to poll_table.| –| HDF_STATUS| Polls for pending events.|
+| Init | **host**: structure pointer to the UART controller at the core layer.| –| HDF_STATUS| Initializes a UART device.|
+| Deinit | **host**: structure pointer to the UART controller at the core layer.| –| HDF_STATUS| Deinitializes a UART device.|
+| Read | **host**: structure pointer to the UART controller at the core layer. **size**: data size, which is of the uint32_t type.| **data**: pointer to the data read. The value is of the uint8_t type. | HDF_STATUS| Reads data.|
+| Write | **host**: structure pointer to the UART controller at the core layer. **data**: pointer to the data to write. The value is of the uint8_t type. **size**: data size, which is of the uint32_t type. | –| HDF_STATUS| Writes data.|
+| SetBaud | **host**: structure pointer to the UART controller at the core layer. **baudRate**: pointer to the baud rate to set. The value is of the uint32_t type. | –| HDF_STATUS| Sets the baud rate.|
+| GetBaud | **host**: structure pointer to the UART controller at the core layer.| **baudRate**: pointer to the baud rate obtained. The value is of the uint32_t type. | HDF_STATUS| Obtains the current baud rate.|
+| GetAttribute | **host**: structure pointer to the UART controller at the core layer.| **attribute**: structure pointer to the attribute obtained. For details, see **UartAttribute** in **uart_if.h**. | HDF_STATUS| Obtains UART attributes.|
+| SetAttribute | **host**: structure pointer to the UART controller at the core layer. **attribute**: structure pointer to the attribute to set. | –| HDF_STATUS| Sets UART attributes.|
+| SetTransMode | **host**: structure pointer to the UART controller at the core layer. **mode**: transfer mode to set. For details, see **UartTransMode** in **uart_if.h**.| –| HDF_STATUS| Sets the UART transfer mode.|
+| PollEvent | **host**: structure pointer to the UART controller at the core layer. **filep**: void pointer to a file. **table**: void pointer to poll_table.| –| HDF_STATUS| Polls for pending events.|
## How to Develop
@@ -61,10 +61,11 @@ The UART module adaptation involves the following steps:
3. Instantiate the UART controller object.
- Initialize **UartHost**.
- Instantiate **UartHostMethod** in the **UartHost** object.
- >  **NOTE**
+ >  **NOTE**
> For details about the functions in **UartHostMethod**, see [Available APIs](#available-apis).
-4. Debug the driver.
+4. Debug the driver.
+
(Optional) For new drivers, verify the basic functions, such as the UART status control and response to interrupts.
@@ -72,11 +73,16 @@ The UART module adaptation involves the following steps:
The following uses **uart_hi35xx.c** as an example to present the information required for implementing device functions.
-1. Instantiate the driver entry. The driver entry must be a global variable of the **HdfDriverEntry** type (defined in **hdf_device_desc.h**), and the value of **moduleName** must be the same as that in **device_info.hcs**. In the HDF, the start address of each **HdfDriverEntry** object of all loaded drivers is collected to form a segment address space similar to an array for the upper layer to invoke.
+1. Instantiate the driver entry.
+
+ The driver entry must be a global variable of the **HdfDriverEntry** type (defined in **hdf_device_desc.h**), and the value of **moduleName** must be the same as that in **device_info.hcs**.
+
+ In the HDF, the start address of each **HdfDriverEntry** object of all loaded drivers is collected to form a segment address space similar to an array for the upper layer to invoke.
+
Generally, the HDF calls the **Bind** function and then the **Init** function to load a driver. If **Init** fails to be called, the HDF calls **Release** to release driver resources and exit.
- UART driver entry example:
-
+ UART driver entry example:
+
```
struct HdfDriverEntry g_hdfUartDevice = {
.moduleVersion = 1,
@@ -89,11 +95,15 @@ The following uses **uart_hi35xx.c** as an example to present the information re
HDF_INIT(g_hdfUartDevice);
```
-2. Add the **deviceNode** information to the **device_info.hcs** file and configure the device attributes in the **uart_config.hcs** file. The **deviceNode** information is related to registration of the driver entry. The device attribute values are closely related to the default values or value ranges of the **UartHost** members at the core layer.
- In this example, there is only one UART controller. If there are multiple UART controllers, you need to add the **deviceNode** information to the **device_info** file and add the corresponding device attributes to the **uart_config** file for each controller.
- - **device_info.hcs** configuration example
+2. Add the **deviceNode** information to the **device_info.hcs** file and configure the device attributes in the **uart_config.hcs** file.
+
+ The **deviceNode** information is related to registration of the driver entry. The device attribute values are closely related to the default values or value ranges of the **UartHost** members at the core layer.
+
+ In this example, there is only one UART controller. If there are multiple UART controllers, you need to add the **deviceNode** information to the **device_info** file and add the corresponding device attributes to the **uart_config** file for each controller.
+
+ - **device_info.hcs** configuration example:
-
+
```
root {
device_info {
@@ -103,11 +113,11 @@ The following uses **uart_hi35xx.c** as an example to present the information re
priority = 50;
device_uart :: device {
device0 :: deviceNode {
- policy = 1; // The driver publishes services only for kernel-mode processes.
- priority = 40; // Driver startup priority.
- permission = 0644; // Permission for the driver to create a device node.
- moduleName = "HDF_PLATFORM_UART"; // Driver name, which must be the same as moduleName in the HdfDriverEntry structure.
- serviceName = "HDF_PLATFORM_UART_0";// Unique name of the service published by the driver. The name is in the HDF_PLATFORM_UART_X format. X indicates the UART controller number.
+ policy = 1; // The driver publishes services only for kernel-mode processes.
+ priority = 40; // Driver startup priority.
+ permission = 0644; // Permission for the driver to create a device node.
+ moduleName = "HDF_PLATFORM_UART"; // Driver name, which must be the same as moduleName in the HdfDriverEntry structure.
+ serviceName = "HDF_PLATFORM_UART_0"; // Unique name of the service published by the driver. The name is in the HDF_PLATFORM_UART_X format. X indicates the UART controller number.
deviceMatchAttr = "hisilicon_hi35xx_uart_0"; // Keyword for matching the private data of the driver. The value must be the same as that of match_attr in the private data configuration table of the driver.
}
device1 :: deviceNode {
@@ -127,20 +137,20 @@ The following uses **uart_hi35xx.c** as an example to present the information re
- **uart_config.hcs** configuration example
-
+
```
root {
platform {
- template uart_controller { // Template configuration. In the template, you can configure the common parameters shared by device nodes.
+ template uart_controller { // Template configuration. In the template, you can configure the common parameters shared by device nodes.
match_attr = "";
- num = 0; // (Mandatory) Device number
- baudrate = 115200; // (Mandatory) Baud rate. Set the value based on service requirements.
- fifoRxEn = 1; // (Mandatory) Enable FIFOs to be received.
- fifoTxEn = 1; // (Mandatory) Enable FIFOs to be transferred.
- flags = 4; // (Mandatory) Flag signal.
- regPbase = 0x120a0000; // (Mandatory) Used for address mapping.
- interrupt = 38; // (Mandatory) Interrupt number.
- iomemCount = 0x48; // (Mandatory) Used for address mapping.
+ num = 0; // (Mandatory) Device number.
+ baudrate = 115200; // (Mandatory) Baud rate. Set the value based on service requirements.
+ fifoRxEn = 1; // (Mandatory) Enable FIFOs to be received.
+ fifoTxEn = 1; // (Mandatory) Enable FIFOs to be transferred.
+ flags = 4; // (Mandatory) Flag signal.
+ regPbase = 0x120a0000; // (Mandatory) Used for address mapping.
+ interrupt = 38; // (Mandatory) Interrupt number.
+ iomemCount = 0x48; // (Mandatory) Used for address mapping.
}
controller_0x120a0000 :: uart_controller {
match_attr = "hisilicon_hi35xx_uart_0";// (Mandatory) The value must be the same as that of deviceMatchAttr of the corresponding device in device_info.hcs.
@@ -159,43 +169,44 @@ The following uses **uart_hi35xx.c** as an example to present the information re
```
3. Initialize the **UartHost** object at the core layer, including defining a custom structure (to pass parameters and data) and implementing the **HdfDriverEntry** member functions (**Bind**, **Init**, and **Release**) to instantiate **UartHostMethod** in **UartHost** (so that the underlying driver functions can be called).
+
- Defining a custom structure
To the driver, the custom structure holds parameters and data. The **DeviceResourceIface** method provided by the HDF reads the values in the **uart_config.hcs** file to initialize the members in the custom structure and passes important parameters, such as the device number, to the **UartHost** object at the core layer.
-
+
```
- struct UartPl011Port { // Interface structure
+ struct UartPl011Port { // Interface structure
int32_t enable;
- unsigned long physBase; // Physical address
+ unsigned long physBase; // Physical address
uint32_t irqNum; // Interrupt number
- uint32_t defaultBaudrate;// Default baud rate
- uint32_t flags; // Flags related to the following three macros.
+ uint32_t defaultBaudrate; // Default baud rate
+ uint32_t flags; // Flags related to the following three macros
#define PL011_FLG_IRQ_REQUESTED (1 << 0)
#define PL011_FLG_DMA_RX_REQUESTED (1 << 1)
#define PL011_FLG_DMA_TX_REQUESTED (1 << 2)
- struct UartDmaTransfer *rxUdt; // DMA transfer
- struct UartDriverData *udd; // The data structure is defined as follows:
+ struct UartDmaTransfer *rxUdt; // DMA transfer
+ struct UartDriverData *udd; // The data structure is defined as follows:
};
- struct UartDriverData { // Structure related to data transfer
+ struct UartDriverData { // Structure related to data transfer
uint32_t num;
- uint32_t baudrate; // Baud rate (configurable)
- struct UartAttribute attr; // Attributes, such as the data bit and stop bit, related to data transfer
- struct UartTransfer *rxTransfer; // Buffer (FIFO structure)
- wait_queue_head_t wait; // Queuing signal related to conditional variables
- int32_t count; // Data count
- int32_t state; // UART controller state
+ uint32_t baudrate; // Baud rate (configurable)
+ struct UartAttribute attr; // Attributes, such as the data bit and stop bit, related to data transfer.
+ struct UartTransfer *rxTransfer; // Buffer (FIFO structure)
+ wait_queue_head_t wait; // Queuing signal related to conditional variables
+ int32_t count; // Data count
+ int32_t state; // UART controller state
#define UART_STATE_NOT_OPENED 0
#define UART_STATE_OPENING 1
#define UART_STATE_USEABLE 2
#define UART_STATE_SUSPENDED 3
- uint32_t flags; // Status flags
+ uint32_t flags; // Status flags
#define UART_FLG_DMA_RX (1 << 0)
#define UART_FLG_DMA_TX (1 << 1)
#define UART_FLG_RD_BLOCK (1 << 2)
- RecvNotify recv; // Pointer to the function that receives serial port data
- struct UartOps *ops; // Custom function pointer structure. For details, see device/hisilicon/drivers/uart/uart_pl011.c.
- void *private; // It stores the pointer to the start address of UartPl011Port for easy invocation.
+ RecvNotify recv; // Pointer to the function that receives serial port data.
+ struct UartOps *ops; // Custom function pointer structure. For details, see device/hisilicon/drivers/uart/uart_pl011.c.
+ void *private; // It stores the pointer to the start address of UartPl011Port for easy invocation.
};
// UartHost is the controller structure at the core layer. The Init function assigns values to the members of UartHost.
@@ -205,12 +216,13 @@ The following uses **uart_hi35xx.c** as an example to present the information re
uint32_t num;
OsalAtomic atom;
void *priv; // It stores the pointer to the start address of the vendor's custom structure for easy invocation.
- struct UartHostMethod *method; // Hook at the core layer. You need to implement and instantiate its member functions.
+ struct UartHostMethod *method; // Hook at the core layer. You need to implement and instantiate its member functions.
};
```
+
- Instantiating **UartHostMethod** in **UartHost** (other members are initialized by **Bind**)
-
+
```
// Example in uart_hi35xx.c: instantiate the hook.
struct UartHostMethod g_uartHostMethod = {
@@ -229,30 +241,30 @@ The following uses **uart_hi35xx.c** as an example to present the information re
- **Bind** function
- Input parameter:
+ **Input parameter**:
**HdfDeviceObject**, an interface parameter exposed by the driver, contains the .hcs information.
- Return value:
+ **Return value**:
- HDF_STATUS The table below describes some status. For more information, see **HDF_STATUS** in the **/drivers/framework/include/utils/hdf_base.h** file.
+ **HDF_STATUS** The table below describes some status. For more information, see **HDF_STATUS** in the **/drivers/framework/include/utils/hdf_base.h** file.
- **Table 2** HDF_STATUS
+ **Table 2** Description of HDF_STATUS
- | Status| Description|
+ | Status| Description|
| -------- | -------- |
- | HDF_ERR_INVALID_OBJECT | Invalid controller object.|
- | HDF_ERR_MALLOC_FAIL | Failed to allocate memory.|
- | HDF_ERR_INVALID_PARAM | Invalid parameter.|
- | HDF_ERR_IO | I/O error.|
- | HDF_SUCCESS | Initialization successful.|
- | HDF_FAILURE | Initialization failed.|
+ | HDF_ERR_INVALID_OBJECT | Invalid controller object.|
+ | HDF_ERR_MALLOC_FAIL | Failed to allocate memory.|
+ | HDF_ERR_INVALID_PARAM | Invalid parameter.|
+ | HDF_ERR_IO | I/O error.|
+ | HDF_SUCCESS | Initialization successful.|
+ | HDF_FAILURE | Initialization failed.|
- Function description:
+ **Function description**:
Initializes the custom structure object and **UartHost**.
-
+
```
//uart_hi35xx.c
static int32_t HdfUartDeviceBind(struct HdfDeviceObject *device)
@@ -267,10 +279,10 @@ The following uses **uart_hi35xx.c** as an example to present the information re
...
host = (struct UartHost *)OsalMemCalloc(sizeof(*host));// Allocate memory.
...
- host->device = device; // (Mandatory) Prerequisites for conversion between HdfDeviceObject and UartHost
- device->service = &(host->service; // (Mandatory) Prerequisites for conversion between HdfDeviceObject and UartHost
- host->device->service->Dispatch = UartIoDispatch;// Assign values to Dispatch of service.
- OsalAtomicSet(&host->atom, 0); // Initialize or set the atomic services.
+ host->device = device; // (Mandatory) Prerequisites for conversion between HdfDeviceObject and UartHost.
+ device->service = &(host->service; // (Mandatory) Prerequisites for conversion between HdfDeviceObject and UartHost.
+ host->device->service->Dispatch = UartIoDispatch; // Assign values to Dispatch of service.
+ OsalAtomicSet(&host->atom, 0); // Initialize or set the atomic services.
host->priv = NULL;
host->method = NULL;
return host;
@@ -279,19 +291,19 @@ The following uses **uart_hi35xx.c** as an example to present the information re
- **Init** function
- Input parameter:
+ **Input parameter**:
**HdfDeviceObject**, an interface parameter exposed by the driver, contains the .hcs information.
- Return value:
+ **Return value**:
- HDF_STATUS
+ **HDF_STATUS**
- Function description:
+ **Function description**:
Initializes the custom structure object and **UartHost**, calls the **artAddDev** function at the core layer, and connects to the VFS.
-
+
```
int32_t HdfUartDeviceInit(struct HdfDeviceObject *device)
{
@@ -303,7 +315,7 @@ The following uses **uart_hi35xx.c** as an example to present the information re
...
ret = Hi35xxAttach(host, device); // Initialize the UartHost object.
...
- host->method = &g_uartHostMethod; // Hook the UartHostMethod instance.
+ host->method = &g_uartHostMethod; // Attach the UartHostMethod instance.
return ret;
}
// Initialize UartHost.
@@ -351,30 +363,34 @@ The following uses **uart_hi35xx.c** as an example to present the information re
```
- **Release** function
- Input parameter:
+ **Input parameter**:
**HdfDeviceObject**, an interface parameter exposed by the driver, contains the .hcs information.
- Return value:
+ **Return value**:
No value is returned.
- Function description:
+ **Function description**:
- Releases the memory and deletes the controller. This function assigns values to the **Release** API in the driver entry structure. When the HDF fails to call the **Init** function to initialize the driver, the **Release** function can be called to release driver resources. All forced conversion operations for obtaining the corresponding object can be successful only when **Init()** has the corresponding value assignment operations.
+ Releases the memory and deletes the controller. This function assigns values to the **Release** API in the driver entry structure. When the HDF fails to call the **Init** function to initialize the driver, the **Release** function can be called to release driver resources.
-
+ >  **NOTE**
+ >
+ > All forced conversion operations for obtaining the corresponding object can be successful only when **Init()** has the corresponding value assignment operations.
+
+
```
void HdfUartDeviceRelease(struct HdfDeviceObject *device)
{
struct UartHost *host = NULL;
...
- host = UartHostFromDevice(device);// Forcibly convert HdfDeviceObject to UartHost by using service. For details about the value assignment, see the Bind function.
+ host = UartHostFromDevice(device); // Forcibly convert HdfDeviceObject to UartHost by using service. For details about the value assignment, see the Bind function.
...
if (host->priv != NULL) {
- Hi35xxDetach(host); // Customized memory release function.
+ Hi35xxDetach(host); // Customized memory release function.
}
- UartHostDestroy(host); // Call the function of the core layer to release the host.
+ UartHostDestroy(host); // Call the function of the core layer to release the host.
}
static void Hi35xxDetach(struct UartHost *host)
@@ -382,10 +398,10 @@ The following uses **uart_hi35xx.c** as an example to present the information re
struct UartDriverData *udd = NULL;
struct UartPl011Port *port = NULL;
...
- udd = host->priv; // Convert UartHost to UartDriverData.
+ udd = host->priv; // The conversion from UartHost to UartDriverData is involved.
...
- UartRemoveDev(host);// Remove the VFS.
- port = udd->private;// Convert UartDriverData to UartPl011Port.
+ UartRemoveDev (host); // Remove the VFS.
+ port = udd->private; // The conversion from UartDriverData to UartPl011Port is involved.
if (port != NULL) {
if (port->physBase != 0) {
OsalIoUnmap((void *)port->physBase);// Unmap addresses.
@@ -393,7 +409,7 @@ The following uses **uart_hi35xx.c** as an example to present the information re
OsalMemFree(port);
udd->private = NULL;
}
- OsalMemFree(udd);//Release UartDriverData.
+ OsalMemFree (udd); // Release UartDriverData.
host->priv = NULL;
}
```
diff --git a/en/device-dev/kernel/Readme-EN.md b/en/device-dev/kernel/Readme-EN.md
index b7b289d4c0a9814fed92f8829618077b7588f2ad..95febb036584eac502f0d68923f2cac2f0a43fe2 100644
--- a/en/device-dev/kernel/Readme-EN.md
+++ b/en/device-dev/kernel/Readme-EN.md
@@ -19,13 +19,13 @@
- [Software Timer](kernel-mini-basic-soft.md)
- Extended Components
- [C++ Support](kernel-mini-extend-support.md)
- - [PUP](kernel-mini-extend-cpup.md)
+ - [CPUP](kernel-mini-extend-cpup.md)
- [Dynamic Loading](kernel-mini-extend-dynamic-loading.md)
- - [File System](kernel-mini-extend-file.md)
+ - File System
- [FAT](kernel-mini-extend-file-fat.md)
- [LittleFS](kernel-mini-extend-file-lit.md)
- Kernel Debugging
- - [Memory Debugging](kernel-mini-memory-debug.md)
+ - Memory Debugging
- [Memory Information Statistics](kernel-mini-memory-debug-mes.md)
- [Memory Leak Check](kernel-mini-memory-debug-det.md)
- [Memory Corruption Check](kernel-mini-memory-debug-cet.md)
@@ -52,25 +52,25 @@
- Memory Management
- [Heap Memory Management](kernel-small-basic-memory-heap.md)
- [Physical Memory Management](kernel-small-basic-memory-physical.md)
- - [Virtual Memory Management](kernel-small-basic-memory-virtual.md)
- - [Virtual-to-Physical Mapping](kernel-small-basic-inner-reflect.md)
+ - [Virtual Memory Management](kernel-small-basic-memory-virtual.md)
+ - [Virtual-to-Physical Mapping](kernel-small-basic-inner-reflect.md)
- Kernel Communication Mechanisms
- [Event](kernel-small-basic-trans-event.md)
- - [Semaphore](kernel-small-basic-trans-semaphore.md)
- - [Mutex](kernel-small-basic-trans-mutex.md)
+ - [Semaphore](kernel-small-basic-trans-semaphore.md)
+ - [Mutex](kernel-small-basic-trans-mutex.md)
- [Queue](kernel-small-basic-trans-queue.md)
- [RW Lock](kernel-small-basic-trans-rwlock.md)
- [Futex](kernel-small-basic-trans-user-mutex.md)
- [Signal](kernel-small-basic-trans-user-signal.md)
- [Time Management](kernel-small-basic-time.md)
- - [Software Timer](kernel-small-basic-softtimer.md)
- - [Atomic Operation](kernel-small-basic-atomic.md)
+ - [Software Timer](kernel-small-basic-softtimer.md)
+ - [Atomic Operation](kernel-small-basic-atomic.md)
- Extension Components
- [System Call](kernel-small-bundles-system.md)
- [Dynamic Loading and Linking](kernel-small-bundles-linking.md)
- [Virtual Dynamic Shared Object](kernel-small-bundles-share.md)
- [LiteIPC](kernel-small-bundles-ipc.md)
- - [File Systems](kernel-small-bundles-fs.md)
+ - File Systems
- [Virtual File System](kernel-small-bundles-fs-virtual.md)
- Supported File Systems
- [FAT](kernel-small-bundles-fs-support-fat.md)
@@ -160,7 +160,7 @@
- [Working Principles](kernel-small-debug-user-function.md)
- Usage
- [Available APIs](kernel-small-debug-user-guide-api.md)
- - [How to Use](kernel-small-debug-user-guide-use.md)
+ - How to Use
- [Calling APIs](kernel-small-debug-user-guide-use-api.md)
- [Using the CLI](kernel-small-debug-user-guide-use-cli.md)
- [Typical Memory Problems](kernel-small-debug-user-faqs.md)
diff --git a/en/device-dev/kernel/public_sys-resources/icon-caution.gif b/en/device-dev/kernel/public_sys-resources/icon-caution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e90d7cfc2193e39e10bb58c38d01a23f045d571
Binary files /dev/null and b/en/device-dev/kernel/public_sys-resources/icon-caution.gif differ
diff --git a/en/device-dev/kernel/public_sys-resources/icon-danger.gif b/en/device-dev/kernel/public_sys-resources/icon-danger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e90d7cfc2193e39e10bb58c38d01a23f045d571
Binary files /dev/null and b/en/device-dev/kernel/public_sys-resources/icon-danger.gif differ
diff --git a/en/device-dev/kernel/public_sys-resources/icon-note.gif b/en/device-dev/kernel/public_sys-resources/icon-note.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6314297e45c1de184204098efd4814d6dc8b1cda
Binary files /dev/null and b/en/device-dev/kernel/public_sys-resources/icon-note.gif differ
diff --git a/en/device-dev/kernel/public_sys-resources/icon-notice.gif b/en/device-dev/kernel/public_sys-resources/icon-notice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..86024f61b691400bea99e5b1f506d9d9aef36e27
Binary files /dev/null and b/en/device-dev/kernel/public_sys-resources/icon-notice.gif differ
diff --git a/en/device-dev/kernel/public_sys-resources/icon-tip.gif b/en/device-dev/kernel/public_sys-resources/icon-tip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..93aa72053b510e456b149f36a0972703ea9999b7
Binary files /dev/null and b/en/device-dev/kernel/public_sys-resources/icon-tip.gif differ
diff --git a/en/device-dev/kernel/public_sys-resources/icon-warning.gif b/en/device-dev/kernel/public_sys-resources/icon-warning.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e90d7cfc2193e39e10bb58c38d01a23f045d571
Binary files /dev/null and b/en/device-dev/kernel/public_sys-resources/icon-warning.gif differ
diff --git a/en/device-dev/quick-start/Readme-EN.md b/en/device-dev/quick-start/Readme-EN.md
index 2afa83a8d1a6e0ea5e79f97018044f86e1be3a1f..fbc9be315ede9a6f23b2b7dba92c0d2df7be9b46 100644
--- a/en/device-dev/quick-start/Readme-EN.md
+++ b/en/device-dev/quick-start/Readme-EN.md
@@ -19,9 +19,8 @@
- [Burning](quickstart-ide-lite-steps-hi3516-burn.md)
- [Running](quickstart-ide-lite-steps-hi3516-running.md)
- Appendix
- - Introduction to Development Boards
- - [Introduction to the Hi3861 Development Board](quickstart-ide-lite-introduction-hi3861.md)
- - [Introduction to the Hi3516 Development Board](quickstart-ide-lite-introduction-hi3516.md)
+ - [Introduction to the Hi3861 Development Board](quickstart-ide-lite-introduction-hi3861.md)
+ - [Introduction to the Hi3516 Development Board](quickstart-ide-lite-introduction-hi3516.md)
- Getting Started with Mini and Small Systems (Installation Package Mode)
- [Mini and Small System Overview](quickstart-lite-overview.md)
- [Environment Preparation](quickstart-lite-env-setup.md)
@@ -67,9 +66,8 @@
- [Burning](quickstart-ide-standard-running-rk3568-burning.md)
- [Running](quickstart-ide-standard-running-rk3568-running.md)
- Appendix
- - Introduction to Development Boards
- - [Introduction to the Hi3516 Development Board](quickstart-ide-standard-board-introduction-hi3516.md)
- - [Introduction to the RK3568 Development Board](quickstart-ide-standard-board-introduction-rk3568.md)
+ - [Introduction to the Hi3516 Development Board](quickstart-ide-standard-board-introduction-hi3516.md)
+ - [Introduction to the RK3568 Development Board](quickstart-ide-standard-board-introduction-rk3568.md)
- Getting Started with Standard System (Installation Package Mode)
- [Standard System Overview](quickstart-standard-overview.md)
- [Setting Up Environments for Standard System](quickstart-standard-env-setup.md)
diff --git a/zh-cn/application-dev/database/database-mdds-guidelines.md b/zh-cn/application-dev/database/database-mdds-guidelines.md
index e0d7dec04939ad98fc08acbaade047545a77a597..46ef54dafa6d3044c7a966afc6eb2f4c283a4f1d 100644
--- a/zh-cn/application-dev/database/database-mdds-guidelines.md
+++ b/zh-cn/application-dev/database/database-mdds-guidelines.md
@@ -14,13 +14,13 @@
| 接口名称 | 描述 |
| ------------------------------------------------------------ | ----------------------------------------------- |
-| createKVManager(config:KVManagerConfig,callback:AsyncCallback<KVManager>):void createKVManager(config:KVManagerConfig):Promise<KVManager> | 创建一个`KVManager`对象实例,用于管理数据库对象。 |
-| getKVStore<TextendsKVStore>(storeId:string,options:Options,callback:AsyncCallback<T>):void getKVStore<TextendsKVStore>(storeId:string,options:Options):Promise<T> | 指定`Options`和`storeId`,创建并获取`KVStore`数据库。 |
-| put(key:string,value:Uint8Array\|string\|number\|boolean,callback:AsyncCallback<void>):void put(key:string,value:Uint8Array\|string\|number\|boolean):Promise<void> | 插入和更新数据。 |
-| delete(key:string,callback:AsyncCallback<void>):void delete(key:string):Promise<void> | 删除数据。 |
-| get(key:string,callback:AsyncCallback<Uint8Array\|string\|boolean\|number>):void get(key:string):Promise<Uint8Array\|string\|boolean\|number> | 查询数据。 |
-| on(event:'dataChange',type:SubscribeType,observer:Callback<ChangeNotification>):void on(event:'syncComplete',syncCallback:Callback<Array<[string,number]>>):void | 订阅数据库中数据的变化。 |
-| sync(deviceIdList:string[],mode:SyncMode,allowedDelayMs?:number):void | 在手动模式下,触发数据库同步。 |
+| createKVManager(config: KVManagerConfig, callback: AsyncCallback<KVManager>): void createKVManager(config: KVManagerConfig): Promise<KVManager> | 创建一个`KVManager`对象实例,用于管理数据库对象。 |
+| getKVStore<TextendsKVStore>(storeId: string, options: Options, callback: AsyncCallback<T>): void getKVStore<TextendsKVStore>(storeId: string, options: Options): Promise<T> | 指定`Options`和`storeId`,创建并获取`KVStore`数据库。 |
+| put(key: string, value: Uint8Array\|string\|number\|boolean, callback: AsyncCallback<void>): void put(key: string, value: Uint8Array\|string\|number\|boolean): Promise<void> | 插入和更新数据。 |
+| delete(key: string, callback: AsyncCallback<void>): void delete(key: string): Promise<void> | 删除数据。 |
+| get(key: string, callback: AsyncCallback<Uint8Array\|string\|boolean\|number>): void get(key: string): Promise<Uint8Array\|string\|boolean\|number> | 查询数据。 |
+| on(event: 'dataChange', type: SubscribeType, observer: Callback<ChangeNotification>): void on(event: 'syncComplete', syncCallback: Callback<Array<[string,number]>>): void | 订阅数据库中数据的变化。 |
+| sync(deviceIdList: string[], mode: SyncMode, allowedDelayMs?: number): void | 在手动模式下,触发数据库同步。 |
@@ -34,8 +34,40 @@
```js
import distributedData from '@ohos.data.distributedData';
```
+2. 请求权限(同步操作时进行该步骤)。
-2. 根据配置构造分布式数据库管理类实例。
+ 需要在`config.json`文件里进行配置请求权限,示例代码如下:
+
+ ```json
+ {
+ "module": {
+ "reqPermissions": [
+ {
+ "name": "ohos.permission.DISTRIBUTED_DATASYNC"
+ }
+ ]
+ }
+ }
+ ```
+ 这个权限还需要在应用首次启动的时候弹窗获取用户授权,可以通过如下代码实现:
+
+ ```js
+ import featureAbility from '@ohos.ability.featureAbility';
+
+ function grantPermission() {
+ console.info('grantPermission');
+ let context = featureAbility.getContext();
+ context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, function (result) {
+ console.info(`result.requestCode=${result.requestCode}`)
+
+ })
+ console.info('end grantPermission');
+ }
+
+ grantPermission();
+ ```
+
+3. 根据配置构造分布式数据库管理类实例。
1. 根据应用上下文创建`kvManagerConfig`对象。
2. 创建分布式数据库管理器实例。
@@ -64,7 +96,7 @@
}
```
-3. 获取/创建分布式数据库。
+4. 获取/创建分布式数据库。
1. 声明需要创建的分布式数据库ID描述。
2. 创建分布式数据库,建议关闭自动同步功能(`autoSync:false`),需要同步时主动调用`sync`接口。
@@ -98,7 +130,7 @@
>
> 组网设备间同步数据的场景,建议在应用启动时打开分布式数据库,获取数据库的句柄。在该句柄(如示例中的`kvStore`)的生命周期内无需重复创建数据库,可直接使用句柄对数据库进行数据的插入等操作。
-4. 订阅分布式数据变化。
+5. 订阅分布式数据变化。
以下为订阅单版本分布式数据库数据变化通知的代码示例:
```js
@@ -107,7 +139,7 @@
});
```
-5. 将数据写入分布式数据库。
+6. 将数据写入分布式数据库。
1. 构造需要写入分布式数据库的`Key`(键)和`Value`(值)。
2. 将键值数据写入分布式数据库。
@@ -130,7 +162,7 @@
}
```
-6. 查询分布式数据库数据。
+7. 查询分布式数据库数据。
1. 构造需要从单版本分布式数据库中查询的`Key`(键)。
2. 从单版本分布式数据库中获取数据。
@@ -155,7 +187,7 @@
}
```
-7. 同步数据到其他设备。
+8. 同步数据到其他设备。
选择同一组网环境下的设备以及同步模式,进行数据同步。
diff --git a/zh-cn/application-dev/database/database-mdds-overview.md b/zh-cn/application-dev/database/database-mdds-overview.md
index e7deb637988db378e9e6bf20e32df1f6e408d4a7..43e5b331ba150ee646bdd7cfe44ffc1351965cb8 100644
--- a/zh-cn/application-dev/database/database-mdds-overview.md
+++ b/zh-cn/application-dev/database/database-mdds-overview.md
@@ -9,65 +9,69 @@
## 基本概念
-- **KV数据模型**
- “KV数据模型”是“Key-Value数据模型”的简称,“Key-Value”即“键-值”;其数据以键值对的形式进行组织、索引和存储。
+### KV数据模型
- KV数据模型适合不涉及过多数据关系和业务关系的业务数据存储,比SQL数据库存储拥有更好的读写性能,同时因其在分布式场景中降低了解决数据库版本兼容问题的复杂度,和数据同步过程中冲突解决的复杂度而被广泛使用。分布式数据库也是基于KV数据模型,对外提供KV类型的访问接口。
+“KV数据模型”是“Key-Value数据模型”的简称,“Key-Value”即“键-值”;其数据以键值对的形式进行组织、索引和存储。
-- **分布式数据库事务性**
- 分布式数据库事务支持本地事务(和传统数据库的事务概念一致)和同步事务。同步事务是指在设备之间同步数据时,以本地事务为单位进行同步,一次本地事务的修改要么都同步成功,要么都同步失败。
+KV数据模型适合不涉及过多数据关系和业务关系的业务数据存储,比SQL数据库存储拥有更好的读写性能,同时因其在分布式场景中降低了解决数据库版本兼容问题的复杂度,和数据同步过程中冲突解决的复杂度而被广泛使用。分布式数据库也是基于KV数据模型,对外提供KV类型的访问接口。
-- **分布式数据库一致性**
- 在分布式场景中一般会涉及多个设备,组网内设备之间看到的数据是否一致称为分布式数据库的一致性。分布式数据库一致性可以分为**强一致性**、**弱一致性**和**最终一致性**。
+### 分布式数据库事务性
- - **强一致性**:是指某一设备成功增、删、改数据后,组网内设备对该数据的读取操作都将得到更新后的值。
- - **弱一致性**:是指某一设备成功增、删、改数据后,组网内设备可能读取到本次更新数据,也可能读取不到,不能保证在多长时间后每个设备的数据一定是一致的。
- - **最终一致性**:是指某一设备成功增、删、改数据后,组网内设备可能读取不到本次更新数据,但在某个时间窗口之后组网内设备的数据能够达到一致状态。
+分布式数据库事务支持本地事务(和传统数据库的事务概念一致)和同步事务。同步事务是指在设备之间同步数据时,以本地事务为单位进行同步,一次本地事务的修改要么都同步成功,要么都同步失败。
- 强一致性对分布式数据的管理要求非常高,在服务器的分布式场景可能会遇到。因为移动终端设备的不常在线、以及无中心的特性,分布式数据服务不支持强一致性,只支持最终一致性。
+### 分布式数据库一致性
-- **分布式数据库同步**
- 底层通信组件完成设备发现和认证,会通知上层应用程序(包括分布式数据服务)设备上线。收到设备上线的消息后分布式数据服务可以在两个设备之间建立加密的数据传输通道,利用该通道在两个设备之间进行数据同步。
+在分布式场景中一般会涉及多个设备,组网内设备之间看到的数据是否一致称为分布式数据库的一致性。分布式数据库一致性可以分为**强一致性**、**弱一致性**和**最终一致性**。
- 分布式数据服务提供了两种同步方式:**手动同步**和**自动同步**。
+- **强一致性**:是指某一设备成功增、删、改数据后,组网内设备对该数据的读取操作都将得到更新后的值。
+- **弱一致性**:是指某一设备成功增、删、改数据后,组网内设备可能读取到本次更新数据,也可能读取不到,不能保证在多长时间后每个设备的数据一定是一致的。
+- **最终一致性**:是指某一设备成功增、删、改数据后,组网内设备可能读取不到本次更新数据,但在某个时间窗口之后组网内设备的数据能够达到一致状态。
- - **手动同步**:由应用程序调用sync接口来触发,需要指定同步的设备列表和同步模式。同步模式分为PULL_ONLY(将远端数据拉到本端)、PUSH_ONLY(将本端数据推送到远端)和PUSH_PULL(将本端数据推送到远端同时也将远端数据拉取到本端)。内部接口支持按条件过滤同步,将符合条件的数据同步到远端。
- - **自动同步**:包括全量同步和按条件订阅同步。全量同步由分布式数据库自动将本端数据推送到远端,同时也将远端数据拉取到本端来完成数据同步,同步时机包括设备上线、应用程序更新数据等,应用不需要主动调用sync接口;内部接口支持按条件订阅同步,将远端符合订阅条件的数据自动同步到本端。
+强一致性对分布式数据的管理要求非常高,在服务器的分布式场景可能会遇到。因为移动终端设备的不常在线、以及无中心的特性,分布式数据服务不支持强一致性,只支持最终一致性。
-- **单版本分布式数据库**
- 单版本是指数据在本地保存是以单个KV条目为单位的方式保存,对每个Key最多只保存一个条目项,当数据在本地被用户修改时,不管它是否已经被同步出去,均直接在这个条目上进行修改。同步也以此为基础,按照它在本地被写入或更改的顺序将当前最新一次修改逐条同步至远端设备。
+### 分布式数据库同步
-- **设备协同分布式数据库**
- 设备协同分布式数据库建立在单版本分布式数据库之上,对应用程序存入的KV数据中的Key前面拼接了本设备的DeviceID标识符,这样能保证每个设备产生的数据严格隔离,底层按照设备的维度管理这些数据,设备协同分布式数据库支持以设备的维度查询分布式数据,但是不支持修改远端设备同步过来的数据。
+底层通信组件完成设备发现和认证,会通知上层应用程序(包括分布式数据服务)设备上线。收到设备上线的消息后分布式数据服务可以在两个设备之间建立加密的数据传输通道,利用该通道在两个设备之间进行数据同步。
-- **分布式数据库冲突解决策略**
- 分布式数据库多设备提交冲突场景,在给提交冲突做合并的过程中,如果多个设备同时修改了同一数据,则称这种场景为数据冲突。数据冲突采用默认冲突解决策略(Last-write-wins),基于提交时间戳,取时间戳较大的提交数据,当前不支持定制冲突解决策略。
+分布式数据服务提供了两种同步方式:**手动同步**和**自动同步**。
-- **数据库Schema化管理与谓词查询**
- 单版本数据库支持在创建和打开数据库时指定Schema,数据库根据Schema定义感知KV记录的Value格式,以实现对Value值结构的检查,并基于Value中的字段实现索引建立和谓词查询。
+- **手动同步**:由应用程序调用sync接口来触发,需要指定同步的设备列表和同步模式。同步模式分为PULL_ONLY(将远端数据拉到本端)、PUSH_ONLY(将本端数据推送到远端)和PUSH_PULL(将本端数据推送到远端同时也将远端数据拉取到本端)。内部接口支持按条件过滤同步,将符合条件的数据同步到远端。
+- **自动同步**:包括全量同步和按条件订阅同步。全量同步由分布式数据库自动将本端数据推送到远端,同时也将远端数据拉取到本端来完成数据同步,同步时机包括设备上线、应用程序更新数据等,应用不需要主动调用sync接口;内部接口支持按条件订阅同步,将远端符合订阅条件的数据自动同步到本端。
-- **分布式数据库备份能力**
- 提供分布式数据库备份能力,业务通过设置backup属性为true,可以触发分布式数据服务每日备份。当分布式数据库发生损坏,分布式数据服务会删除损坏数据库,并且从备份数据库中恢复上次备份的数据。如果不存在备份数据库,则创建一个新的数据库。同时支持加密数据库的备份能力。
+### 单版本分布式数据库
+
+单版本是指数据在本地保存是以单个KV条目为单位的方式保存,对每个Key最多只保存一个条目项,当数据在本地被用户修改时,不管它是否已经被同步出去,均直接在这个条目上进行修改。同步也以此为基础,按照它在本地被写入或更改的顺序将当前最新一次修改逐条同步至远端设备。
+
+### 设备协同分布式数据库
+
+设备协同分布式数据库建立在单版本分布式数据库之上,对应用程序存入的KV数据中的Key前面拼接了本设备的DeviceID标识符,这样能保证每个设备产生的数据严格隔离,底层按照设备的维度管理这些数据,设备协同分布式数据库支持以设备的维度查询分布式数据,但是不支持修改远端设备同步过来的数据。
+
+### 分布式数据库冲突解决策略
+
+分布式数据库多设备提交冲突场景,在给提交冲突做合并的过程中,如果多个设备同时修改了同一数据,则称这种场景为数据冲突。数据冲突采用默认冲突解决策略(Last-write-wins),基于提交时间戳,取时间戳较大的提交数据,当前不支持定制冲突解决策略。
+
+### 数据库Schema化管理与谓词查询
+
+单版本数据库支持在创建和打开数据库时指定Schema,数据库根据Schema定义感知KV记录的Value格式,以实现对Value值结构的检查,并基于Value中的字段实现索引建立和谓词查询。
+
+### 分布式数据库备份能力
+
+提供分布式数据库备份能力,业务通过设置backup属性为true,可以触发分布式数据服务每日备份。当分布式数据库发生损坏,分布式数据服务会删除损坏数据库,并且从备份数据库中恢复上次备份的数据。如果不存在备份数据库,则创建一个新的数据库。同时支持加密数据库的备份能力。
## 运作机制
分布式数据服务支撑OpenHarmony系统上应用程序数据库数据分布式管理,支持数据在相同帐号的多端设备之间相互同步,为用户在多端设备上提供一致的用户体验,分布式数据服务包含五部分:
-- **服务接口**
- 分布式数据服务提供专门的数据库创建、数据访问、数据订阅等接口给应用程序调用,接口支持KV数据模型,支持常用的数据类型,同时确保接口的兼容性、易用性和可发布性。
+- **服务接口:** 分布式数据服务提供专门的数据库创建、数据访问、数据订阅等接口给应用程序调用,接口支持KV数据模型,支持常用的数据类型,同时确保接口的兼容性、易用性和可发布性。
-- **服务组件**
- 服务组件负责服务内元数据管理、权限管理、加密管理、备份和恢复管理以及多用户管理等、同时负责初始化底层分布式DB的存储组件、同步组件和通信适配层。
+- **服务组件:** 服务组件负责服务内元数据管理、权限管理、加密管理、备份和恢复管理以及多用户管理等、同时负责初始化底层分布式DB的存储组件、同步组件和通信适配层。
-- **存储组件**
- 存储组件负责数据的访问、数据的缩减、事务、快照、数据库加密,以及数据合并和冲突解决等特性。
+- **存储组件:** 存储组件负责数据的访问、数据的缩减、事务、快照、数据库加密,以及数据合并和冲突解决等特性。
-- **同步组件**
- 同步组件连结了存储组件与通信组件,其目标是保持在线设备间的数据库数据一致性,包括将本地产生的未同步数据同步给其他设备,接收来自其他设备发送过来的数据,并合并到本地设备中。
+- **同步组件:** 同步组件连结了存储组件与通信组件,其目标是保持在线设备间的数据库数据一致性,包括将本地产生的未同步数据同步给其他设备,接收来自其他设备发送过来的数据,并合并到本地设备中。
-- **通信适配层**
- 通信适配层负责调用底层公共通信层的接口完成通信管道的创建、连接,接收设备上下线消息,维护已连接和断开设备列表的元数据,同时将设备上下线信息发送给上层同步组件,同步组件维护连接的设备列表,同步数据时根据该列表,调用通信适配层的接口将数据封装并发送给连接的设备。
+- **通信适配层:** 通信适配层负责调用底层公共通信层的接口完成通信管道的创建、连接,接收设备上下线消息,维护已连接和断开设备列表的元数据,同时将设备上下线信息发送给上层同步组件,同步组件维护连接的设备列表,同步数据时根据该列表,调用通信适配层的接口将数据封装并发送给连接的设备。
应用程序通过调用分布式数据服务接口实现分布式数据库创建、访问、订阅功能,服务接口通过操作服务组件提供的能力,将数据存储至存储组件,存储组件调用同步组件实现将数据同步,同步组件使用通信适配层将数据同步至远端设备,远端设备通过同步组件接收数据,并更新至本端存储组件,通过服务接口提供给应用程序使用。
@@ -83,6 +87,7 @@
- 分布式数据服务的数据模型仅支持KV数据模型,不支持外键、触发器等关系型数据库中的功能。
- 分布式数据服务支持的KV数据模型规格:
+
- 设备协同数据库,针对每条记录,Key的长度≤896 Byte,Value的长度<4 MB。
- 单版本数据库,针对每条记录,Key的长度≤1 KB,Value的度<4 MB。
- 每个应用程序最多支持同时打开16个分布式数据库。
diff --git a/zh-cn/application-dev/database/database-relational-guidelines.md b/zh-cn/application-dev/database/database-relational-guidelines.md
index f60d4a06d6cbd0d68e1be99fccd268f32a6200e2..3a10ebb1d43ba88f9b4ff788232163c0b1e8c9c7 100644
--- a/zh-cn/application-dev/database/database-relational-guidelines.md
+++ b/zh-cn/application-dev/database/database-relational-guidelines.md
@@ -16,8 +16,8 @@
| 接口名 | 描述 |
| -------- | -------- |
-|getRdbStore(config:StoreConfig,version:number):Promise<RdbStore> | 获得一个相关的RdbStore,操作关系型数据库,用户可以根据自己的需求配置RdbStore的参数,然后通过RdbStore调用相关接口可以执行相关的数据操作,使用Promise异步回调。 -config:与此RDB存储相关的数据库配置。 -version:数据库版本。 |
-| deleteRdbStore(name:string):Promise<void> | 使用指定的数据库文件配置删除数据库,使用Promise异步回调。 -name:数据库名称。 |
+|getRdbStore(config: StoreConfig, version: number): Promise<RdbStore> | 获得一个相关的RdbStore,操作关系型数据库,用户可以根据自己的需求配置RdbStore的参数,然后通过RdbStore调用相关接口可以执行相关的数据操作,使用Promise异步回调。 -config:与此RDB存储相关的数据库配置。 -version:数据库版本。 |
+| deleteRdbStore(name: string): Promise<void> | 使用指定的数据库文件配置删除数据库,使用Promise异步回调。 -name:数据库名称。 |
### 数据库的增删改查
@@ -31,7 +31,7 @@
| 类名 | 接口名 | 描述 |
| -------- | -------- | -------- |
- | RdbStore | insert(name:string,values:ValuesBucket):Promise<number> | 向目标表中插入一行数据,使用Promise异步回调。 如果操作成功,返回行ID;否则返回-1。 -name:指定的目标表名。 -values:表示要插入到表中的数据行。 |
+ | RdbStore | insert(name: string, values: ValuesBucket): Promise<number> | 向目标表中插入一行数据,使用Promise异步回调。 如果操作成功,返回行ID;否则返回-1。 -name:指定的目标表名。 -values:表示要插入到表中的数据行。 |
- **更新**
@@ -41,7 +41,7 @@
| 类名 | 接口名 | 描述 |
| -------- | -------- | -------- |
- | RdbStore | update(values:ValuesBucket,rdbPredicates:RdbPredicates):Promise\ | 根据RdbPredicates的指定实例对象更新数据库中的数据,使用Promise异步回调。 返回受影响的行数。 -values:以ValuesBucket存储的要更新的数据。 -rdbPredicates:表示RdbPredicates的实例对象指定的更新条件。 |
+ | RdbStore | update(values: ValuesBucket, rdbPredicates: RdbPredicates): Promise\ | 根据RdbPredicates的指定实例对象更新数据库中的数据,使用Promise异步回调。 返回受影响的行数。 -values:以ValuesBucket存储的要更新的数据。 -rdbPredicates:表示RdbPredicates的实例对象指定的更新条件。 |
- **删除**
@@ -51,7 +51,7 @@
| 类名 | 接口名 | 描述 |
| -------- | -------- | -------- |
- | RdbStore | delete(rdbPredicates:RdbPredicates):Promise\ | 根据rdbPredicates的指定实例对象从数据库中删除数据,使用Promise异步回调。 返回受影响的行数。 -rdbPredicates:RdbPredicates的实例对象指定的删除条件。 |
+ | RdbStore | delete(rdbPredicates: RdbPredicates): Promise\ | 根据rdbPredicates的指定实例对象从数据库中删除数据,使用Promise异步回调。 返回受影响的行数。 -rdbPredicates:RdbPredicates的实例对象指定的删除条件。 |
- **查询**
@@ -64,8 +64,8 @@
| 类名 | 接口名 | 描述 |
| -------- | -------- | -------- |
- | RdbStore | query(rdbPredicates:RdbPredicates,columns:Array):Promise<ResultSet> | 根据指定条件查询数据库中的数据,使用Promise异步回调。 -rdbPredicates:表示RdbPredicates的实例对象指定的查询条件。 -columns:表示要查询的列。如果值为空,则查询应用于所有列。 |
- | RdbStore | querySql(sql:string,bindArgs?:Array<ValueType>):Promise<ResultSet> | 根据指定SQL语句查询数据库中的数据,使用Promise异步回调。 -sql:指定要查询的SQL语句。 -bindArgs:SQL语句中参数的值。 |
+ | RdbStore | query(rdbPredicates: RdbPredicates, columns: Array): Promise<ResultSet> | 根据指定条件查询数据库中的数据,使用Promise异步回调。 -rdbPredicates:表示RdbPredicates的实例对象指定的查询条件。 -columns:表示要查询的列。如果值为空,则查询应用于所有列。 |
+ | RdbStore | querySql(sql: string, bindArgs?: Array<ValueType>): Promise<ResultSet> | 根据指定SQL语句查询数据库中的数据,使用Promise异步回调。 -sql:指定要查询的SQL语句。 -bindArgs:SQL语句中参数的值。 |
### 数据库谓词的使用
@@ -77,11 +77,11 @@
| 类名 | 接口名 | 描述 |
| -------- | -------- | -------- |
-| RdbPredicates | equalTo(field:string,value:ValueType):RdbPredicates | 配置谓词以匹配数据字段为ValueType且值等于指定值的字段。 -field:数据库表中的列名。 -value:指示要与谓词匹配的值。 -RdbPredicates:返回与指定字段匹配的谓词。 |
-| RdbPredicates | notEqualTo(field:string,value:ValueType):RdbPredicates | 配置谓词以匹配数据字段为ValueType且值不等于指定值的字段。 -field:数据库表中的列名。 -value:指示要与谓词匹配的值。 -RdbPredicates:返回与指定字段匹配的谓词。 |
-| RdbPredicates | or():RdbPredicates | 将或条件添加到谓词中。 -RdbPredicates:返回带有或条件的谓词。 |
-| RdbPredicates | and():RdbPredicates | 向谓词添加和条件。 -RdbPredicates:返回带有和条件的谓词。 |
-| RdbPredicates | contains(field:string,value:string):RdbPredicats | 配置谓词以匹配数据字段为String且value包含指定值的字段。 -field:数据库表中的列名。 -value:指示要与谓词匹配的值。 -RdbPredicates:返回带有包含条件的谓词。 |
+| RdbPredicates | equalTo(field: string, value: ValueType): RdbPredicates | 配置谓词以匹配数据字段为ValueType且值等于指定值的字段。 -field:数据库表中的列名。 -value:指示要与谓词匹配的值。 -RdbPredicates:返回与指定字段匹配的谓词。 |
+| RdbPredicates | notEqualTo(field: string, value: ValueType): RdbPredicates | 配置谓词以匹配数据字段为ValueType且值不等于指定值的字段。 -field:数据库表中的列名。 -value:指示要与谓词匹配的值。 -RdbPredicates:返回与指定字段匹配的谓词。 |
+| RdbPredicates | or(): RdbPredicates | 将或条件添加到谓词中。 -RdbPredicates:返回带有或条件的谓词。 |
+| RdbPredicates | and(): RdbPredicates | 向谓词添加和条件。 -RdbPredicates:返回带有和条件的谓词。 |
+| RdbPredicates | contains(field: string, value: string): RdbPredicats | 配置谓词以匹配数据字段为String且value包含指定值的字段。 -field:数据库表中的列名。 -value:指示要与谓词匹配的值。 -RdbPredicates:返回带有包含条件的谓词。 |
### 查询结果集的使用
@@ -97,12 +97,12 @@
| 类名 | 接口名 | 描述 |
| -------- | -------- | -------- |
-| ResultSet | goToFirstRow():boolean | 将结果集移动到第一行。 |
-| ResultSet | getString(columnIndex:number):string | 获取当前行指定列的值,以String类型返回。 |
-| ResultSet | getBlob(columnIndex:number):Uint8Array | 获取当前行指定列的值,以字节数组形式返回。 |
-| ResultSet | getDouble(columnIndex:number):number | 获取当前行指定列的值,以double型返回。 |
-| ResultSet | getLong(columnIndex:number):number | 获取当前行指定列的值,以Long形式返回。 |
-| ResultSet | close():void | 关闭结果集。 |
+| ResultSet | goToFirstRow(): boolean | 将结果集移动到第一行。 |
+| ResultSet | getString(columnIndex:number): string | 获取当前行指定列的值,以String类型返回。 |
+| ResultSet | getBlob(columnIndex:number): Uint8Array | 获取当前行指定列的值,以字节数组形式返回。 |
+| ResultSet | getDouble(columnIndex:number): number | 获取当前行指定列的值,以double型返回。 |
+| ResultSet | getLong(columnIndex:number): number | 获取当前行指定列的值,以Long形式返回。 |
+| ResultSet | close(): void | 关闭结果集。 |
diff --git a/zh-cn/application-dev/device/usb-guidelines.md b/zh-cn/application-dev/device/usb-guidelines.md
index 8c836de6508cd2a01eeb76f4a74b93bba695db9c..312420b67aedf30cf11a78eafa420257f1bb2234 100644
--- a/zh-cn/application-dev/device/usb-guidelines.md
+++ b/zh-cn/application-dev/device/usb-guidelines.md
@@ -17,19 +17,19 @@ USB类开放能力如下,具体请查阅[API参考文档](../reference/apis/js
| 接口名 | 描述 |
| -------- | -------- |
-| hasRight(deviceName:string):boolean | 如果“使用者”(如各种App或系统)有权访问设备则返回true;无权访问设备则返回false。 |
-| requestRight(deviceName:string):Promise<boolean> | 请求给定软件包的临时权限以访问设备。 |
-| connectDevice(device:USBDevice):Readonly<USBDevicePipe> | 根据`getDevices()`返回的设备信息打开USB设备。 |
-| getDevices():Array<Readonly<USBDevice>> | 返回USB设备列表。 |
-| setConfiguration(pipe:USBDevicePipe,config:USBConfig):number | 设置设备的配置。 |
-| setInterface(pipe:USBDevicePipe,iface:USBInterface):number | 设置设备的接口。 |
-| claimInterface(pipe:USBDevicePipe,iface:USBInterface,force?:boolean):number | 获取接口。 |
-|bulkTransfer(pipe:USBDevicePipe,endpoint:USBEndpoint,buffer:Uint8Array,timeout?:number):Promise<number> | 批量传输。 |
-| closePipe(pipe:USBDevicePipe):number | 关闭设备消息控制通道。 |
-| releaseInterface(pipe:USBDevicePipe,iface:USBInterface):number | 释放接口。 |
-| getFileDescriptor(pipe:USBDevicePipe):number | 获取文件描述符。 |
-| getRawDescriptor(pipe:USBDevicePipe):Uint8Array | 获取原始的USB描述符。 |
-| controlTransfer(pipe:USBDevicePipe,contrlparam:USBControlParams,timeout?:number):Promise<number> | 控制传输。 |
+| hasRight(deviceName: string): boolean | 如果“使用者”(如各种App或系统)有权访问设备则返回true;无权访问设备则返回false。 |
+| requestRight(deviceName: string): Promise<boolean> | 请求给定软件包的临时权限以访问设备。 |
+| connectDevice(device: USBDevice): Readonly<USBDevicePipe> | 根据`getDevices()`返回的设备信息打开USB设备。 |
+| getDevices(): Array<Readonly<USBDevice>> | 返回USB设备列表。 |
+| setConfiguration(pipe: USBDevicePipe, config: USBConfig): number | 设置设备的配置。 |
+| setInterface(pipe: USBDevicePipe, iface: USBInterface): number | 设置设备的接口。 |
+| claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): number | 获取接口。 |
+|bulkTransfer(pipe: USBDevicePipe, endpoint: USBEndpoint, buffer: Uint8Array, timeout?: number): Promise<number> | 批量传输。 |
+| closePipe(pipe: USBDevicePipe): number | 关闭设备消息控制通道。 |
+| releaseInterface(pipe: USBDevicePipe, iface: USBInterface): number | 释放接口。 |
+| getFileDescriptor(pipe: USBDevicePipe): number | 获取文件描述符。 |
+| getRawDescriptor(pipe: USBDevicePipe): Uint8Array | 获取原始的USB描述符。 |
+| controlTransfer(pipe: USBDevicePipe, contrlparam: USBControlParams, timeout?: number): Promise<number> | 控制传输。 |
## 开发步骤
@@ -39,7 +39,7 @@ USB设备可作为Host设备连接Device设备进行数据传输。开发示例
1. 获取设备列表。
```js
- // 导入usb接口api包。
+ // 导入USB接口api包。
import usb from '@ohos.usb';
// 获取设备列表。
var deviceList = usb.getDevices();
diff --git a/zh-cn/application-dev/device/usb-overview.md b/zh-cn/application-dev/device/usb-overview.md
index 4b5b525645fd43beed25f740843ff900d27ea2d5..10732adccacaf2aaf9dc1664f7ae22a8b7d1ea65 100644
--- a/zh-cn/application-dev/device/usb-overview.md
+++ b/zh-cn/application-dev/device/usb-overview.md
@@ -9,7 +9,7 @@ USB服务是应用访问底层的一种设备抽象概念。开发者根据提
USB服务系统包含USB API、USB Service、USB HAL。
-**图2** USB服务运作机制
+**图1** USB服务运作机制

diff --git a/zh-cn/application-dev/device/vibrator-overview.md b/zh-cn/application-dev/device/vibrator-overview.md
index 037b8bb8326494541b632d14293fcb515ab0f899..11cec9fdec7c7cd0745edddb3e4a9f390fe78daf 100644
--- a/zh-cn/application-dev/device/vibrator-overview.md
+++ b/zh-cn/application-dev/device/vibrator-overview.md
@@ -1,7 +1,7 @@
# Vibrator开发概述
-马达振动服务最大化开放硬工最新马达器件能力,通过拓展原生马达服务实现振动与交互融合设计,打造细腻精致的一体化振动体验和差异化体验,提升用户交互效率和易用性、提升用户体验、增强品牌竞争力。
+振动器模块服务最大化开放硬工最新马达器件能力,通过拓展原生马达服务实现振动与交互融合设计,打造细腻精致的一体化振动体验和差异化体验,提升用户交互效率和易用性、提升用户体验、增强品牌竞争力。
## 运作机制
@@ -23,7 +23,7 @@ Vibrator属于控制类小器件,主要包含以下四个模块:Vibrator API
## 约束与限制
-在使用振动器时,开发者需要配置请求振动器的权限ohos.permission.VIBRATE,才能控制振动器振动,敏感级别是system_grant。
+在使用振动器时,开发者需要配置请求振动器的权限ohos.permission.VIBRATE,才能控制振动器振动,权限类型是system_grant。
diff --git a/zh-cn/application-dev/media/audio-recorder.md b/zh-cn/application-dev/media/audio-recorder.md
index 85b07eaef0a61cf7e161c3c37a70928b2d1aa031..739116e193db4ad8f0519ffe6e4784301712d6b7 100644
--- a/zh-cn/application-dev/media/audio-recorder.md
+++ b/zh-cn/application-dev/media/audio-recorder.md
@@ -191,6 +191,5 @@ export class AudioRecorderDemo {
针对音频录制开发,有以下相关实例可供参考:
- [`Recorder:`录音机(eTS)(API8)(Full SDK)](https://gitee.com/openharmony/applications_app_samples/tree/master/media/Recorder)
-- [`JsRecorder`:录音机(JS)(API8)](https://gitee.com/openharmony/applications_app_samples/tree/master/media/JSRecorder)
- [`eTsAudioPlayer`: 音频播放器(eTS)(API8)](https://gitee.com/openharmony/applications_app_samples/blob/master/media/Recorder/entry/src/main/ets/MainAbility/pages/Play.ets)
- [音频播放器(eTS)(API9)](https://gitee.com/openharmony/codelabs/tree/master/Media/Audio_OH_ETS)
diff --git a/zh-cn/application-dev/napi/native-window-guidelines.md b/zh-cn/application-dev/napi/native-window-guidelines.md
index c30e463187e6bfd46046d8f8180de92bdf59add3..da94f7cad61b0c9bdb7435723642a39778a835a5 100644
--- a/zh-cn/application-dev/napi/native-window-guidelines.md
+++ b/zh-cn/application-dev/napi/native-window-guidelines.md
@@ -86,7 +86,7 @@ NativeWindow是`OpenHarmony`**本地平台化窗口**,包括从`Surface`构建
SkImageInfo imageInfo = ...
bitmap.setInfo(imageInfo, bufferHandle->stride);
bitmap.setPixels(bufferHandle->virAddr);
- //创建 Skia Canvas 并将内容写入naitve window
+ //创建 Skia Canvas 并将内容写入native window
...
//写入完成后,通过OH_NativeWindwo_NativeWindowFlushBuffer 提交给消费者使用,例如:显示在屏幕上
@@ -101,7 +101,13 @@ NativeWindow是`OpenHarmony`**本地平台化窗口**,包括从`Surface`构建
OH_NativeXComponent_Callback &callback_;
callback_->OnSurfaceCreated = OnSufaceCreatedCB;
callback_->OnSurfaceChanged = OnSufaceChangedCB;
- callback_->OnSurfaceDestoryed = OnSufaceDestoryedCB;
+ callback_->OnSurfaceDestroyed = OnSufaceDestroyedCB;
callback_->DispatchTouchEvent = DispatchTouchEventCB;
OH_NativeXComponent_RegisterCallback(nativeXComponent, callback_)
```
+
+## 相关实例
+
+针对NativeWindow的使用,有以下相关实例可供参考:
+
+- [使用NativeWindow接口获取Buffer](https://gitee.com/openharmony/graphic_graphic_2d/blob/master/rosen/samples/hello_native_window/hello_native_window.cpp)
\ No newline at end of file
diff --git a/zh-cn/application-dev/reference/Readme-CN.md b/zh-cn/application-dev/reference/Readme-CN.md
index 2fe3bc167f975b6fed0688e38fa631c2b8606d13..d6f15475f8fc82c182cc3acc258947389ffb4f49 100644
--- a/zh-cn/application-dev/reference/Readme-CN.md
+++ b/zh-cn/application-dev/reference/Readme-CN.md
@@ -1,7 +1,7 @@
# 开发参考
-- [组件参考(基于TS扩展的声明式开发范式)](arkui-ts/Readme-CN.md)
-- [组件参考(基于JS扩展的类Web开发范式)](arkui-js/Readme-CN.md)
+- [组件参考(基于eTS的声明式开发范式)](arkui-ts/Readme-CN.md)
+- [组件参考(兼容JS的类Web开发范式)](arkui-js/Readme-CN.md)
- [JS服务卡片UI组件参考](js-service-widget-ui/Readme-CN.md)
- [接口参考(JS及TS API)](apis/Readme-CN.md)
- 接口参考(Native API)
diff --git a/zh-cn/application-dev/reference/apis/js-apis-bluetooth.md b/zh-cn/application-dev/reference/apis/js-apis-bluetooth.md
index 807b6944c557388fee89c55752af5b08b1a368d3..640b2c69f9d8eb19c624022f297c0ba762f0ba30 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-bluetooth.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-bluetooth.md
@@ -13,17 +13,6 @@ import bluetooth from '@ohos.bluetooth';
```
-## 权限
-
-ohos.permission.USE_BLUETOOTH
-
-ohos.permission.MANAGE_BLUETOOTH
-
-ohos.permission.DISCOVER_BLUETOOTH
-
-ohos.permission.LOCATION
-
-
## bluetooth.enableBluetooth8+
enableBluetooth(): boolean
@@ -1962,7 +1951,7 @@ server端订阅特征值写请求事件。
| 参数名 | 类型 | 必填 | 说明 |
| -------- | ---------------------------------------- | ---- | -------------------------------------- |
| type | string | 是 | 填写"characteristicWrite"字符串,表示特征值写请求事件。 |
-| callback | Callback<[DescriptorWriteReq](#descriptorwritereq)> | 是 | 表示回调函数的入参,client端发送的写请求数据。 |
+| callback | Callback<[CharacteristicWriteReq](#characteristicwritereq)> | 是 | 表示回调函数的入参,client端发送的写请求数据。 |
**返回值:**
diff --git a/zh-cn/application-dev/reference/apis/js-apis-data-rdb.md b/zh-cn/application-dev/reference/apis/js-apis-data-rdb.md
index 2961ee3c783d04e968ccc4398fe8b50ac27e8e22..c9729deab958b26754d49b727a4818a97343f468 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-data-rdb.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-data-rdb.md
@@ -29,7 +29,7 @@ getRdbStore(context: Context, config: StoreConfig, version: number, callback: As
| 参数名 | 类型 | 必填 | 说明 |
| -------- | -------- | -------- | -------- |
-| context | Context | 是 | 应用程序或功能的上下文。 API version 9之前的Context定义见[Context](js-apis-Context.md)。 API version 9及之后的Context定义见[Context](js-apis-ability-context.md)。|
+| context | [Context](js-apis-Context.md) | 是 | 应用上下文。|
| config | [StoreConfig](#storeconfig) | 是 | 与此RDB存储相关的数据库配置。 |
| version | number | 是 | 数据库版本。 |
| callback | AsyncCallback<[RdbStore](#rdbstore)> | 是 | 指定callback回调函数,返回一个RdbStore。 |
@@ -37,8 +37,13 @@ getRdbStore(context: Context, config: StoreConfig, version: number, callback: As
**示例:**
```js
+// 获取context
+import featureAbility from '@ohos.ability.featureAbility'
+var context = featureAbility.getContext()
+
+// 获取context后调用getRdbStore
const STORE_CONFIG = { name: "RdbTest.db"}
-data_rdb.getRdbStore(this.context, STORE_CONFIG, 1, function (err, rdbStore) {
+data_rdb.getRdbStore(context, STORE_CONFIG, 1, function (err, rdbStore) {
if (err) {
console.info("Get RdbStore failed, err: " + err)
return
@@ -59,7 +64,7 @@ getRdbStore(context: Context, config: StoreConfig, version: number): Promise<
| 参数名 | 类型 | 必填 | 说明 |
| -------- | -------- | -------- | -------- |
-| context | Context | 是 | 应用程序或功能的上下文。 API version 9之前的Context定义见[Context](js-apis-Context.md)。 API version 9及之后的Context定义见[Context](js-apis-ability-context.md)。 |
+| context | [Context](js-apis-Context.md) | 是 | 应用上下文。 |
| config | [StoreConfig](#storeconfig) | 是 | 与此RDB存储相关的数据库配置。 |
| version | number | 是 | 数据库版本。 |
@@ -72,8 +77,13 @@ getRdbStore(context: Context, config: StoreConfig, version: number): Promise<
**示例:**
```js
+// 获取context
+import featureAbility from '@ohos.ability.featureAbility'
+var context = featureAbility.getContext()
+
+// 获取context后调用getRdbStore
const STORE_CONFIG = { name: "RdbTest.db" }
-let promise = data_rdb.getRdbStore(this.context, STORE_CONFIG, 1);
+let promise = data_rdb.getRdbStore(context, STORE_CONFIG, 1);
promise.then(async (rdbStore) => {
console.log("Get RdbStore successfully.")
}).catch((err) => {
@@ -92,13 +102,18 @@ deleteRdbStore(context: Context, name: string, callback: AsyncCallback<void&g
**参数:**
| 参数名 | 类型 | 必填 | 说明 |
| -------- | -------- | -------- | -------- |
-| context | Context | 是 | 应用程序或功能的上下文。 API version 9之前的Context定义见[Context](js-apis-Context.md)。 API version 9及之后的Context定义见[Context](js-apis-ability-context.md)。|
+| context | [Context](js-apis-Context.md) | 是 | 应用上下文。|
| name | string | 是 | 数据库名称。 |
| callback | AsyncCallback<void> | 是 | 指定callback回调函数。 |
**示例:**
```js
-data_rdb.deleteRdbStore(this.context, "RdbTest.db", function (err, rdbStore) {
+// 获取context
+import featureAbility from '@ohos.ability.featureAbility'
+var context = featureAbility.getContext()
+
+// 获取context后调用deleteRdbStore
+data_rdb.deleteRdbStore(context, "RdbTest.db", function (err) {
if (err) {
console.info("Delete RdbStore failed, err: " + err)
return
@@ -118,7 +133,7 @@ deleteRdbStore(context: Context, name: string): Promise<void>
**参数**
| 参数名 | 类型 | 必填 | 说明 |
| -------- | -------- | -------- | -------- |
-| context | Context | 是 | 应用程序或功能的上下文。 API version 9之前的Context定义见[Context](js-apis-Context.md)。 API version 9及之后的Context定义见[Context](js-apis-ability-context.md)。|
+| context | [Context](js-apis-Context.md) | 是 | 应用上下文。|
| name | string | 是 | 数据库名称。 |
**返回值**:
@@ -128,7 +143,12 @@ deleteRdbStore(context: Context, name: string): Promise<void>
**示例:**
```js
-let promise = data_rdb.deleteRdbStore(this.context, "RdbTest.db")
+// 获取context
+import featureAbility from '@ohos.ability.featureAbility'
+var context = featureAbility.getContext()
+
+// 获取context后调用deleteRdbStore
+let promise = data_rdb.deleteRdbStore(context, "RdbTest.db")
promise.then(()=>{
console.log("Delete RdbStore successfully.")
}).catch((err) => {
diff --git a/zh-cn/application-dev/reference/apis/js-apis-data-storage.md b/zh-cn/application-dev/reference/apis/js-apis-data-storage.md
index e41af6f916e6336a2d9951edfbd469cc36dcbbe2..898919a833638568d73a85c334c498b6574767b4 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-data-storage.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-data-storage.md
@@ -53,7 +53,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
let storage = data_storage.getStorageSync(path + '/mystore');
storage.putSync('startup', 'auto');
@@ -86,7 +86,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
data_storage.getStorage(path + '/mystore', function (err, storage) {
if (err) {
@@ -129,7 +129,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
let getPromise = data_storage.getStorage(path + '/mystore');
getPromise.then((storage) => {
@@ -165,7 +165,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
data_storage.deleteStorageSync(path + '/mystore');
});
@@ -195,7 +195,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
data_storage.deleteStorage(path + '/mystore', function (err) {
if (err) {
@@ -237,7 +237,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
let promisedelSt = data_storage.deleteStorage(path + '/mystore');
promisedelSt.then(() => {
@@ -271,7 +271,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
data_storage.removeStorageFromCacheSync(path + '/mystore');
});
@@ -302,7 +302,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
data_storage.removeStorageFromCache(path + '/mystore', function (err) {
if (err) {
@@ -344,7 +344,7 @@ var path;
var context = featureAbility.getContext();
context.getFilesDir().then((filePath) => {
path = filePath;
- console.info("======================>getFilesDirPromsie====================>");
+ console.info("======================>getFilesDirPromise====================>");
let promiserevSt = data_storage.removeStorageFromCache(path + '/mystore')
promiserevSt.then(() => {
diff --git a/zh-cn/application-dev/reference/apis/js-apis-distributed-data.md b/zh-cn/application-dev/reference/apis/js-apis-distributed-data.md
index 46d2d4093c991311dc2853f5675a7bbf38167463..7212f93fb6eed2d9c28ec42413db86c3dc222b4f 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-distributed-data.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-distributed-data.md
@@ -596,16 +596,15 @@ KVStore数据库类型枚举。
数据库的安全级别枚举。
-**系统能力:** SystemCapability.DistributedDataManager.KVStore.Core
| 名称 | 值 | 说明 |
| --- | ---- | ----------------------- |
-| NO_LEVEL | 0 | 表示数据库不设置安全级别。 |
-| S0 | 1 | 表示数据库的安全级别为公共级别。 |
-| S1 | 2 | 表示数据库的安全级别为低级别,当数据泄露时会产生较低影响。例如,包含壁纸等系统数据的数据库。 |
-| S2 | 3 | 表示数据库的安全级别为中级别,当数据泄露时会产生较大影响。例如,包含录音、视频等用户生成数据或通话记录等信息的数据库。 |
-| S3 | 5 | 表示数据库的安全级别为高级别,当数据泄露时会产生重大影响。例如,包含用户运动、健康、位置等信息的数据库。 |
-| S4 | 6 | 表示数据库的安全级别为关键级别,当数据泄露时会产生严重影响。例如,包含认证凭据、财务数据等信息的数据库。 |
+| NO_LEVEL | 0 | 表示数据库不设置安全级别。 **系统能力:** SystemCapability.DistributedDataManager.KVStore.DistributedKVStore |
+| S0 | 1 | 表示数据库的安全级别为公共级别。 **系统能力:** SystemCapability.DistributedDataManager.KVStore.Core |
+| S1 | 2 | 表示数据库的安全级别为低级别,当数据泄露时会产生较低影响。例如,包含壁纸等系统数据的数据库。 **系统能力:** SystemCapability.DistributedDataManager.KVStore.Core |
+| S2 | 3 | 表示数据库的安全级别为中级别,当数据泄露时会产生较大影响。例如,包含录音、视频等用户生成数据或通话记录等信息的数据库。 **系统能力:** SystemCapability.DistributedDataManager.KVStore.Core |
+| S3 | 5 | 表示数据库的安全级别为高级别,当数据泄露时会产生重大影响。例如,包含用户运动、健康、位置等信息的数据库。 **系统能力:** SystemCapability.DistributedDataManager.KVStore.Core |
+| S4 | 6 | 表示数据库的安全级别为关键级别,当数据泄露时会产生严重影响。例如,包含认证凭据、财务数据等信息的数据库。 **系统能力:** SystemCapability.DistributedDataManager.KVStore.Core |
## Constants
diff --git a/zh-cn/application-dev/reference/apis/js-apis-prompt.md b/zh-cn/application-dev/reference/apis/js-apis-prompt.md
index 475fd483adb8d59ee6b39ee809491787e1628f34..fb04353173252c684eb05d1341f46f82a6cb13ac 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-prompt.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-prompt.md
@@ -1,16 +1,16 @@
# 弹窗
->  **说明**
+创建并显示文本提示框、对话框和操作菜单。
+
+> **说明:**
+>
> 本模块首批接口从API version 8开始支持。后续版本的新增接口,采用上角标单独标记接口的起始版本。
## 导入模块
-```
+```js
import prompt from '@ohos.prompt'
```
-## 权限列表
-
-无
## prompt.showToast
@@ -21,32 +21,31 @@ showToast(options: ShowToastOptions): void
**系统能力:** SystemCapability.ArkUI.ArkUI.Full
**参数:**
+
| 参数名 | 类型 | 必填 | 说明 |
| ------- | ------------------------------------- | ---- | ------- |
| options | [ShowToastOptions](#showtoastoptions) | 是 | 文本弹窗选项。 |
**示例:**
- ```
- export default {
- showToast() {
- prompt.showToast({
- message: 'Message Info',
- duration: 2000,
- });
- }
- }
- ```
+
+```js
+prompt.showToast({
+ message: 'Message Info',
+ duration: 2000,
+});
+```
+
## ShowToastOptions
文本提示框的选项。
-**系统能力:** 以下各项对应的系统能力均为SystemCapability.ArkUI.ArkUI.Full。
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full。
-| 名称 | 类型 | 必填 | 说明 |
-| -------- | -------------- | ---- | ---------------------------------------- |
-| message | string | 是 | 显示的文本信息。 |
-| duration | number | 否 | 默认值1500ms,建议区间:1500ms-10000ms,若小于1500ms则取默认值。 |
-| bottom | <length> | 否 | 设置弹窗边框距离屏幕底部的位置。 |
+| 名称 | 类型 | 必填 | 说明 |
+| -------- | --------------- | ---- | ---------------------------------------- |
+| message | string | 是 | 显示的文本信息。 |
+| duration | number | 否 | 默认值1500ms,取值区间:1500ms-10000ms。若小于1500ms则取默认值,若大于10000ms则取上限值10000ms。 |
+| bottom | string\| number | 否 | 设置弹窗边框距离屏幕底部的位置。 |
## prompt.showDialog
@@ -54,9 +53,10 @@ showDialog(options: ShowDialogOptions): Promise<ShowDialogSuccessResponse>
创建并显示对话框,对话框响应后同步返回结果。
-**系统能力:** SystemCapability.ArkUI.ArkUI.Full
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full
**参数:**
+
| 参数名 | 类型 | 必填 | 说明 |
| ------- | --------------------------------------- | ---- | ------ |
| options | [ShowDialogOptions](#showdialogoptions) | 是 | 对话框选项。 |
@@ -69,32 +69,28 @@ showDialog(options: ShowDialogOptions): Promise<ShowDialogSuccessResponse>
**示例:**
- ```
- export default {
- showDialog() {
- prompt.showDialog({
- title: 'Title Info',
- message: 'Message Info',
- buttons: [
- {
- text: 'button1',
- color: '#000000',
- },
- {
- text: 'button2',
- color: '#000000',
- }
- ],
- })
- .then(data => {
- console.info('showDialog success, click button: ' + data.index);
- })
- .catch(err => {
- console.info('showDialog error: ' + err);
- })
+```js
+prompt.showDialog({
+ title: 'Title Info',
+ message: 'Message Info',
+ buttons: [
+ {
+ text: 'button1',
+ color: '#000000',
+ },
+ {
+ text: 'button2',
+ color: '#000000',
}
- }
- ```
+ ],
+})
+ .then(data => {
+ console.info('showDialog success, click button: ' + data.index);
+ })
+ .catch(err => {
+ console.info('showDialog error: ' + err);
+ })
+```
## prompt.showDialog
@@ -102,61 +98,57 @@ showDialog(options: ShowDialogOptions, callback: AsyncCallback<ShowDialogSucc
创建并显示对话框,对话框响应结果异步返回。
-**系统能力:** SystemCapability.ArkUI.ArkUI.Full
-
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full
**参数:**
+
| 参数名 | 类型 | 必填 | 说明 |
| -------- | ---------------------------------------- | ---- | ------------ |
| options | [ShowDialogOptions](#showdialogoptions) | 是 | 页面显示对话框信息描述。 |
| callback | AsyncCallback<[ShowDialogSuccessResponse](#showdialogsuccessresponse)> | 是 | 对话框响应结果回调。 |
**示例:**
- ```
- export default {
- callback(err, data) {
- if(err) {
- console.info('showDialog err: ' + err);
- return;
- }
- console.info('showDialog success callback, click button: ' + data.index);
+
+```js
+prompt.showDialog({
+ title: 'showDialog Title Info',
+ message: 'Message Info',
+ buttons: [
+ {
+ text: 'button1',
+ color: '#000000',
},
- showDialog() {
- prompt.showDialog({
- title: 'showDialog Title Info',
- message: 'Message Info',
- buttons: [
- {
- text: 'button1',
- color: '#000000',
- },
- {
- text: 'button2',
- color: '#000000',
- }
- ]
- }, this.callback);
+ {
+ text: 'button2',
+ color: '#000000',
}
+ ]
+}, (err, data) => {
+ if (err) {
+ console.info('showDialog err: ' + err);
+ return;
}
- ```
+ console.info('showDialog success callback, click button: ' + data.index);
+});
+```
## ShowDialogOptions
对话框的选项。
-**系统能力:** 以下各项对应的系统能力均为SystemCapability.ArkUI.ArkUI.Full。
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full
-| 名称 | 类型 | 必填 | 说明 |
-| ------- | ------ | ---- | ---------------------------------------- |
+| 名称 | 类型 | 必填 | 说明 |
+| ------- | ------- | ---- | ---------------------------------------- |
| title | string | 否 | 标题文本。 |
-| message | string | 否 | 内容文本。 |
-| buttons | Array | 否 | 对话框中按钮的数组,结构为:{text:'button', color: '\#666666'},支持1-3个按钮。其中第一个为positiveButton;第二个为negativeButton;第三个为neutralButton。 |
+| message | string | 否 | 内容文本。 |
+| buttons | Array | 否 | 对话框中按钮的数组,结构为:{text:'button', color: '\#666666'},支持1-3个按钮。其中第一个为positiveButton;第二个为negativeButton;第三个为neutralButton。 |
## ShowDialogSuccessResponse
对话框的响应结果。
-**系统能力:** 以下各项对应的系统能力均为SystemCapability.ArkUI.ArkUI.Full。
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full
| 名称 | 类型 | 说明 |
| ----- | ------ | ------------------- |
@@ -172,6 +164,7 @@ showActionMenu(options: ActionMenuOptions, callback: AsyncCallback<ActionMenu
**系统能力:** 以下各项对应的系统能力均为SystemCapability.ArkUI.ArkUI.Full。
**参数:**
+
| 参数名 | 类型 | 必填 | 说明 |
| -------- | ---------------------------------------- | ---- | --------- |
| options | [ActionMenuOptions](#actionmenuoptions) | 是 | 操作菜单选项。 |
@@ -179,95 +172,100 @@ showActionMenu(options: ActionMenuOptions, callback: AsyncCallback<ActionMenu
**示例:**
- ```
- export default {
- callback(err, data) {
- if(err) {
- console.info('showActionMenu err: ' + err);
- return;
- }
- console.info('showActionMenu success callback, click button: ' + data.index);
+
+```js
+prompt.showActionMenu({
+ title: 'Title Info',
+ buttons: [
+ {
+ text: 'item1',
+ color: '#666666',
},
- showActionMenu() {
- prompt.showActionMenu({
- title: 'Title Info',
- buttons: [
- {
- text: 'item1',
- color: '#666666',
- },
- {
- text: 'item2',
- color: '#000000',
- },
- ]
- }, this.callback)
- }
+ {
+ text: 'item2',
+ color: '#000000',
+ },
+ ]
+}, (err, data) => {
+ if (err) {
+ console.info('showActionMenu err: ' + err);
+ return;
}
- ```
+ console.info('showActionMenu success callback, click button: ' + data.index);
+})
+```
## prompt.showActionMenu
-showActionMenu(options: ActionMenuOptions): Promise\
+showActionMenu(options: ActionMenuOptions): Promise<ActionMenuSuccessResponse>
创建并显示操作菜单,菜单响应后同步返回结果。
**系统能力:** SystemCapability.ArkUI.ArkUI.Full
**参数:**
+
| 参数名 | 类型 | 必填 | 说明 |
| ------- | --------------------------------------- | ---- | ------- |
| options | [ActionMenuOptions](#actionmenuoptions) | 是 | 操作菜单选项。 |
**返回值:**
+
| 类型 | 说明 |
| ---------------------------------------- | ------- |
| Promise<[ActionMenuSuccessResponse](#actionmenusuccessresponse)> | 菜单响应结果。 |
**示例:**
- ```
- export default {
- showActionMenu() {
- prompt.showActionMenu({
- title: 'showActionMenu Title Info',
- buttons: [
- {
- text: 'item1',
- color: '#666666',
- },
- {
- text: 'item2',
- color: '#000000',
- },
- ]
- })
- .then(data => {
- console.info('showActionMenu success, click button: ' + data.index);
- })
- .catch(err => {
- console.info('showActionMenu error: ' + err);
- })
- }
- }
- ```
+
+```js
+prompt.showActionMenu({
+ title: 'showActionMenu Title Info',
+ buttons: [
+ {
+ text: 'item1',
+ color: '#666666',
+ },
+ {
+ text: 'item2',
+ color: '#000000',
+ },
+ ]
+})
+ .then(data => {
+ console.info('showActionMenu success, click button: ' + data.index);
+ })
+ .catch(err => {
+ console.info('showActionMenu error: ' + err);
+ })
+```
## ActionMenuOptions
操作菜单的选项。
-**系统能力:** 以下各项对应的系统能力均为SystemCapability.ArkUI.ArkUI.Full。
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full。
-| 名称 | 类型 | 必填 | 说明 |
-| ------- | ------ | ---- | ---------------------------------------- |
-| title | string | 否 | 标题文本。 |
-| buttons | Array | 是 | 菜单中菜单项按钮的数组,结构为:{text:'button', color: '\#666666'},支持1-6个按钮。大于6个按钮时弹窗不显示。 |
+| 名称 | 类型 | 必填 | 说明 |
+| ------- | ------------------------------ | ---- | ---------------------------------------- |
+| title | string | 否 | 标题文本。 |
+| buttons | Array<[Button](#button)> | 是 | 菜单中菜单项按钮的数组,结构为:{text:'button', color: '\#666666'},支持1-6个按钮。大于6个按钮时弹窗不显示。 |
## ActionMenuSuccessResponse
操作菜单的响应结果。
-**系统能力:** 以下各项对应的系统能力均为SystemCapability.ArkUI.ArkUI.Full。
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full
| 名称 | 类型 | 必填 | 说明 |
| ----- | ------ | ---- | ------------------------ |
| index | number | 否 | 选中按钮在buttons数组中的索引,从0开始。 |
+## Button
+
+菜单中的菜单项按钮。
+
+**系统能力:** SystemCapability.ArkUI.ArkUI.Full
+
+| 名称 | 类型 | 必填 | 说明 |
+| ----- | ------ | ---- | ------- |
+| text | string | 是 | 按钮文本内容。 |
+| color | string | 是 | 按钮文本颜色。 |
diff --git a/zh-cn/application-dev/reference/apis/js-apis-settings.md b/zh-cn/application-dev/reference/apis/js-apis-settings.md
index ad8793a2b187912763a0649a647679326e1c4098..276e4c39eb119c5d5257dc47c54057ee1bd39f13 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-settings.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-settings.md
@@ -1,107 +1,565 @@
# 设置数据项名称
->  **说明:**
-> 本模块首批接口从API version 8开始支持。后续版本如有新增内容,则采用上角标单独标记该内容的起始版本。
-
-
-本模块提供设置数据项的访问功能相关接口的说明及示例。
+本模块提供访问设置数据项的能力。
+> **说明:**
+>
+> 本模块首批接口从API version 7开始支持。后续版本如有新增内容,则采用上角标单独标记该内容的起始版本。
## 导入模块
-```typescript
+```ts
import settings from '@ohos.settings';
```
+## date
+
+提供设置时间和日期格式的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ------------------- | ------ | ---- | ---- | ------------------------------------------------------------ |
+| DATE_FORMAT | string | 是 | 是 | 日期格式。 日期格式包括mm/dd/yyyy、dd/mm/yyyy和yyyy/mm/dd ,其中mm、dd和yyyy分别代表月份、日期和年份。 |
+| TIME_FORMAT | string | 是 | 是 | 时间是以12小时格式还是24小时格式显示。 值为 “12” 表示12小时格式; 值为 ”24“ 表示24小时格式。 |
+| AUTO_GAIN_TIME | string | 是 | 是 | 是否自动从网络获取日期、时间和时区。 值为true表示自动从网络获取信息; 值为false表示不自动获取。 |
+| AUTO_GAIN_TIME_ZONE | string | 是 | 是 | 是否自动从NITZ获取时区。 值为true表示自动获取; 值为false表示不自动获取。 |
+
+## display
+
+提供设置显示效果的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ----------------------------- | ------ | ---- | ---- | ------------------------------------------------------------ |
+| FONT_SCALE | string | 是 | 是 | 字体的比例因子,值为浮点数。 |
+| SCREEN_BRIGHTNESS_STATUS | string | 是 | 是 | 屏幕亮度。该值的范围从0到255。 |
+| AUTO_SCREEN_BRIGHTNESS | string | 是 | 是 | 是否启用屏幕亮度自动调整。 值为AUTO_SCREEN_BRIGHTNESS_MODE,表示启用自动调整; 值为MANUAL_SCREEN_BRIGHTNESS_MODE,表示不启用自动调整。 |
+| AUTO_SCREEN_BRIGHTNESS_MODE | number | 是 | 是 | 使用屏幕亮度自动调整时AUTO_SCREEN_BRIGHTNESS的值。 |
+| MANUAL_SCREEN_BRIGHTNESS_MODE | number | 是 | 是 | 使用屏幕亮度手动调整时的AUTO_SCREEN_BRIGHTNESS值。 |
+| SCREEN_OFF_TIMEOUT | string | 是 | 是 | 设备在一段时间不活动后进入睡眠状态的等待时间(单位:ms)。 |
+| DEFAULT_SCREEN_ROTATION | string | 是 | 是 | 启用屏幕的自动旋转时,此属性无效;不启用自动旋转时,以下值可用: 值为0,表示屏幕旋转0度; 值为1,表示屏幕旋转90度; 值为2,表示屏幕旋转180度; 值为3,表示屏幕旋转270度。 |
+| ANIMATOR_DURATION_SCALE | string | 是 | 是 | 动画持续时间的比例因子。这会影响所有此类动画的开始延迟和持续时间。 值为0,表示动画将立即结束,默认值为1。 |
+| TRANSITION_ANIMATION_SCALE | string | 是 | 是 | 过渡动画的比例因子。 值为0,表示禁用过渡动画。 |
+| WINDOW_ANIMATION_SCALE | string | 是 | 是 | 普通窗口动画的比例因子。 值为0,表示禁用窗口动画。 |
+| DISPLAY_INVERSION_STATUS | string | 是 | 是 | 是否启用显示颜色反转。 值为1,表示启用显示颜色反转; 值为0,表示不启用显示颜色反转。 |
+
+## general
+
+提供设置设备常规信息的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| -------------------------------- | ------ | ---- | ---- | ------------------------------------------------------------ |
+| SETUP_WIZARD_FINISHED | string | 是 | 是 | 是否已运行启动向导。 值为0,表示启动向导尚未运行; 值不是0,表示启动向导已运行。 |
+| END_BUTTON_ACTION | string | 是 | 是 | 在用户不在呼叫中时,用户按下呼叫结束按钮会发生的情况。 值为0,表示没有任何反应; 值为1,表示显示主屏幕; 值为2,表示设备进入睡眠状态,屏幕锁定; 值为3,表示显示主屏幕。如果用户已在主屏幕上,设备将进入睡眠状态。 |
+| ACCELEROMETER_ROTATION_STATUS | string | 是 | 是 | 是否使用加速计更改屏幕方向,即是否启用自动旋转。 值为1,表示启用加速度计; 值为0,表示不启用加速计。 |
+| AIRPLANE_MODE_STATUS | string | 是 | 是 | 是否启用飞行模式。 值为1,表示启用飞行模式; 值为0,表示不启用飞行模式。 |
+| DEVICE_PROVISION_STATUS | string | 是 | 是 | 是否预配设备。 在具有单个系统用户的多用户设备上,当值为true时,屏幕可能会被锁定。此外,其他功能无法在系统用户上启动,除非它们被标记为在屏幕锁定上显示。 |
+| HDC_STATUS | string | 是 | 是 | 是否启用USB设备上的硬盘控制器(HDC)。 值为true,表示启用HDC; 值为false,表示不启用HDC。 |
+| BOOT_COUNTING | string | 是 | 是 | 设备开机后的启动操作数。 |
+| CONTACT_METADATA_SYNC_STATUS | string | 是 | 是 | 是否启用联系人元数据同步。 值为true,表示启用同步; 值为false,表示不启用同步。 |
+| DEVELOPMENT_SETTINGS_STATUS | string | 是 | 是 | 是否启用开发人员选项。 值为true,表示启用开发人员选项; 值为false,表示不启用开发人员选项。 |
+| DEVICE_NAME | string | 是 | 是 | 设备名称。 |
+| USB_STORAGE_STATUS | string | 是 | 是 | 是否启用USB大容量存储。 值为true,表示启用USB大容量存储; 值为false,表示不启用USB大容量存储。 |
+| DEBUGGER_WAITING | string | 是 | 是 | 设备在启动应用程序进行调试时是否等待调试器进行调试。 值为1,表示设备等待调试器; 值为0,表示系统不会等待调试器,因此应用程序会正常运行。 |
+| DEBUG_APP_PACKAGE | string | 是 | 是 | 要调试的应用程序的bundle name。 |
+| ACCESSIBILITY_STATUS | string | 是 | 是 | 是否启用辅助功能。 值为1,表示启用辅助功能; 值为0,表示不启用辅助功能。 |
+| ACTIVATED_ACCESSIBILITY_SERVICES | string | 是 | 是 | 已激活的辅助功能的列表。 |
+| GEOLOCATION_ORIGINS_ALLOWED | string | 是 | 是 | 浏览器可以使用的默认地理位置。多个地理位置由空格分隔。 |
+| SKIP_USE_HINTS | string | 是 | 是 | 应用程序是否应在首次启动时尝试跳过所有介绍性提示。这适用于临时用户或熟悉环境的用户。 值为1,表示应用程序将尝试在第一次启动时跳过所有介绍性提示; 值为0,表示应用程序不会在首次启动时跳过介绍性提示。 |
+| TOUCH_EXPLORATION_STATUS | string | 是 | 是 | 是否启用触摸浏览。 值为1,表示启用触摸浏览; 值为0,表示不启用触摸浏览。 |
+
+## input
+
+提供设置有关输入法信息的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ------------------------------------ | ------ | ---- | ---- | ------------------------------------------------------------ |
+| DEFAULT_INPUT_METHOD | string | 是 | 是 | 默认输入法及其ID。 |
+| ACTIVATED_INPUT_METHOD_SUB_MODE | string | 是 | 是 | 默认输入法键盘类型及其ID。 |
+| ACTIVATED_INPUT_METHODS | string | 是 | 是 | 已激活的输入法的列表。 该列表是一个字符串,由已激活的输入法的ID和输入法键盘类型组成。输入法ID后添加冒号':'连接,输入法的键盘类型后添加分号';'连接。用ima代表输入法ID,keyboardType代表键盘类型,示例格式是ima0:keyboardType0;keyboardType1;ima1:ima2:keyboardTypes0。 |
+| SELECTOR_VISIBILITY_FOR_INPUT_METHOD | string | 是 | 是 | 输入法选择器是否可见。 值为1,表示输入法选择器可见; 值为0,表示输入法选择器不可见。 |
+| AUTO_CAPS_TEXT_INPUT | string | 是 | 是 | 是否为文本编辑器启用自动大写。 值为0,表示不启用自动大写; 值为1,表示启用自动大写。 |
+| AUTO_PUNCTUATE_TEXT_INPUT | string | 是 | 是 | 是否为文本编辑器启用自动标点符号。自动标点符号使文本编辑器能够将两个空格转换为句点'.'和空格。 值为0,表示不启用自动标点符号; 值为1,表示启用自动标点符号。 |
+| AUTO_REPLACE_TEXT_INPUT | string | 是 | 是 | 是否为文本编辑器启用自动更正。自动更正使文本编辑器能够更正拼写错误。 值为0,表示不启用自动更正; 值为1,表示启用自动更正。 |
+| SHOW_PASSWORD_TEXT_INPUT | string | 是 | 是 | 是否在文本编辑器中启用密码显示。密码显示使文本编辑器能够在用户键入密码字符时显示密码字符。 值为0,表示不启用密码显示; 值为1,表示启用密码显示。 |
+
+## network
+
+提供设置网络信息的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ------------------------ | ------ | ---- | ---- | ------------------------------------------------------------ |
+| DATA_ROAMING_STATUS | string | 是 | 是 | 是否启用数据漫游。 值为true,表示启用数据漫游; 值为false,表示不启用数据漫游。 |
+| HTTP_PROXY_CFG | string | 是 | 是 | 全局 HTTP 代理的主机名和端口号。主机名和端口号由冒号':'分隔。 |
+| NETWORK_PREFERENCE_USAGE | string | 是 | 是 | 要使用的网络的用户首选项。 |
+
+## phone
+
+提供设置来电和去电接听方式的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ------------------ | ------ | ---- | ---- | ------------------------------------------------------------ |
+| RTT_CALLING_STATUS | string | 是 | 是 | 是否启用实时文本 (RTT) 呼叫。启用,来电和去电在设备和运营商支持时作为 RTT 呼叫应答。 值为1,表示启用RTT 呼叫; 值为0,表示不启用 RTT 呼叫。 |
+
+## sound
+
+提供设置声音效果的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ---------------------------- | ------ | ---- | ---- | ------------------------------------------------------------ |
+| VIBRATE_WHILE_RINGING | string | 是 | 是 | 设备在来电响铃时是否振动。此属性将由电话和设置应用程序使用。 该值是布尔类型,仅影响设备因来电而响铃的情况,不影响任何其他应用程序或场景。 |
+| DEFAULT_ALARM_ALERT | string | 是 | 是 | 系统默认告警的存储区域。 |
+| DTMF_TONE_TYPE_WHILE_DIALING | string | 是 | 是 | 拨号时播放的双音多频 (DTMF) 音的类型。 值为0表示常规的短音效, 值为1表示长音效。 |
+| DTMF_TONE_WHILE_DIALING | string | 是 | 是 | 拨号时是否播放 DTMF 音。 值为1,表示播放 DTMF 音; 值为0,表示不播放。 |
+| AFFECTED_MODE_RINGER_STREAMS | string | 是 | 是 | 哪些音频流受振铃模式和请勿打扰 (DND) 模式更改的影响。希望特定的音频流受到振铃模式和 DDN 模式变化的影响,请将对应比特位设置为1。 |
+| AFFECTED_MUTE_STREAMS | string | 是 | 是 | 受静音模式影响的音频流。希望特定音频流在静音模式下保持静音,请将相应位设置为1。 |
+| DEFAULT_NOTIFICATION_SOUND | string | 是 | 是 | 系统默认通知音的存储区域。 |
+| DEFAULT_RINGTONE | string | 是 | 是 | 系统默认铃声的存储区域。 |
+| SOUND_EFFECTS_STATUS | string | 是 | 是 | 声音功能是否可用。 值为0表示不可用; 值为1表示可用 |
+| VIBRATE_STATUS | string | 是 | 是 | 设备是否为事件振动。该参数在系统内部使用。 值为1,表示设备会因事件而振动; 值为0,表示设备不因事件振动。 |
+| HAPTIC_FEEDBACK_STATUS | string | 是 | 是 | 设备是否启用触觉反馈。 值为true,表示启用触觉反馈; 值为false,表示不启用触觉反馈。 |
+
+## TTS
+
+提供设置文本到语音 (TTS) 转换信息的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| ------------------- | ------ | ---- | ---- | ------------------------------------------------------------ |
+| DEFAULT_TTS_PITCH | string | 是 | 是 | 文本转语音 (TTS) 引擎的默认音高。 其中100=1x,该值设置为200,表示频率是正常声音频率的两倍。 |
+| DEFAULT_TTS_RATE | string | 是 | 是 | TTS 引擎的默认语速。 其中100=1x。 |
+| DEFAULT_TTS_SYNTH | string | 是 | 是 | 默认TTS引擎。 |
+| ENABLED_TTS_PLUGINS | string | 是 | 是 | 用于TTS的已激活插件包列表, 多个插件包以空格分隔。 |
+
+
+## wireless
+
+提供设置无线网络信息的数据项。
+
+### 属性
+
+**系统能力:** SystemCapability.Applications.settings.Core
+
+| 名称 | 类型 | 可读 | 可写 | 说明 |
+| --------------------------------- | ------ | ---- | ---- | ------------------------------------------------------------ |
+| BLUETOOTH_DISCOVER_ABILITY_STATUS | string | 是 | 是 | 设备是否可以被其他设备通过蓝牙发现或连接。 值为0表示设备不可以被连接或发现; 值为1表示设备可以被连接但不可以被发现; 值为2表示设备可以被连接和发现。 |
+| BLUETOOTH_DISCOVER_TIMEOUT | string | 是 | 是 | 可以通过蓝牙发现设备的持续时间(以秒为单位)。 这段时间之后,设备不可以被蓝牙搜寻到。 |
+| AIRPLANE_MODE_RADIOS | string | 是 | 是 | 启用飞行模式时要禁用的无线电信号列表。 多个无线电信号用逗号 (,) 分隔。取值包括以下常量:BLUETOOTH_RADIO、 CELL_RADIO、 NFC_RADIO、 WIFI_RADIO。 |
+| BLUETOOTH_RADIO | string | 是 | 否 | 常量,作为AIRPLANE_MODE_RADIOS的取值时表示蓝牙在飞行模式下禁用。 |
+| CELL_RADIO | string | 是 | 否 | 常量,作为AIRPLANE_MODE_RADIOS的取值时表示蜂窝无线电在飞行模式下禁用。 |
+| NFC_RADIO | string | 是 | 否 | 常量,作为AIRPLANE_MODE_RADIOS的取值时表示NFC在飞行模式下禁用。 |
+| WIFI_RADIO | string | 是 | 否 | 常量,作为AIRPLANE_MODE_RADIOS的取值时表示Wi-Fi在飞行模式下禁用。 |
+| BLUETOOTH_STATUS | string | 是 | 是 | 蓝牙是否可用。 值为true表示蓝牙可用; 值为false表示蓝牙不可用。 |
+| OWNER_LOCKDOWN_WIFI_CFG | string | 是 | 是 | 是否应锁定由设备所有者的应用程序创建的Wi-Fi配置。 值为true表示Wi-Fi配置应该被锁定; 值为false表示不应该被锁定。 |
+| WIFI_DHCP_MAX_RETRY_COUNT | string | 是 | 是 | 尝试从DHCP服务器获取 IP 地址的最大次数。 |
+| WIFI_TO_MOBILE_DATA_AWAKE_TIMEOUT | string | 是 | 是 | Wi-Fi连接断开后等待移动数据连接建立时保持唤醒锁的最长时间。 |
+| WIFI_STATUS | string | 是 | 是 | Wi-Fi是否可用。 值为true表示Wi-Fi可用; 值为false表示Wi-Fi不可用。 |
+| WIFI_WATCHDOG_STATUS | string | 是 | 是 | Wi-Fi的WatchDog是否可用。 值为true表示可用; 值为false表示不可用。 |
+
+## setting.getURI
+
+getURI(name: string, callback: AsyncCallback\