!7699 fa模型service资料修改

Merge pull request !7699 from 黄师伟/master

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

@@ -32,7 +32,7 @@
        },
        onConnect(want) {
            console.log('ServiceAbility OnConnect');
-           return null;
+           return new FirstServiceAbilityStub('test');
        },
        onDisconnect(want) {
            console.log('ServiceAbility OnDisConnect');
@@ -139,41 +139,36 @@ let promise = featureAbility.startAbility(
     ```javascript
     import prompt from '@system.prompt'
 
-    let mRemote;
-    function onConnectCallback(element, remote){
-        console.log('onConnectLocalService onConnectDone element: ' + element);
-        console.log('onConnectLocalService onConnectDone remote: ' + remote);
-        mRemote = remote;
-        if (mRemote == null) {
-        prompt.showToast({
-            message: "onConnectLocalService not connected yet"
-        });
-        return;
-        }
-        let option = new rpc.MessageOption();
-        let data = new rpc.MessageParcel();
-        let reply = new rpc.MessageParcel();
-        data.writeInt(1);
-        data.writeInt(99);
-        mRemote.sendRequest(1, data, reply, option).then((result) => {
-            console.log('sendRequest success');
-            let msg = reply.readInt();
+    var option = {
+        onConnect: function onConnectCallback(element, proxy) {
+            console.log(`onConnectLocalService onConnectDone`)
+            if (proxy === null) {
+                prompt.showToast({
+                    message: "Connect service failed"
+                })
+                return
+            }
+            let data = rpc.MessageParcel.create()
+            let reply = rpc.MessageParcel.create()
+            let option = new rpc.MessageOption()
+            data.writeInterfaceToken("connect.test.token")
+            proxy.sendRequest(0, data, reply, option)
             prompt.showToast({
-                message: "onConnectLocalService connect result: " + msg,
-                duration: 3000
-            });
-        }).catch((e) => {
-            console.log('sendRequest error:' + e);
-        });
-
-    }
-
-    function onDisconnectCallback(element){
-        console.log('ConnectAbility onDisconnect Callback')
-    }
-
-    function onFailedCallback(code){
-        console.log('ConnectAbility onFailed Callback')
+                message: "Connect service success"
+            })
+        },
+        onDisconnect: function onDisconnectCallback(element) {
+            console.log(`onConnectLocalService onDisconnectDone element:${element}`)
+            prompt.showToast({
+                message: "Disconnect service success"
+            })
+        },
+        onFailed: function onFailedCallback(code) {
+            console.log(`onConnectLocalService onFailed errCode:${code}`)
+            prompt.showToast({
+                message: "Connect local service onFailed"
+            })
+        }
     }
     ```
 
@@ -201,44 +196,27 @@ let promise = featureAbility.startAbility(
     ```javascript
     import rpc from "@ohos.rpc";
 
-    let mMyStub;
-    export default {
-        onStart() {
-            class MyStub extends rpc.RemoteObject{
-                constructor(des) {
-                    if (typeof des === 'string') {
-                        super(des);
-                    }
-                    return null;
-                }
-                onRemoteRequest(code, data, reply, option) {
-                    console.log("ServiceAbility onRemoteRequest called");
-                    if (code === 1) {
-                        let op1 = data.readInt();
-                        let op2 = data.readInt();
-                        console.log("op1 = " + op1 + ", op2 = " + op2);
-                        reply.writeInt(op1 + op2);
-                    } else {
-                        console.log("ServiceAbility unknown request code");
-                    }
-                    return true;
-                }
-            }
-            mMyStub = new MyStub("ServiceAbility-test");
-        },
-        onCommand(want, startId) {
-            console.log('ServiceAbility onCommand');
-        },
-        onConnect(want) {
-            console.log('ServiceAbility OnConnect');
-            return mMyStub;
-        },
-        onDisconnect(want) {
-            console.log('ServiceAbility OnDisConnect');
-        },
-        onStop() {
-            console.log('ServiceAbility onStop');
-        },
+    class FirstServiceAbilityStub extends rpc.RemoteObject {
+    constructor(des: any) {
+        if (typeof des === 'string') {
+            super(des)
+        } else {
+            return
+        }
+    }
+
+    onRemoteRequest(code: number, data: any, reply: any, option: any) {
+        console.log(printLog + ` onRemoteRequest called`)
+        if (code === 1) {
+            let string = data.readString()
+            console.log(printLog + ` string=${string}`)
+            let result = Array.from(string).sort().join('')
+            console.log(printLog + ` result=${result}`)
+            reply.writeString(result)
+        } else {
+            console.log(printLog + ` unknown request code`)
+        }
+        return true;
     }
     ```
 
@@ -255,40 +233,36 @@ let promise = featureAbility.startAbility(
 ```ts
 import prompt from '@system.prompt'
 
-let mRemote;
-function onConnectCallback(element, remote){
-    console.log('onConnectRemoteService onConnectDone element: ' + element);
-    console.log('onConnectRemoteService onConnectDone remote: ' + remote);
-    mRemote = remote;
-    if (mRemote == null) {
-      prompt.showToast({
-        message: "onConnectRemoteService not connected yet"
-      });
-      return;
-    }
-    let option = new rpc.MessageOption();
-    let data = new rpc.MessageParcel();
-    let reply = new rpc.MessageParcel();
-    data.writeInt(1);
-    data.writeInt(99);
-    mRemote.sendRequest(1, data, reply, option).then((result) => {
-        console.log('sendRequest success');
-        let msg = reply.readInt();
+var option = {
+    onConnect: function onConnectCallback(element, proxy) {
+        console.log(`onConnectRemoteService onConnectDone`)
+        if (proxy === null) {
+            prompt.showToast({
+                message: "Connect service failed"
+            })
+            return
+        }
+        let data = rpc.MessageParcel.create()
+        let reply = rpc.MessageParcel.create()
+        let option = new rpc.MessageOption()
+        data.writeInterfaceToken("connect.test.token")
+        proxy.sendRequest(0, data, reply, option)
         prompt.showToast({
-            message: "onConnectRemoteService connect result: " + msg,
-            duration: 3000
-        });
-    }).catch((e) => {
-        console.log('sendRequest error:' + e);
-    });
-}
-
-function onDisconnectCallback(element){
-    console.log('ConnectRemoteAbility onDisconnect Callback')
-}
-
-function onFailedCallback(code){
-    console.log('ConnectRemoteAbility onFailed Callback')
+            message: "Connect service success"
+        })
+    },
+    onDisconnect: function onDisconnectCallback(element) {
+        console.log(`onConnectRemoteService onDisconnectDone element:${element}`)
+        prompt.showToast({
+            message: "Disconnect service success"
+        })
+    },
+    onFailed: function onFailedCallback(code) {
+        console.log(`onConnectRemoteService onFailed errCode:${code}`)
+        prompt.showToast({
+            message: "Connect local service onFailed"
+        })
+    }
 }
 ```
 
@@ -374,23 +348,25 @@ Service侧把自身的实例返回给调用侧的代码示例如下：
 ```ts
 import rpc from "@ohos.rpc";
 
-class FirstServiceAbilityStub extends rpc.RemoteObject{
-    constructor(des) {
+class FirstServiceAbilityStub extends rpc.RemoteObject {
+    constructor(des: any) {
         if (typeof des === 'string') {
-            super(des);
+            super(des)
         } else {
-            return null;
+            return
         }
     }
-    onRemoteRequest(code, data, reply, option) {
-        console.log("ServiceAbility onRemoteRequest called");
+
+    onRemoteRequest(code: number, data: any, reply: any, option: any) {
+        console.log(printLog + ` onRemoteRequest called`)
         if (code === 1) {
-            let op1 = data.readInt();
-            let op2 = data.readInt();
-            console.log("op1 = " + op1 + ", op2 = " + op2);
-            reply.writeInt(op1 + op2);
+            let string = data.readString()
+            console.log(printLog + ` string=${string}`)
+            let result = Array.from(string).sort().join('')
+            console.log(printLog + ` result=${result}`)
+            reply.writeString(result)
         } else {
-            console.log("ServiceAbility unknown request code");
+            console.log(printLog + ` unknown request code`)
         }
         return true;
     }