IssueNo:#I5QUG1

Description:FeatureAbility和Context接口示例问题修改
Sig:SIG_ApplicationFramework
Feature or Bugfix:Bugfix
Binary Source: No
Signed-off-by: Ndy_study <dingyao5@huawei.com>
Change-Id: I36cd823010c189dfc2b4b7b63dfdb3327ef1cf46

zh-cn/application-dev/ability/context-userguide.md

@@ -94,13 +94,13 @@ export default {
 **示例**
 
 ```javascript
-import AbilityStage from "@ohos.application.AbilityStage";
+import Ability from "@ohos.application.Ability";
 
 var lifecycleid;
 
-export default class MyAbilityStage extends AbilityStage {
+export default class MainAbility extends Ability {
     onCreate() {
-        console.log("MyAbilityStage onCreate")
+        console.log("MainAbility onCreate")
         let AbilityLifecycleCallback  =  {
             onAbilityCreate(ability){
                 console.log("AbilityLifecycleCallback onAbilityCreate ability:" + JSON.stringify(ability));        
@@ -139,11 +139,11 @@ export default class MyAbilityStage extends AbilityStage {
         // 2.通过applicationContext注册监听应用内生命周期
         lifecycleid = applicationContext.registerAbilityLifecycleCallback(AbilityLifecycleCallback);
         console.log("registerAbilityLifecycleCallback number: " + JSON.stringify(lifecycleid));       
-    }
+    },
     onDestroy() {
         let applicationContext = this.context.getApplicationContext();
         applicationContext.unregisterAbilityLifecycleCallback(lifecycleid, (error, data) => {
-        console.log("unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error));
+            console.log("unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error));
         });
     }
 }

zh-cn/application-dev/ability/fa-serviceability.md

@@ -176,7 +176,7 @@ let promise = featureAbility.startAbility(
 
     ```javascript
     import featureAbility from '@ohos.ability.featureAbility';
-    let connId = featureAbility.connectAbility(
+    let connectId = featureAbility.connectAbility(
         {
             bundleName: "com.jstest.service",
             abilityName: "com.jstest.service.ServiceAbility",
@@ -293,7 +293,7 @@ function getRemoteDeviceId() {
 
 ```ts
 import featureAbility from '@ohos.ability.featureAbility';
-let connId = featureAbility.connectAbility(
+let connectId = featureAbility.connectAbility(
     {
         deviceId: getRemoteDeviceId(),
         bundleName: "ohos.samples.etsDemo",

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

@@ -33,13 +33,13 @@ onConfigurationUpdated(config: Configuration): void;
     
 
   ```js
-import AbilityStage from "@ohos.application.AbilityStage";
+import Ability from "@ohos.application.Ability";
 
 var callbackId;
 
-export default class MyAbilityStage extends AbilityStage {
+export default class MyAbility extends Ability {
     onCreate() {
-        console.log("MyAbilityStage onCreate")
+        console.log("MyAbility onCreate")
         globalThis.applicationContext = this.context.getApplicationContext();
         let EnvironmentCallback  =  {
             onConfigurationUpdated(config){

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

@@ -157,11 +157,11 @@ onAbilityContinue(ability: Ability): void;
     
 
   ```js
-  import AbilityStage from "@ohos.application.AbilityStage";
+  import Ability from "@ohos.application.Ability";
   
-  export default class MyAbilityStage extends AbilityStage {
+  export default class MyAbility extends Ability {
       onCreate() {
-          console.log("MyAbilityStage onCreate")
+          console.log("MyAbility onCreate")
           let AbilityLifecycleCallback  =  {
               onAbilityCreate(ability){
                   console.log("AbilityLifecycleCallback onAbilityCreate ability:" + JSON.stringify(ability));        
@@ -200,6 +200,12 @@ onAbilityContinue(ability: Ability): void;
           // 2.通过applicationContext注册监听应用内生命周期
           let lifecycleid = applicationContext.registerAbilityLifecycleCallback(AbilityLifecycleCallback);
           console.log("registerAbilityLifecycleCallback number: " + JSON.stringify(lifecycleid));       
+      },
+      onDestroy() {
+          let applicationContext = this.context.getApplicationContext();
+          applicationContext.unregisterAbilityLifecycleCallback(lifecycleid, (error, data) => {
+              console.log("unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error));
+          });
       }
   }
   ```
\ No newline at end of file

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

@@ -39,13 +39,13 @@ registerAbilityLifecycleCallback(callback: AbilityLifecycleCallback): **number**
 **示例：**
 
   ```js
-import AbilityStage from "@ohos.application.AbilityStage";
+import Ability from "@ohos.application.Ability";
 
 var lifecycleId;
 
-export default class MyAbilityStage extends AbilityStage {
+export default class MyAbility extends Ability {
     onCreate() {
-        console.log("MyAbilityStage onCreate")
+        console.log("MyAbility onCreate")
         let AbilityLifecycleCallback  =  {
             onAbilityCreate(ability){
                 console.log("AbilityLifecycleCallback onAbilityCreate ability:" + JSON.stringify(ability));        
@@ -84,7 +84,7 @@ export default class MyAbilityStage extends AbilityStage {
         // 2.通过applicationContext注册监听应用内生命周期
         lifecycleId = applicationContext.registerAbilityLifecycleCallback(AbilityLifecycleCallback);
         console.log("registerAbilityLifecycleCallback number: " + JSON.stringify(lifecycleId));
-    }
+    },
     onDestroy() {
         let applicationContext = this.context.getApplicationContext();
         applicationContext.unregisterAbilityLifecycleCallback(lifecycleId, (error, data) => {
@@ -144,13 +144,13 @@ registerEnvironmentCallback(callback: EnvironmentCallback): **number**;
 **示例：**
 
   ```js
-import AbilityStage from "@ohos.application.AbilityStage";
+import Ability from "@ohos.application.Ability";
 
 var callbackId;
 
-export default class MyAbilityStage extends AbilityStage {
+export default class MyAbility extends Ability {
     onCreate() {
-        console.log("MyAbilityStage onCreate")
+        console.log("MyAbility onCreate")
         globalThis.applicationContext = this.context.getApplicationContext();
         let EnvironmentCallback = {
             onConfigurationUpdated(config){

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

@@ -14,7 +14,7 @@ FeatureAbility模块的接口只能在Page类型的Ability调用
 ## 导入模块
 
 ```
-import featureAbility from '@ohos.ability.featureAbility'
+import featureAbility from '@ohos.ability.featureAbility';
 ```
 
 ## featureAbility.startAbility
@@ -35,8 +35,8 @@ startAbility(parameter: StartAbilityParameter, callback: AsyncCallback\<number>)
 **示例：**
 
 ```javascript
-import featureAbility from '@ohos.ability.featureAbility'
-import wantConstant from '@ohos.ability.wantConstant'
+import featureAbility from '@ohos.ability.featureAbility';
+import wantConstant from '@ohos.ability.wantConstant';
 featureAbility.startAbility(
     {
         want:
@@ -52,6 +52,9 @@ featureAbility.startAbility(
             uri: ""
         },
     },
+    (err, data) => {
+        console.info("startAbility err: " + JSON.stringify(err) + "data: " + JSON.stringify(data));
+    }
 );
 ```
 
@@ -74,8 +77,8 @@ startAbility(parameter: StartAbilityParameter): Promise\<number>
 **示例：**
 
 ```javascript
-import featureAbility from '@ohos.ability.featureAbility'
-import wantConstant from '@ohos.ability.wantConstant'
+import featureAbility from '@ohos.ability.featureAbility';
+import wantConstant from '@ohos.ability.wantConstant';
 featureAbility.startAbility(
     {
         want:
@@ -83,7 +86,7 @@ featureAbility.startAbility(
             action: "action.system.home",
             entities: ["entity.system.home"],
             type: "MIMETYPE",
-			flags: wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION,
+            flags: wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION,
             deviceId: "",
             bundleName: "com.example.myapplication",
             /* FA模型中abilityName由package + Ability name组成 */
@@ -92,7 +95,7 @@ featureAbility.startAbility(
         },
     }
 ).then((data) => {
-	console.info("==========================>startAbility=======================>");
+    console.info("startAbility data: " + JSON.stringify(data));
 });
 ```
 
@@ -119,10 +122,10 @@ acquireDataAbilityHelper(uri: string): DataAbilityHelper
 **示例：**
 
 ```javascript
-import featureAbility from '@ohos.ability.featureAbility'
-featureAbility.acquireDataAbilityHelper(
+import featureAbility from '@ohos.ability.featureAbility';
+var dataAbilityHelper = featureAbility.acquireDataAbilityHelper(
     "dataability:///com.example.DataAbility"
-)
+);
 ```
 
 ## featureAbility.startAbilityForResult<sup>7+</sup>
@@ -144,7 +147,7 @@ startAbilityForResult(parameter: StartAbilityParameter, callback: AsyncCallback\
 
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
-import wantConstant from '@ohos.ability.wantConstant'
+import wantConstant from '@ohos.ability.wantConstant';
 featureAbility.startAbilityForResult(
    {
         want:
@@ -161,9 +164,9 @@ featureAbility.startAbilityForResult(
         },
     },
     (err, data) => {
-        console.info("err: " + JSON.stringify(err) + "data: " + JSON.stringify(data))
+        console.info("startAbilityForResult err: " + JSON.stringify(err) + "data: " + JSON.stringify(data));
     }
-)
+);
 ```
 
 ## featureAbility.startAbilityForResult<sup>7+</sup>
@@ -190,7 +193,7 @@ startAbilityForResult(parameter: StartAbilityParameter): Promise\<AbilityResult>
 
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
-import wantConstant from '@ohos.ability.wantConstant'
+import wantConstant from '@ohos.ability.wantConstant';
 featureAbility.startAbilityForResult(
     {
         want:
@@ -218,7 +221,7 @@ featureAbility.startAbilityForResult(
         },
     },
 ).then((data) => {
-    console.info("==========================>startAbilityForResult=======================>");
+    console.info("startAbilityForResult data: " + JSON.stringify(data));
 });
 ```
 
@@ -240,8 +243,8 @@ terminateSelfWithResult(parameter: AbilityResult, callback: AsyncCallback\<void>
 **示例：**
 
 ```javascript
-import featureAbility from '@ohos.ability.featureAbility'
-import wantConstant from '@ohos.ability.wantConstant'
+import featureAbility from '@ohos.ability.featureAbility';
+import wantConstant from '@ohos.ability.wantConstant';
 featureAbility.terminateSelfWithResult(
     {
         resultCode: 1,
@@ -295,7 +298,7 @@ terminateSelfWithResult(parameter: AbilityResult): Promise\<void>
 
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
-import wantConstant from '@ohos.ability.wantConstant'
+import wantConstant from '@ohos.ability.wantConstant';
 featureAbility.terminateSelfWithResult(
     {
         resultCode: 1,
@@ -345,7 +348,9 @@ hasWindowFocus(callback: AsyncCallback\<boolean>): void
 
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
-featureAbility.hasWindowFocus()
+featureAbility.hasWindowFocus((err, data) => {
+    console.info("hasWindowFocus err: " + JSON.stringify(err) + "data: " + JSON.stringify(data));
+});
 ```
 
 ## featureAbility.hasWindowFocus<sup>7+<sup>
@@ -367,7 +372,7 @@ hasWindowFocus(): Promise\<boolean>
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
 featureAbility.hasWindowFocus().then((data) => {
-    console.info("==========================>hasWindowFocus=======================>");
+    console.info("hasWindowFocus data: " + JSON.stringify(data));
 });
 ```
 
@@ -389,7 +394,9 @@ getWant(callback: AsyncCallback\<Want>): void
 
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
-featureAbility.getWant()
+featureAbility.getWant((err, data) => {
+    console.info("getWant err: " + JSON.stringify(err) + "data: " + JSON.stringify(data));
+});
 ```
 
 ## featureAbility.getWant
@@ -411,7 +418,7 @@ getWant(): Promise\<Want>
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
 featureAbility.getWant().then((data) => {
-	console.info("==========================>getWantCallBack=======================>");
+    console.info("getWant data: " + JSON.stringify(data));
 });
 ```
 
@@ -434,7 +441,9 @@ getContext(): Context
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
 var context = featureAbility.getContext()
-context.getBundleName()
+context.getBundleName((err, data) => {
+    console.info("getBundleName err: " + JSON.stringify(err) + "data: " + JSON.stringify(data));
+});
 ```
 
 ## featureAbility.terminateSelf<sup>7+</sup>
@@ -455,7 +464,7 @@ terminateSelf(callback: AsyncCallback\<void>): void
 
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
-featureAbility.terminateSelf()
+featureAbility.terminateSelf();
 ```
 
 ## featureAbility.terminateSelf<sup>7+</sup>
@@ -477,7 +486,7 @@ terminateSelf(): Promise\<void>
 ```javascript
 import featureAbility from '@ohos.ability.featureAbility';
 featureAbility.terminateSelf().then((data) => {
-    console.info("==========================>terminateSelfCallBack=======================>");
+    console.info("==========================>terminateSelf=======================>");
 });
 ```
 
@@ -517,8 +526,8 @@ ConnectOptions类型说明
 **示例：**
 
 ```javascript
-import rpc from '@ohos.rpc'
-import featureAbility from '@ohos.ability.featureAbility'
+import rpc from '@ohos.rpc';
+import featureAbility from '@ohos.ability.featureAbility';
 function onConnectCallback(element, remote){
     console.log('ConnectAbility onConnect remote is proxy:' + (remote instanceof rpc.RemoteProxy));
 }
@@ -528,7 +537,7 @@ function onDisconnectCallback(element){
 function onFailedCallback(code){
     console.log('featureAbilityTest ConnectAbility onFailed errCode : ' + code)
 }
-var connId = featureAbility.connectAbility(
+var connectId = featureAbility.connectAbility(
     {
         deviceId: "",
         bundleName: "com.ix.ServiceAbility",
@@ -560,8 +569,8 @@ disconnectAbility(connection: number, callback:AsyncCallback\<void>): void
 **示例：**
 
 ```javascript
-import rpc from '@ohos.rpc'
-import featureAbility from '@ohos.ability.featureAbility'
+import rpc from '@ohos.rpc';
+import featureAbility from '@ohos.ability.featureAbility';
 function onConnectCallback(element, remote){
     console.log('ConnectAbility onConnect remote is proxy:' + (remote instanceof rpc.RemoteProxy));
 }
@@ -571,7 +580,7 @@ function onDisconnectCallback(element){
 function onFailedCallback(code){
     console.log('featureAbilityTest ConnectAbility onFailed errCode : ' + code)
 }
-var connId = featureAbility.connectAbility(
+var connectId = featureAbility.connectAbility(
     {
         bundleName: "com.ix.ServiceAbility",
         abilityName: "ServiceAbilityA",
@@ -582,7 +591,7 @@ var connId = featureAbility.connectAbility(
         onFailed: onFailedCallback,
     },
 );
-var result = featureAbility.disconnectAbility(connId,
+var result = featureAbility.disconnectAbility(connectId,
     (error,data) => {
         console.log('featureAbilityTest DisConnectJsSameBundleName result errCode : ' + error.code + " data: " + data)
     },
@@ -612,8 +621,8 @@ disconnectAbility(connection: number): Promise\<void>
 **示例：**
 
 ```javascript
-import rpc from '@ohos.rpc'
-import featureAbility from '@ohos.ability.featureAbility'
+import rpc from '@ohos.rpc';
+import featureAbility from '@ohos.ability.featureAbility';
 function onConnectCallback(element, remote){
     console.log('ConnectAbility onConnect remote is proxy:' + (remote instanceof rpc.RemoteProxy));
 }
@@ -623,7 +632,7 @@ function onDisconnectCallback(element){
 function onFailedCallback(code){
     console.log('featureAbilityTest ConnectAbility onFailed errCode : ' + code)
 }
-var connId = featureAbility.connectAbility(
+var connectId = featureAbility.connectAbility(
     {
         bundleName: "com.ix.ServiceAbility",
         abilityName: "ServiceAbilityA",
@@ -635,7 +644,7 @@ var connId = featureAbility.connectAbility(
     },
 );
 
-featureAbility.disconnectAbility(connId).then((data) => {
+featureAbility.disconnectAbility(connectId).then((data) => {
     console.log('data : '  + data);
 }).catch((error)=>{
     console.log('featureAbilityTest result errCode : ' + error.code);
@@ -660,7 +669,9 @@ getWindow(callback: AsyncCallback\<window.Window>): void
 **示例：**
 
 ```javascript
-featureAbility.getWindow()
+featureAbility.getWindow((err, data) => {
+    console.info("getWindow err: " + JSON.stringify(err) + "data: " + typeof(data));
+});
 ```
 
 ## featureAbility.getWindow<sup>7+</sup>
@@ -681,7 +692,7 @@ getWindow(): Promise\<window.Window>;
 
 ```javascript
 featureAbility.getWindow().then((data) => {
-  console.info("=============getWindowPromise========== " +  JSON.stringify(data)); 
+    console.info("getWindow data: " + typeof(data));
 });
 ```
 
@@ -703,8 +714,8 @@ onConnect(elementName: ElementName, remote: rpc.IRemoteObject): void;
 **示例：**
 
 ```javascript
-import rpc from '@ohos.rpc'
-import featureAbility from '@ohos.ability.featureAbility'
+import rpc from '@ohos.rpc';
+import featureAbility from '@ohos.ability.featureAbility';
 function onConnectCallback(element, remote){
     console.log('ConnectAbility onConnect remote is proxy:' + (remote instanceof rpc.RemoteProxy));
 }
@@ -714,7 +725,7 @@ function onDisconnectCallback(element){
 function onFailedCallback(code){
     console.log('featureAbilityTest ConnectAbility onFailed errCode : ' + code)
 }
-var connId = featureAbility.connectAbility(
+var connectId = featureAbility.connectAbility(
     {
         deviceId: "",
         bundleName: "com.ix.ServiceAbility",
@@ -745,8 +756,8 @@ onDisconnect(elementName: ElementName): void;
 **示例：**
 
 ```javascript
-import rpc from '@ohos.rpc'
-import featureAbility from '@ohos.ability.featureAbility'
+import rpc from '@ohos.rpc';
+import featureAbility from '@ohos.ability.featureAbility';
 function onConnectCallback(element, remote){
     console.log('ConnectAbility onConnect remote is proxy:' + (remote instanceof rpc.RemoteProxy));
 }
@@ -756,7 +767,7 @@ function onDisconnectCallback(element){
 function onFailedCallback(code){
     console.log('featureAbilityTest ConnectAbility onFailed errCode : ' + code)
 }
-var connId = featureAbility.connectAbility(
+var connectId = featureAbility.connectAbility(
     {
         deviceId: "",
         bundleName: "com.ix.ServiceAbility",
@@ -787,8 +798,8 @@ ConnectAbility调用失败时的回调函数。
 **示例：**
 
 ```javascript
-import rpc from '@ohos.rpc'
-import featureAbility from '@ohos.ability.featureAbility'
+import rpc from '@ohos.rpc';
+import featureAbility from '@ohos.ability.featureAbility';
 function onConnectCallback(element, remote){
     console.log('ConnectAbility onConnect remote is proxy:' + (remote instanceof rpc.RemoteProxy));
 }
@@ -798,7 +809,7 @@ function onDisconnectCallback(element){
 function onFailedCallback(code){
     console.log('featureAbilityTest ConnectAbility onFailed errCode : ' + code)
 }
-var connId = featureAbility.connectAbility(
+var connectId = featureAbility.connectAbility(
     {
         deviceId: "",
         bundleName: "com.ix.ServiceAbility",

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

@@ -415,7 +415,7 @@ connectAbility(request: Want, options:ConnectOptions): number
         function onFailedCallback(code){
             console.log('particleAbilityTest ConnectAbility onFailed errCode : ' + code)
         }
-        var connId = particleAbility.connectAbility(
+        var connectId = particleAbility.connectAbility(
             {
                 bundleName: "com.ix.ServiceAbility",
                 abilityName: "ServiceAbilityA",
@@ -427,7 +427,7 @@ connectAbility(request: Want, options:ConnectOptions): number
             },
         );
 
-        particleAbility.disconnectAbility(connId).then((data)=>{
+        particleAbility.disconnectAbility(connectId).then((data)=>{
             console.log( " data: " + data);
         }).catch((error)=>{
             console.log('particleAbilityTest result errCode : ' + error.code )
@@ -464,7 +464,7 @@ import rpc from '@ohos.rpc'
         function onFailedCallback(code){
             console.log('particleAbilityTest ConnectAbility onFailed errCode : ' + code)
         }
-        var connId = particleAbility.connectAbility(
+        var connectId = particleAbility.connectAbility(
             {
                 bundleName: "com.ix.ServiceAbility",
                 abilityName: "ServiceAbilityA",
@@ -475,7 +475,7 @@ import rpc from '@ohos.rpc'
                 onFailed: onFailedCallback,
             },
         );
-        var result =  particleAbility.disconnectAbility(connId).then((data)=>{
+        var result =  particleAbility.disconnectAbility(connectId).then((data)=>{
             console.log( " data: " + data);
         }).catch((error)=>{
             console.log('particleAbilityTest result errCode : ' + error.code )
@@ -511,7 +511,7 @@ function onConnectCallback(element, remote){
         function onFailedCallback(code){
             console.log('particleAbilityTest ConnectAbility onFailed errCode : ' + code)
         }
-        var connId = particleAbility.connectAbility(
+        var connectId = particleAbility.connectAbility(
             {
                 bundleName: "com.ix.ServiceAbility",
                 abilityName: "ServiceAbilityA",
@@ -523,7 +523,7 @@ function onConnectCallback(element, remote){
             },
         );
 
-         particleAbility.disconnectAbility(connId).then((data)=>{
+         particleAbility.disconnectAbility(connectId).then((data)=>{
             console.log( " data: " + data);
         }).catch((error)=>{
             console.log('particleAbilityTest result errCode : ' + error.code )