Update docs against 13588

Signed-off-by: wusongqing<wusongqing@huawei.com>

en/application-dev/file-management/medialibrary-album-guidelines.md

@@ -42,8 +42,8 @@ async function example() {
     let mediaType = mediaLibrary.MediaType.IMAGE;
     let DIR_IMAGE = mediaLibrary.DirectoryType.DIR_IMAGE;
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
-    const path = await media.getPublicDirectory(DIR_IMAGE)
+    let media = mediaLibrary.getMediaLibrary(context);
+    const path = await media.getPublicDirectory(DIR_IMAGE);
     // myAlbum is the path for storing the new file and the name of the new album.
     media.createAsset(mediaType, 'test.jpg', path + 'myAlbum/', (err, fileAsset) => {
         if (fileAsset != undefined) {
@@ -80,7 +80,7 @@ async function example() {
         selectionArgs: [],
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     let albumList = await media.getAlbums(AlbumNoArgsfetchOp);
     let album = albumList[0];
     album.albumName = 'newAlbum';
@@ -88,7 +88,7 @@ async function example() {
     album.commitModify().then(function() {
         console.info("albumRename successfully");
     }).catch(function(err){
-        console.info("albumRename failed with error:"+ err);
+        console.info("albumRename failed with error: " + err);
     });
 }
 ```

en/application-dev/file-management/medialibrary-filepath-guidelines.md

@@ -17,7 +17,7 @@ Before using file paths for development, learn the file formats supported by eac
 
 | Directory  | Directory Type     | Media Type     | Description          | Supported File Format                                              |
 | ---------- | ------------- | ------------- | -------------- | ------------------------------------------------------------ |
-| Camera/    | DIR_CAMERA    |    VIDEO and IMAGE     | Directory for storing images and videos taken by the camera. Videos and images can be stored in this directory and its subdirectories.| .bmp / .bm / .gif / .jpg /. jpeg / .jpe / .png / .webp / .raw / .svg / .heif / .mp4 / .3gp / .mpg / .mov / .webm / .mkv |
+| Camera/    | DIR_CAMERA    |    VIDEO and   IMAGE      | Directory for storing images and videos taken by the camera. Videos and images can be stored in this directory and its subdirectories.| .bmp / .bm / .gif / .jpg /. jpeg / .jpe / .png / .webp / .raw / .svg / .heif / .mp4 / .3gp / .mpg / .mov / .webm / .mkv |
 | Videos/    | DIR_VIDEO     | VIDEO | Dedicated video directory. Only videos can be stored in this directory and its subdirectories.| .mp4 / .3gp / .mpg / .mov / .webm / .mkv                     |
 | Pictures/  | DIR_IMAGE     | IMAGE | Dedicated image directory. Only images can be stored in this directory and its subdirectories.| .bmp / .bm / .gif / .jpg /. jpeg / .jpe / .png / .webp / .raw / .svg / .heif |
 | Audios/    | DIR_AUDIO     | AUDIO |Dedicated audio directory. Only audio files can be stored in this directory and its subdirectories.| .aac/.mp3/.flac/.wav/.ogg                                    |
@@ -38,7 +38,7 @@ The following describes how to obtain the public directory that stores camera fi
 ```ts
 async function example(){
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     let DIR_CAMERA = mediaLibrary.DirectoryType.DIR_CAMERA;
     const dicResult = await media.getPublicDirectory(DIR_CAMERA);
     if (dicResult == 'Camera/') {
@@ -69,7 +69,7 @@ You can call [fileio.open](../reference/apis/js-apis-fileio.md#fileioopen7) to o
 
 **How to Develop**
 
-1. Call [Context.getFilesDir](../reference/apis/js-apis-inner-app-context.md#contextgetfilesdir) to obtain the directory of the application sandbox.
+1. Call [context.filesDir](../reference/apis/js-apis-inner-app-context.md#contextgetfilesdir) to obtain the directory of the application sandbox.
 2. Call **MediaLibrary.getFileAssets** and **FetchFileResult.getFirstObject** to obtain the first file in the result set of the public directory.
 3. Call **fileio.open** to open the file in the sandbox.
 4. Call **fileAsset.open** to open the file in the public directory.
@@ -81,11 +81,11 @@ You can call [fileio.open](../reference/apis/js-apis-fileio.md#fileioopen7) to o
 ```ts
 async function copyPublic2Sandbox() {
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     let sandboxDirPath = globalThis.context.filesDir;
-    let fileKeyObj = mediaLibrary.FileKey
+    let fileKeyObj = mediaLibrary.FileKey;
     let fileAssetFetchOp = {
-        selections: fileKeyObj.DISPLAY_NAME + '= ?' ,
+        selections: fileKeyObj.DISPLAY_NAME + '= ?',
         selectionArgs: ['testFile.txt'],
     };
     let fetchResult = await media.getFileAssets(fileAssetFetchOp);
@@ -108,7 +108,7 @@ async function copyPublic2Sandbox() {
 ```ts
 async function copySandbox2Public() {
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     let sandboxDirPath = globalThis.context.filesDir;
 
     let DIR_DOCUMENTS = mediaLibrary.DirectoryType.DIR_DOCUMENTS;
@@ -120,26 +120,26 @@ async function copySandbox2Public() {
         console.info('createFile failed, message = ' + err);
     }
     try {
-        let fileKeyObj = mediaLibrary.FileKey
+        let fileKeyObj = mediaLibrary.FileKey;
         let fileAssetFetchOp = {
-            selections: fileKeyObj.DISPLAY_NAME + '= ?' ,
+            selections: fileKeyObj.DISPLAY_NAME + '= ?',
             selectionArgs: ['testFile02.txt'],
         };
         let fetchResult = await media.getFileAssets(fileAssetFetchOp);
         var fileAsset = await fetchResult.getFirstObject();
     } catch (err) {
-        console.info('file asset get failed, message = ', err)
+        console.info('file asset get failed, message = ' + err);
     }
-    var fdPub = await fileAsset.open('rw');
-    var fdSand = await fileio.open(sandboxDirPath + 'testFile.txt', 0o2);
+    let fdPub = await fileAsset.open('rw');
+    let fdSand = await fileio.open(sandboxDirPath + 'testFile.txt', 0o2);
     await fileio.copyFile(fdSand, fdPub);
     await fileio.close(fdPub);
     await fileio.close(fdSand);
     let fdPubRead = await fileAsset.open('rw');
     try {
-        var arrayBuffer = new ArrayBuffer(4096);
+        let arrayBuffer = new ArrayBuffer(4096);
         await fileio.read(fdPubRead, arrayBuffer);
-        var content_pub = String.fromCharCode(new Uint8Array(arrayBuffer));
+        var content_pub = String.fromCharCode(...new Uint8Array(arrayBuffer));
         fileAsset.close(fdPubRead);
     } catch (err) {
         console.log('read text failed, message = ', err);
@@ -167,12 +167,12 @@ You can use **FileAsset.open** and **FileAsset.close** of [mediaLibrary](../refe
        let mediaType = mediaLibrary.MediaType.FILE;
        let DIR_DOCUMENTS = mediaLibrary.DirectoryType.DIR_DOCUMENTS;
        const context = getContext(this);
-       var media = mediaLibrary.getMediaLibrary(context);
+       let media = mediaLibrary.getMediaLibrary(context);
        const path = await media.getPublicDirectory(DIR_DOCUMENTS);
        media.createAsset(mediaType, "testFile.text", path).then (function (asset) {
-           console.info("createAsset successfully:"+ JSON.stringify(asset));
+           console.info("createAsset successfully:" + JSON.stringify(asset));
        }).catch(function(err){
-           console.info("createAsset failed with error:"+ err);
+           console.info("createAsset failed with error: " + err);
        });
    }
    ```
@@ -192,10 +192,10 @@ You can use **FileAsset.open** and **FileAsset.close** of [mediaLibrary](../refe
 ```ts
 async function writeOnlyPromise() {
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
-    let fileKeyObj = mediaLibrary.FileKey
+    let media = mediaLibrary.getMediaLibrary(context);
+    let fileKeyObj = mediaLibrary.FileKey;
     let fileAssetFetchOp = {
-        selections: fileKeyObj.DISPLAY_NAME + '= ?' ,
+        selections: fileKeyObj.DISPLAY_NAME + '= ?',
         selectionArgs: ['testFile.txt'],
     };
     let fetchResult = await media.getFileAssets(fileAssetFetchOp);
@@ -218,8 +218,8 @@ async function writeOnlyPromise() {
 ```ts
 async function readOnlyPromise() {
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
-    let fileKeyObj = mediaLibrary.FileKey
+    let media = mediaLibrary.getMediaLibrary(context);
+    let fileKeyObj = mediaLibrary.FileKey;
     let fileAssetFetchOp = {
         selections: fileKeyObj.DISPLAY_NAME + '= ?' ,
         selectionArgs: ['testFile.txt'],
@@ -233,7 +233,7 @@ async function readOnlyPromise() {
         let arrayBuffer = new ArrayBuffer(4096);
         await fileio.read(fd, arrayBuffer);
         let fileContent = String.fromCharCode(...new Uint8Array(arrayBuffer));
-        globalThis.fileContent = fileContent
+        globalThis.fileContent = fileContent;
         globalThis.fileName = fileAsset.displayName;
         console.info('file content: ', fileContent);
         await fileAsset.close(fd);

en/application-dev/file-management/medialibrary-overview.md

@@ -22,7 +22,7 @@ The **mediaLibrary** module provides APIs for you to access and modify media fil
 >
 > This development guide applies only to the stage model (available from API version 9).
 
-To access and modify personal media data, an application must obtain a **MediaLibrary** instance and request the media asset read and write permissions from the user.
+To access and modify personal media data, an application must obtain a **MediaLibrary** instance and request the media asset read and write permissions from the user. Unless otherwise specified, the **MediaLibrary** APIs are used in **pages/index.ets** or custom .ets files of the project code.
 
 Before using the **MediaLibrary** APIs to develop features, you must learn how to:
 
@@ -43,7 +43,7 @@ An application must call [getMediaLibrary](../reference/apis/js-apis-medialibrar
 import mediaLibrary from '@ohos.multimedia.mediaLibrary';
 
 const context = getContext(this);
-var media = mediaLibrary.getMediaLibrary(context);
+let media = mediaLibrary.getMediaLibrary(context);
 ```
 
 ## Requesting Permissions
@@ -56,7 +56,7 @@ To read and write a **MediaLibrary** instance, you must have the required permis
 | ohos.permission.WRITE_MEDIA    | Allows an application to read media files from and write media files into the user's external storage.| user_grant |
 | ohos.permission.MEDIA_LOCATION | Allows an application to access geographical locations in the user's media file.| user_grant |
 
-After configuring the permissions in the **module.json5** file, the application must call [Context.requestPermissionsFromUser](../reference/apis/js-apis-ability-context.md#abilitycontextrequestpermissionsfromuser) to check for the required permissions and if they are not granted, request the permissions from the user by displaying a dialog box.
+After configuring the permissions in the **module.json5** file, the application must call [abilityAccessCtrl.requestPermissionsFromUser](../reference/apis/js-apis-abilityAccessCtrl.md#requestpermissionsfromuser9) to check for the required permissions and if they are not granted, request the permissions from the user by displaying a dialog box.
 
 > **NOTE**<br>Even if the user has granted a permission, the application must check for the permission before calling an API protected by the permission. It should not persist the permission granted status, because the user can revoke the permission through the system application **Settings**.
 
@@ -103,19 +103,21 @@ After configuring the permissions in the **module.json5** file, the application
    }    
    ```
 
-2. Call **requestPermissionsFromUser** to check for the required permissions and if they are not granted, request the permissions from the user by displaying a dialog box.
+2. In the **Ability.ts** file, call **requestPermissionsFromUser** in the **onWindowStageCreate** callback to check for the required permissions and if they are not granted, request the permissions from the user by displaying a dialog box.
 
    ```ts
-   import Ability from '@ohos.application.Ability'
-   
+   import UIAbility from '@ohos.app.ability.UIAbility';
+   import abilityAccessCtrl, {Permissions} from '@ohos.abilityAccessCtrl';
+
    export default class MainAbility extends Ability {
        onWindowStageCreate(windowStage) {
-           var permissions=['ohos.permission.READ_MEDIA','ohos.permission.WRITE_MEDIA']
-           var permissionRequestResult;
-           this.context.requestPermissionsFromUser(permissions,(err,result) => {
-               if(err){
+           let list : Array<Permissions> = ['ohos.permission.READ_MEDIA', 'ohos.permission.WRITE_MEDIA'];
+           let permissionRequestResult;
+           let atManager = abilityAccessCtrl.createAtManager();
+           atManager.requestPermissionsFromUser(this.context, list, (err, result) => {
+               if (err) {
                    console.log('requestPermissionsFromUserError: ' + JSON.stringify(err));
-               }else{
+               } else {
                    permissionRequestResult=result;
                    console.log('permissionRequestResult: ' + JSON.stringify(permissionRequestResult));
                }    
@@ -123,5 +125,3 @@ After configuring the permissions in the **module.json5** file, the application
        }
    }
    ```
-
-   

en/application-dev/file-management/medialibrary-resource-guidelines.md

@@ -33,14 +33,14 @@ To specify the image as the media type, set **selectionArgs** to **MediaType.IMA
 
 ```ts
 async function example() {
-    let fileKeyObj = mediaLibrary.FileKey
-    let fileType = mediaLibrary.MediaType.IMAGE
+    let fileKeyObj = mediaLibrary.FileKey;
+    let fileType = mediaLibrary.MediaType.IMAGE;
     let option = {
         selections: fileKeyObj.MEDIA_TYPE + '= ?',
         selectionArgs: [fileType.toString()],
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const fetchFileResult = await media.getFileAssets(option);
     for (let i = 0; i < fetchFileResult.getCount(); i++) {
         fetchFileResult.getNextObject((err, fileAsset) => {
@@ -64,13 +64,13 @@ To specify the date 2022-8-5, set **selectionArgs** to **2022-8-5**.
 
 ```ts
 async function example() {
-    let fileKeyObj = mediaLibrary.FileKey
+    let fileKeyObj = mediaLibrary.FileKey;
     let option = {
         selections: fileKeyObj.DATE_ADDED + '= ?',
         selectionArgs: ['2022-8-5'],
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const fetchFileResult = await media.getFileAssets(option);
     for (let i = 0; i < fetchFileResult.getCount(); i++) {
         fetchFileResult.getNextObject((err, fileAsset) => {
@@ -92,15 +92,15 @@ To sort files in descending order by the date when they are added, set **order**
 
 ```ts
 async function example() {
-    let fileKeyObj = mediaLibrary.FileKey
-    let fileType = mediaLibrary.MediaType.IMAGE
+    let fileKeyObj = mediaLibrary.FileKey;
+    let fileType = mediaLibrary.MediaType.IMAGE;
     let option = {
         selections: fileKeyObj.MEDIA_TYPE + '= ?',
         selectionArgs: [fileType.toString()],
         order: fileKeyObj.DATE_ADDED + " DESC",
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const fetchFileResult = await media.getFileAssets(option);
     for (let i = 0; i < fetchFileResult.getCount(); i++) {
         fetchFileResult.getNextObject((err, fileAsset) => {
@@ -124,14 +124,14 @@ To specify the album name **'myAlbum'**, set **selectionArgs** to **'myAlbum'**.
 
 ```ts
 async function example() {
-    let fileKeyObj = mediaLibrary.FileKey
-    let fileType = mediaLibrary.MediaType.IMAGE
+    let fileKeyObj = mediaLibrary.FileKey;
+    let fileType = mediaLibrary.MediaType.IMAGE;
     let option = {
         selections: fileKeyObj.ALBUM_NAME + '= ?',
         selectionArgs: ['myAlbum'],
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const fetchFileResult = await media.getFileAssets(option);
     for (let i = 0; i < fetchFileResult.getCount(); i++) {
         fetchFileResult.getNextObject((err, fileAsset) => {
@@ -189,7 +189,7 @@ Complete sample code:
 ```ts
 async function getCameraImagePromise() {
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     let fileKeyObj = mediaLibrary.FileKey;
     let imageType = mediaLibrary.MediaType.IMAGE;
     let imagesFetchOp = {
@@ -236,7 +236,7 @@ The following describes how to obtain the thumbnail (size: 720 x 720) of the fir
 ```ts
 async function getFirstThumbnailPromise() {
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     let fileKeyObj = mediaLibrary.FileKey;
     let imageType = mediaLibrary.MediaType.IMAGE;
     let imagesFetchOp = {
@@ -280,7 +280,7 @@ async function example() {
     let mediaType = mediaLibrary.MediaType.FILE;
     let DIR_DOCUMENTS = mediaLibrary.DirectoryType.DIR_DOCUMENTS;
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const path = await media.getPublicDirectory(DIR_DOCUMENTS);
     media.createAsset(mediaType, "testFile.text", path).then ((asset) => {
         console.info("createAsset successfully:"+ JSON.stringify(asset));
@@ -312,25 +312,25 @@ The following describes how to move the first file in the result set to the recy
 
 ```ts
 async function example() {
-    let fileKeyObj = mediaLibrary.FileKey
-    let fileType = mediaLibrary.MediaType.FILE
+    let fileKeyObj = mediaLibrary.FileKey;
+    let fileType = mediaLibrary.MediaType.FILE;
     let option = {
         selections: fileKeyObj.MEDIA_TYPE + '= ?',
         selectionArgs: [fileType.toString()],
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const fetchFileResult = await media.getFileAssets(option);
     let asset = await fetchFileResult.getFirstObject();
     if (asset == undefined) {
-      console.error('asset not exist')
-      return
+      console.error('asset not exist');
+      return;
     }
     // Void callback.
     asset.trash(true).then(() => {
         console.info("trash successfully");
     }).catch((err) => {
-        console.info("trash failed with error:"+ err);
+        console.info("trash failed with error: " + err);
     });
 }
 ```
@@ -358,19 +358,19 @@ The following describes how to rename the first file in the result set as **newt
 
 ```ts
 async function example() {
-    let fileKeyObj = mediaLibrary.FileKey
-    let fileType = mediaLibrary.MediaType.FILE
+    let fileKeyObj = mediaLibrary.FileKey;
+    let fileType = mediaLibrary.MediaType.FILE;
     let option = {
         selections: fileKeyObj.MEDIA_TYPE + '= ?',
         selectionArgs: [fileType.toString()],
     };
     const context = getContext(this);
-    var media = mediaLibrary.getMediaLibrary(context);
+    let media = mediaLibrary.getMediaLibrary(context);
     const fetchFileResult = await media.getFileAssets(option);
     let asset = await fetchFileResult.getFirstObject();
     if (asset == undefined) {
-      console.error('asset not exist')
-      return
+      console.error('asset not exist');
+      return;
     }
     asset.displayName = 'newImage.jpg';
     // Void callback.
@@ -380,6 +380,6 @@ async function example() {
            return;
        }
        console.log('fileRename successful.');
-    })
+    });
 }
 ```