!24029 处理接口一致性问题0904

Merge pull request !24029 from yxn22/cherry-pick-1693967990

zh-cn/application-dev/reference/apis/js-apis-file-picker.md

@@ -8,13 +8,8 @@
 
 ## 导入模块
 
-> **说明：**
->
-> 示例代码里有使用BusinessError的都需要导入BusinessError模块，没有的话则不需要导入。
-
 ```ts
 import picker from '@ohos.file.picker';
-import { BusinessError } from '@ohos.base';
 ```
 
 ## PhotoViewPicker
@@ -52,6 +47,7 @@ select(option?: PhotoSelectOptions) : Promise<PhotoSelectResult>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example01() {
   try {  
     let PhotoSelectOptions = new picker.PhotoSelectOptions();
@@ -88,6 +84,7 @@ select(option: PhotoSelectOptions, callback: AsyncCallback<PhotoSelectResult&
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example02() {
   try {
     let PhotoSelectOptions = new picker.PhotoSelectOptions();
@@ -125,6 +122,7 @@ select(callback: AsyncCallback<PhotoSelectResult>) : void
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example03() {
   try {
     let photoPicker = new picker.PhotoViewPicker();
@@ -165,6 +163,7 @@ save(option?: PhotoSaveOptions) : Promise<Array<string>>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example04() {
   try {
     let PhotoSaveOptions = new picker.PhotoSaveOptions();
@@ -200,6 +199,7 @@ save(option: PhotoSaveOptions, callback: AsyncCallback<Array<string>&gt
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example05() {
   try {
     let PhotoSaveOptions = new picker.PhotoSaveOptions();
@@ -236,6 +236,7 @@ save(callback: AsyncCallback<Array<string>>) : void
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example06() {
   try {
     let photoPicker = new picker.PhotoViewPicker();
@@ -288,6 +289,7 @@ select(option?: DocumentSelectOptions) : Promise<Array<string>>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example07() {
   try {
     let DocumentSelectOptions = new picker.DocumentSelectOptions();
@@ -322,6 +324,7 @@ select(option: DocumentSelectOptions, callback: AsyncCallback<Array<string
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example08() {
   try {
     let DocumentSelectOptions = new picker.DocumentSelectOptions();
@@ -357,6 +360,7 @@ select(callback: AsyncCallback<Array<string>>) : void
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example09() {
   try {
     let documentPicker = new picker.DocumentViewPicker();
@@ -398,6 +402,7 @@ save(option?: DocumentSaveOptions) : Promise<Array<string>>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example10() {
   try {
     let DocumentSaveOptions = new picker.DocumentSaveOptions();
@@ -433,6 +438,7 @@ save(option: DocumentSaveOptions, callback: AsyncCallback<Array<string>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example11() {
   try {
     let DocumentSaveOptions = new picker.DocumentSaveOptions();
@@ -469,6 +475,7 @@ save(callback: AsyncCallback<Array<string>>) : void
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example12() {
   try {
     let documentPicker = new picker.DocumentViewPicker();
@@ -521,6 +528,7 @@ select(option?: AudioSelectOptions) : Promise<Array<string>>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example13() {
   try {
     let AudioSelectOptions = new picker.AudioSelectOptions();
@@ -555,6 +563,7 @@ select(option: AudioSelectOptions, callback: AsyncCallback<Array<string&gt
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example14() {
   try {
     let AudioSelectOptions = new picker.AudioSelectOptions();
@@ -590,6 +599,7 @@ select(callback: AsyncCallback<Array<string>>) : void
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example15() {
   try {
     let audioPicker = new picker.AudioViewPicker();
@@ -630,6 +640,7 @@ save(option?: AudioSaveOptions) : Promise<Array<string>>
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example16() {
   try {
     let AudioSaveOptions = new picker.AudioSaveOptions();
@@ -665,6 +676,7 @@ save(option: AudioSaveOptions, callback: AsyncCallback<Array<string>&gt
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example17() {
   try {
     let AudioSaveOptions = new picker.AudioSaveOptions();
@@ -701,6 +713,7 @@ save(callback: AsyncCallback<Array<string>>) : void
 **示例：**
 
 ```ts
+import { BusinessError } from '@ohos.base';
 async function example18() {
   try {
     let audioPicker = new picker.AudioViewPicker();

zh-cn/application-dev/reference/apis/js-apis-fileAccess.md

@@ -1764,7 +1764,7 @@ try {
 
 ### unregisterObserver<sup>10+</sup>
 
- unregisterObserver(uri: string, callback: Callback&lt;NotifyMessage&gt;): void
+ unregisterObserver(uri: string, callback?: Callback&lt;NotifyMessage&gt;): void
 
 取消注册指定的uri和callback。
 
@@ -1777,7 +1777,7 @@ try {
 | 参数名   | 类型                                              | 必填 | 说明                      |
 | -------- | ------------------------------------------------- | ---- | ------------------------- |
 | uri      | string                                            | 是   | 文件或目录的uri           |
-| callback | Callback&lt;[NotifyMessage](#notifymessage10)&gt; | 是   | 解注册uri下对应的callback |
+| callback | Callback&lt;[NotifyMessage](#notifymessage10)&gt; | 否   | 解注册uri下对应的callback。如果该参数不填，则解注册对应的所有callbackback |
 
 **示例1: 解注册监听uri的一个callback**
 
@@ -1829,23 +1829,7 @@ try {
 }
 ```
 
-### unregisterObserver<sup>10+</sup>
-
- unregisterObserver(uri: string): void
-
-取消注册指定的uri对应的所有callback。
-
-**系统能力**：SystemCapability.FileManagement.UserFileService
-
-**需要权限**：ohos.permission.FILE_ACCESS_MANAGER
-
-**参数：**
-
-| 参数名 | 类型   | 必填 | 说明            |
-| ------ | ------ | ---- | --------------- |
-| uri    | string | 是   | 文件或目录的uri |
-
-**示例1：解注册监听uri的所有callback**
+**示例3：解注册监听uri的所有callback**
 
 ```js
 let DirUri = 'file://docs/storage/Users/currentUser/Documents';
@@ -1936,8 +1920,6 @@ try {
 
 **系统能力**：SystemCapability.FileManagement.UserFileService
 
-**需要权限**：ohos.permission.FILE_ACCESS_MANAGER
-
 | 名称              | 值   | 说明                                                         |
 | ----------------- | ---- | ------------------------------------------------------------ |
 | NOTIFY_ADD        | 0    | 表示新增文件（详见registerObserver接口的示例2、示例3）                                                 |

zh-cn/release-notes/changelogs/OpenHarmony_4.0.9.5/changelogs-filemanagement.md

@@ -7,6 +7,7 @@ fileAccess 将不支持获取缩略图和媒体资源的部分查询
 2. FILEKEY 图像和音频选项下架
 
 **关键的接口/组件变更**
+
 删除接口如下
 
 | 类名           | 删除接口声明                                                 |