!16291 翻译已完成15106+15307+12926+11369+15365

Merge pull request !16291 from shawn_he/15106-b

en/application-dev/device/pointerstyle-guidelines.md

@@ -15,11 +15,11 @@ import pointer from '@ohos.multimodalInput.pointer';
 The following table lists the common APIs for mouse pointer management. For details about the APIs, see [ohos.multimodalInput.pointer](../reference/apis/js-apis-pointer.md).
 
 | Instance | API                                                      | Description                                                        |
-| ------- | ------------------------------------------------------------ | --------------------------------------------------------------- |
-| pointer | function isPointerVisible(callback: AsyncCallback\<boolean>): void; | Checks the visible status of the mouse pointer.          |
-| pointer | function setPointerVisible(visible: boolean, callback: AsyncCallback\<void>): void; | Sets the visible status of the mouse pointer. This setting takes effect for the mouse pointer globally.                                        |
+| ------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| pointer | function isPointerVisible(callback: AsyncCallback\<boolean>): void; | Checks the visible status of the mouse pointer.                                |
+| pointer | function setPointerVisible(visible: boolean, callback: AsyncCallback\<void>): void; | Sets the visible status of the mouse pointer. This setting takes effect for the mouse pointer globally.|
 | pointer | function setPointerStyle(windowId: number, pointerStyle: PointerStyle, callback: AsyncCallback\<void>): void; | Sets the mouse pointer style. This setting takes effect for the mouse pointer style of a specified window.        |
-| pointer | function getPointerStyle(windowId: number, callback: AsyncCallback\<PointerStyle>): void; | Obtains the mouse pointer style.   |
+| pointer | function getPointerStyle(windowId: number, callback: AsyncCallback\<PointerStyle>): void; | Obtains the mouse pointer style.                                          |
 
 ## Hiding the Mouse Pointer
 
@@ -77,43 +77,48 @@ When designing a color picker, you can have the mouse pointer switched to the co
 5. Set the mouse pointer to the default style.
 
 ```js
+import pointer from '@ohos.multimodalInput.pointer';
 import window from '@ohos.window';
 
 // 1. Enable the color pickup function.
 // 2. Obtain the window ID.
-window.getTopWindow((error, windowClass) => {
-  windowClass.getProperties((error, data) => {
-    var windowId = data.id;
-    if (windowId < 0) {
-      console.log(`Invalid windowId`);
-      return;
-    }
-    try {
-      // 3. Set the mouse pointer to the color picker style.
-      pointer.setPointerStyle(windowId, pointer.PointerStyle.COLOR_SUCKER).then(() => {
-        console.log(`Successfully set mouse pointer style`);
-      });
-    } catch (error) {
-      console.log(`Failed to set the pointer style, error=${JSON.stringify(error)}, msg=${JSON.stringify(message)}`);
-    }
-  });
+window.getLastWindow(this.context, (error, windowClass) => {
+  if (error.code) {
+    console.error('Failed to obtain the top window. Cause: ' + JSON.stringify(error));
+    return;
+  }
+  var windowId = windowClass.getWindowProperties().id;
+  if (windowId < 0) {
+    console.log(`Invalid windowId`);
+    return;
+  }
+  try {
+    // 3. Set the mouse pointer to the color picker style.
+    pointer.setPointerStyle(windowId, pointer.PointerStyle.COLOR_SUCKER).then(() => {
+      console.log(`Successfully set mouse pointer style`);
+    });
+  } catch (error) {
+    console.log(`Failed to set the pointer style, error=${JSON.stringify(error)}, msg=${JSON.stringify(`message`)}`);
+  }
 });
 // 4. End color pickup.
-window.getTopWindow((error, windowClass) => {
-  windowClass.getProperties((error, data) => {
-    var windowId = data.id;
-    if (windowId < 0) {
-      console.log(`Invalid windowId`);
-      return;
-    }
-    try {
-      // 5. Set the mouse pointer to the default style.
-      pointer.setPointerStyle(windowId, pointer.PointerStyle.DEFAULT).then(() => {
-        console.log(`Successfully set mouse pointer style`);
-      });
-    } catch (error) {
-      console.log(`Failed to set the pointer style, error=${JSON.stringify(error)}, msg=${JSON.stringify(message)}`);
-    }
-  });
+window.getLastWindow(this.context, (error, windowClass) => {
+  if (error.code) {
+    console.error('Failed to obtain the top window. Cause: ' + JSON.stringify(error));
+    return;
+  }
+  var windowId = windowClass.getWindowProperties().id;
+  if (windowId < 0) {
+    console.log(`Invalid windowId`);
+    return;
+  }
+  try {
+    // 5. Set the mouse pointer to the default style.
+    pointer.setPointerStyle(windowId, pointer.PointerStyle.DEFAULT).then(() => {
+      console.log(`Successfully set mouse pointer style`);
+    });
+  } catch (error) {
+    console.log(`Failed to set the pointer style, error=${JSON.stringify(error)}, msg=${JSON.stringify(`message`)}`);
+  }
 });
 ```

en/application-dev/reference/apis/js-apis-contact.md

@@ -166,6 +166,7 @@ Updates a contact based on the specified contact information. This API uses an a
 
   ```js
   contact.updateContact({
+      id: 1,
       name: {fullName: 'xxx'},
       phoneNumbers: [{phoneNumber: '138xxxxxxxx'}]
   }, (err) => {
@@ -200,6 +201,7 @@ Updates a contact based on the specified contact information and attributes. Thi
 
   ```js
   contact.updateContact({
+      id: 1,
       name: {fullName: 'xxx'},
       phoneNumbers: [{phoneNumber: '138xxxxxxxx'}]
   }, {
@@ -241,6 +243,7 @@ Updates a contact based on the specified contact information and attributes. Thi
 
   ```js
   let promise = contact.updateContact({
+      id: 1,
       name: {fullName: 'xxx'},
       phoneNumbers: [{phoneNumber: '138xxxxxxxx'}]
   }, {

en/application-dev/reference/apis/js-apis-pointer.md

@@ -2,7 +2,8 @@
 
 The **pointer** module provides APIs related to pointer attribute management.
 
-> **NOTE**<br>
+> **NOTE**
+>
 > The initial APIs of this module are supported since API version 9. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 ## Modules to Import
@@ -237,6 +238,8 @@ Obtains the mouse movement speed. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.MultimodalInput.Input.Pointer
 
+**System API**: This is a system API.
+
 **Return value**
 
 | Name                   | Description                 |
@@ -263,8 +266,6 @@ Obtains the mouse pointer style. This API uses an asynchronous callback to retur
 
 **System capability**: SystemCapability.MultimodalInput.Input.Pointer
 
-**System API**: This is a system API.
-
 **Parameters**
 
 | Name      | Type                                      | Mandatory  | Description            |
@@ -277,21 +278,23 @@ Obtains the mouse pointer style. This API uses an asynchronous callback to retur
 ```js
 import window from '@ohos.window';
 
-window.getTopWindow((error, win) => {
-  win.getWindowProperties((error, properties) => {
-    let windowId = properties.id;
-    if (windowId < 0) {
-      console.log(`Invalid windowId`);
-      return;
-    }
-    try {
-      pointer.getPointerStyle(windowId, (error, style) => {
-        console.log(`Get pointer style success, style: ${JSON.stringify(style)}`);
-      });
-    } catch (error) {
-      console.log(`Get pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
-    }
-  });
+window.getLastWindow(this.context, (error, win) => {
+  if (error.code) {
+    console.error('Failed to obtain the top window. Cause: ' + JSON.stringify(error));
+    return;
+  }
+  let windowId = win.getWindowProperties().id;
+  if (windowId < 0) {
+    console.log(`Invalid windowId`);
+    return;
+  }
+  try {
+    pointer.getPointerStyle(windowId, (error, style) => {
+      console.log(`Get pointer style success, style: ${JSON.stringify(style)}`);
+    });
+  } catch (error) {
+    console.log(`Get pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
+  }
 });
 ```
 
@@ -320,21 +323,23 @@ Obtains the mouse pointer style. This API uses a promise to return the result.
 ```js
 import window from '@ohos.window';
 
-window.getTopWindow((error, win) => {
-  win.getWindowProperties((error, properties) => {
-    let windowId = properties.id;
-    if (windowId < 0) {
-      console.log(`Invalid windowId`);
-      return;
-    }
-    try {
-      pointer.getPointerStyle(windowId).then((style) => {
-        console.log(`Get pointer style success, style: ${JSON.stringify(style)}`);
-      });
-    } catch (error) {
-      console.log(`Get pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
-    }
-  });
+window.getLastWindow(this.context, (error, win) => {
+  if (error.code) {
+    console.error('Failed to obtain the top window. Cause: ' + JSON.stringify(error));
+    return;
+  }
+  let windowId = win.getWindowProperties().id;
+  if (windowId < 0) {
+    console.log(`Invalid windowId`);
+    return;
+  }
+  try {
+    pointer.getPointerStyle(windowId).then((style) => {
+      console.log(`Get pointer style success, style: ${JSON.stringify(style)}`);
+    });
+  } catch (error) {
+    console.log(`Get pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
+  }
 });
 ```
 
@@ -359,21 +364,23 @@ Sets the mouse pointer style. This API uses an asynchronous callback to return t
 ```js
 import window from '@ohos.window';
 
-window.getTopWindow((error, win) => {
-  win.getWindowProperties((error, properties) => {
-    let windowId = properties.id;
-    if (windowId < 0) {
-      console.log(`Invalid windowId`);
-      return;
-    }
-    try {
-      pointer.setPointerStyle(windowId, pointer.PointerStyle.CROSS, error => {
-        console.log(`Set pointer style success`);
-      });
-    } catch (error) {
-      console.log(`Set pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
-    }
-  });
+window.getLastWindow(this.context, (error, win) => {
+  if (error.code) {
+    console.error('Failed to obtain the top window. Cause: ' + JSON.stringify(error));
+    return;
+  }
+  let windowId = win.getWindowProperties().id;
+  if (windowId < 0) {
+    console.log(`Invalid windowId`);
+    return;
+  }
+  try {
+    pointer.setPointerStyle(windowId, pointer.PointerStyle.CROSS, error => {
+      console.log(`Set pointer style success`);
+    });
+  } catch (error) {
+    console.log(`Set pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
+  }
 });
 ```
 ## pointer.setPointerStyle<sup>9+</sup>
@@ -397,21 +404,23 @@ Sets the mouse pointer style. This API uses a promise to return the result.
 ```js
 import window from '@ohos.window';
 
-window.getTopWindow((error, win) => {
-  win.getWindowProperties((error, properties) => {
-    let windowId = properties.id;
-    if (windowId < 0) {
-      console.log(`Invalid windowId`);
-      return;
-    }
-    try {
-      pointer.setPointerStyle(windowId, pointer.PointerStyle.CROSS).then(() => {
-        console.log(`Set pointer style success`);
-      });
-    } catch (error) {
-      console.log(`Set pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
-    }
-  });
+window.getLastWindow(this.context, (error, win) => {
+  if (error.code) {
+    console.error('Failed to obtain the top window. Cause: ' + JSON.stringify(error));
+    return;
+  }
+  let windowId = win.getWindowProperties().id;
+  if (windowId < 0) {
+    console.log(`Invalid windowId`);
+    return;
+  }
+  try {
+    pointer.setPointerStyle(windowId, pointer.PointerStyle.CROSS).then(() => {
+      console.log(`Set pointer style success`);
+    });
+  } catch (error) {
+    console.log(`Set pointer style failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
+  }
 });
 ```
 ## PointerStyle<sup>9+</sup>

en/device-dev/get-code/gettools-acquire.md

@@ -74,6 +74,7 @@ Before using the Docker environment, perform the following operations:
     > 
     > You do not need to obtain the source code for the HPM-based Docker environment.
 
+3.  Perform subsequent operations as a user who has the root permission or has been granted the permission to use Docker.
 
 ## Standalone Docker Environment<a name="section2858536103611"></a>
 

en/device-dev/subsystems/subsys-boot-init-deviceInfo.md

+# DeviceInfo Adaptation
+
+## DeviceInfo parameters and mapping APIs
+
+| Parameter| API| Description|
+|----------|------- |------|
+| const.product.devicetype | const char\* GetDeviceType(void) | Obtains the device type.|
+| const.product.manufacturer | const char\* GetManufacture(void) | Obtains the device manufacturer.|
+| const.product.brand | const char\* GetBrand(void) | Obtains the device brand.|
+| const.product.name | const char\* GetMarketName(void) | Obtains the device marketing name.|
+| const.build.product | const char\* GetProductSeries(void) | Obtains the device series name.|
+| const.product.model | const char\* GetProductModel(void) | Obtains the device authentication model.|
+| const.software.model | const char\* GetSoftwareModel(void) | Obtains the device software model.|
+| const.product.hardwareversion | const char\* GetHardwareModel(void) | Obtains the device hardware model.|
+| const.product.hardwareprofile | const char\* GetHardwareProfile(void) | Obtains the device hardware profile.|
+| ohos.boot.sn | const char\* GetSerial(void) | Obtains the serial number (SN) of the device.|
+| const.product.software.version | const char\* GetDisplayVersion(void) | Obtains the software version visible to users.|
+| const.product.bootloader.version | const char\* GetBootloaderVersion(void) | Obtains the bootloader version of the device.|
+| const.product.udid | int GetDevUdid(char \*udid, int size) | Obtains the UDID of the device through **DeviceInfo** or through calculation if the attempt to obtain the UDID through **DeviceInfo** fails.|
+| | const char *AclGetSerial(void); | Obtains the SN of the device (with ACL check).|
+| | int AclGetDevUdid(char *udid, int size); | Obtains the UDID of the device (with ACL check).|
+
+## DeviceInfo Source
+
+### Adaptation of OHOS Fixed-value Parameters
+
+- OHOS fixed-value parameters:
+
+  ```
+  const.ohos.version.security_patch
+  const.ohos.releasetype
+  const.ohos.apiversion
+  const.ohos.fullname
+  ```
+
+- Description of adaptation:
+
+  OHOS fixed-value parameters are filled by the OHOS and do not need to be adapted by vendors. Currently, these parameters are defined in the **/base/startup/init/services/etc/param/ohos_const/ohos.para** file.
+
+### Adaptation of Vendor Fixed-value Parameters
+
+- Vendor fixed-value parameters:
+
+  ```
+  const.product.devicetype
+  const.product.manufacturer
+  const.product.brand
+  const.product.name
+  const.build.product
+  const.product.model
+  const.software.model
+  const.product.hardwareversion
+  const.product.hardwareprofile
+  const.product.software.version
+  const.product.bootloader.version
+  const.build.characteristics
+  ... ...
+
+  ```
+
+
+- Description of adaptation:
+
+  Adapt parameters in the **vendor** directory based on actual requirements.
+
+   (1) Take RK3568 as an example for standard-system devices. Adapt parameters in the **/vendor/hihope/rk3568/etc/para/hardware_rk3568.para** file and install the file to the specified directory.
+
+   ```
+   ohos_prebuilt_etc("para_for_chip_prod") {
+    source = "./para/hardware_rk3568.para"
+    install_images = [ chip_prod_base_dir ]
+    relative_install_dir = "para"
+    part_name = "product_rk3568"
+   }
+   ```
+
+   (2) For mini- and small-system devices, adapt parameters in the respective **hals/utils/sys_param/vendor.para** file. For example:
+
+    ```
+    const.product.manufacturer=Talkweb
+
+    const.product.brand=Talkweb
+
+    const.product.name=Niobe
+
+    const.build.product=Niobe
+
+    const.product.model=Niobe407
+
+    const.software.model="2.0.0"
+
+    const.product.hardwareversion="1.0.0"
+
+    const.product.hardwareprofile="RAM:192K,ROM:1M,ETH:true"
+    ... ...
+    ```
+
+### Adaptation of Vendor Dynamic-value Parameters
+
+- Currently, three ways are provided to obtain vendor dynamic-value parameters: cmdline, macro definition, and **BUILD.gn** definition.
+
+  1. cmdline: Values that are read from cmdline include **ohos.boot.hardware**, **ohos.boot.bootslots**, and **ohos.boot.sn**. The way to obtain **ohos.boot.sn** differs according to the system type as follows:
+
+   (1) For standard-system devices: **ohos.boot.sn** is read from cmdline (generated by U-Boot). If the SN is obtained, the value is directly read; if the file path is obtained, the value is read from the file. If the preceding attempt fails, the value is read from the default SN files; that is, **/sys/block/mmcblk0/device/cid** and **/proc/bootdevice/cid**.
+
+   (2) For mini- and small-system devices: These devices may come with their own special algorithms. Therefore, **HalGetSerial()** can be used to obtain the SN from the **hal_sys_param.c** file in the **hals/utils/sys_param** directory.
+
+  2. Macro definition: Obtain parameter values by compiling macro definitions. Currently, this mode is available only for mini- and small-system devices. For example:
+
+  ```
+    defines = [
+    "INCREMENTAL_VERSION=\"${ohos_version}\"",
+    "BUILD_TYPE=\"${ohos_build_type}\"",
+    "BUILD_USER=\"${ohos_build_user}\"",
+    "BUILD_TIME=\"${ohos_build_time}\"",
+    "BUILD_HOST=\"${ohos_build_host}\"",
+    "BUILD_ROOTHASH=\"${ohos_build_roothash}\"",
+  ]
+  ```
+
+  3. **BUILD.gn** definition: Obtain parameter values from the **/base/startup/init/services/etc/BUILD.gn** file. For example:
+
+  ```
+    if (target_cpu == "arm64") {
+      extra_paras += [ "const.product.cpu.abilist=arm64-v8a" ]
+    }
+    if (build_variant == "user") {
+      extra_paras += [
+        "const.secure=1",
+        "const.debuggable=0",
+      ]
+    } else if (build_variant == "root") {
+      extra_paras += [
+        "const.secure=0",
+        "const.debuggable=1",
+      ]
+    }
+    if (device_type != "default") {
+      extra_paras += [
+        "const.product.devicetype=${device_type}",
+        "const.build.characteristics=${device_type}",
+      ]
+    }
+    module_install_dir = "etc/param"
+  }
+  ```
+#### Notes
+
+  (1) For small-system devices, add the compilation of **vendor.para** to the **hals/utils/sys_param/BUILD.gn** file.
+
+  ```
+  copy("vendor.para") {
+    sources = [ "./vendor.para" ]
+    outputs = [ "$root_out_dir/vendor/etc/param/vendor.para" ]
+  }
+  ```
+
+  (2) For mini-system devices, a file system is not available and therefore, the **hal_sys_param.c** and **vendor.para** files are converted into header files and are compiled to the system during compilation.