!16999 【docs】【帐号】应用帐号示例代码整改，挑单3.2

Merge pull request !16999 from lichenchen/0407_mr

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

@@ -2092,31 +2092,34 @@ getAuthCallback(sessionId: string, callback: AsyncCallback<AuthCallback>):
 **示例：**
 
   ```js
-  import featureAbility from '@ohos.ability.featureAbility';
-  featureAbility.getWant((err, want) => {
-    var sessionId = want.parameters[account_appAccount.Constants.KEY_SESSION_ID];
-    try {
-      appAccountManager.getAuthCallback(sessionId, (err, callback) => {
-        if (err.code != account_appAccount.ResultCode.SUCCESS) {
-            console.log("getAuthCallback err: "  + JSON.stringify(err));
-            return;
-        }
-        var result = {
-          accountInfo: {
-            name: "Lisi",
-            owner: "com.example.accountjsdemo",
-          },
-          tokenInfo: {
-            token: "xxxxxx",
-            authType: "getSocialData"
+  import UIAbility from '@ohos.app.ability.UIAbility';
+
+  export default class EntryAbility extends UIAbility {
+    onCreate(want, param) {
+      var sessionId = want.parameters[account_appAccount.Constants.KEY_SESSION_ID];
+      try {
+        appAccountManager.getAuthCallback(sessionId, (err, callback) => {
+          if (err.code != account_appAccount.ResultCode.SUCCESS) {
+              console.log("getAuthCallback err: "  + JSON.stringify(err));
+              return;
           }
-        }; 
-        callback.onResult(account_appAccount.ResultCode.SUCCESS, result);
-      });
-    } catch (err) {
-        console.log("getAuthCallback exception: "  + JSON.stringify(err));
+          var result = {
+            accountInfo: {
+              name: "Lisi",
+              owner: "com.example.accountjsdemo",
+            },
+            tokenInfo: {
+              token: "xxxxxx",
+              authType: "getSocialData"
+            }
+          };
+          callback.onResult(account_appAccount.ResultCode.SUCCESS, result);
+        });
+      } catch (err) {
+          console.log("getAuthCallback exception: "  + JSON.stringify(err));
+      }
     }
-  });
+  }
   ```
 
 ### getAuthCallback<sup>9+</sup>
@@ -2150,9 +2153,10 @@ getAuthCallback(sessionId: string): Promise&lt;AuthCallback&gt;
 **示例：**
 
   ```js
-  import featureAbility from '@ohos.ability.featureAbility';
+  import UIAbility from '@ohos.app.ability.UIAbility';
 
-  featureAbility.getWant().then((want) => {
+  export default class EntryAbility extends UIAbility {
+    onCreate(want, param) {
       var sessionId = want.parameters[account_appAccount.Constants.KEY_SESSION_ID];
       try {
         appAccountManager.getAuthCallback(sessionId).then((callback) => {
@@ -2168,14 +2172,13 @@ getAuthCallback(sessionId: string): Promise&lt;AuthCallback&gt;
         };
         callback.onResult(account_appAccount.ResultCode.SUCCESS, result);
         }).catch((err) => {
-            console.log("getAuthCallback err: "  + JSON.stringify(err));
+          console.log("getAuthCallback err: "  + JSON.stringify(err));
         });
       } catch (err) {
         console.log("getAuthCallback exception: "  + JSON.stringify(err));
       }
-  }).catch((err) => {
-      console.log("getWant err: "  + JSON.stringify(err));
-  });
+    }
+  }
   ```
 
 ### queryAuthenticatorInfo<sup>9+</sup>
@@ -4287,10 +4290,12 @@ getAuthenticatorCallback(sessionId: string, callback: AsyncCallback&lt;Authentic
 **示例：**
 
   ```js
-  import featureAbility from '@ohos.ability.featureAbility';
-  featureAbility.getWant((err, want) => {
-    var sessionId = want.parameters[account_appAccount.Constants.KEY_SESSION_ID];
-    appAccountManager.getAuthenticatorCallback(sessionId, (err, callback) => {
+  import UIAbility from '@ohos.app.ability.UIAbility';
+
+  export default class EntryAbility extends UIAbility {
+    onCreate(want, param) {
+      var sessionId = want.parameters[account_appAccount.Constants.KEY_SESSION_ID];
+      appAccountManager.getAuthenticatorCallback(sessionId, (err, callback) => {
         if (err.code != account_appAccount.ResultCode.SUCCESS) {
             console.log("getAuthenticatorCallback err: "  + JSON.stringify(err));
             return;
@@ -4300,8 +4305,9 @@ getAuthenticatorCallback(sessionId: string, callback: AsyncCallback&lt;Authentic
                       [account_appAccount.Constants.KEY_AUTH_TYPE]: "getSocialData",
                       [account_appAccount.Constants.KEY_TOKEN]: "xxxxxx"};
         callback.onResult(account_appAccount.ResultCode.SUCCESS, result);
-    });
-  });
+      });
+    }
+  }
   ```
 
 ### getAuthenticatorCallback<sup>(deprecated)</sup>
@@ -4331,22 +4337,22 @@ getAuthenticatorCallback(sessionId: string): Promise&lt;AuthenticatorCallback&gt
 **示例：**
 
   ```js
-  import featureAbility from '@ohos.ability.featureAbility';
+  import UIAbility from '@ohos.app.ability.UIAbility';
 
-  featureAbility.getWant().then((want) => {
+  export default class EntryAbility extends UIAbility {
+    onCreate(want, param) {
       var sessionId = want.parameters[account_appAccount.Constants.KEY_SESSION_ID];
       appAccountManager.getAuthenticatorCallback(sessionId).then((callback) => {
-          var result = {[account_appAccount.Constants.KEY_NAME]: "LiSi",
-                        [account_appAccount.Constants.KEY_OWNER]: "com.example.accountjsdemo",
-                        [account_appAccount.Constants.KEY_AUTH_TYPE]: "getSocialData",
-                        [account_appAccount.Constants.KEY_TOKEN]: "xxxxxx"};
-          callback.onResult(account_appAccount.ResultCode.SUCCESS, result);
+        var result = {[account_appAccount.Constants.KEY_NAME]: "LiSi",
+                      [account_appAccount.Constants.KEY_OWNER]: "com.example.accountjsdemo",
+                      [account_appAccount.Constants.KEY_AUTH_TYPE]: "getSocialData",
+                      [account_appAccount.Constants.KEY_TOKEN]: "xxxxxx"};
+        callback.onResult(account_appAccount.ResultCode.SUCCESS, result);
       }).catch((err) => {
-          console.log("getAuthenticatorCallback err: "  + JSON.stringify(err));
+        console.log("getAuthenticatorCallback err: "  + JSON.stringify(err));
       });
-  }).catch((err) => {
-      console.log("getWant err: "  + JSON.stringify(err));
-  });
+    }
+  }
   ```
 
 ### getAuthenticatorInfo<sup>(deprecated)</sup>

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

@@ -2432,7 +2432,7 @@ off(type: 'activate' | 'activating', name: string, callback?: Callback<number
 | 参数名   | 类型                       | 必填 | 说明                                                         |
 | -------- | -------------------------- | ---- | ------------------------------------------------------------ |
 | type     | 'activate' \| 'activating' | 是   | 取消订阅类型，activate表示取消订阅帐号已激活完成的事件，activating取消订阅帐号正在激活的事件。 |
-| name     | string                     | 是   | 订阅名称，可自定义，，要求非空且长度不超过1024字节，需要与订阅接口传入的值保持一致。 |
+| name     | string                     | 是   | 订阅名称，可自定义，要求非空且长度不超过1024字节，需要与订阅接口传入的值保持一致。 |
 | callback | Callback<number>     | 否   | 取消订阅系统帐号激活完成与激活中的事件回调，默认返回0。                      |
 
 **错误码：**