From 3be6f67361cd0986808f9e13bb3ed7886bf51ad4 Mon Sep 17 00:00:00 2001 From: xieqiongyang Date: Tue, 22 Aug 2023 02:40:40 +0000 Subject: [PATCH 1/6] update onShare Signed-off-by: xieqiongyang Change-Id: I6a8057d7faeb8d3fc744de86add3a5949a1832e7 Signed-off-by: chenshixu1 --- .../reference/apis/js-apis-app-ability-uiAbility.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md b/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md index b74ca2da459..85f978f74b2 100644 --- a/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md +++ b/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md @@ -315,7 +315,7 @@ class MyUIAbility extends UIAbility { onShare(wantParam:{ [key: string]: Object }): void; -ability设置分享数据，ohos.extra.param.key.shareUrl表示服务的在线地址。 +在跨端分享场景下，在UIAbility中设置分享方设备要分享的数据。 **系统能力**：SystemCapability.Ability.AbilityRuntime.AbilityCore @@ -323,7 +323,7 @@ ability设置分享数据，ohos.extra.param.key.shareUrl表示服务的在线 | 参数名 | 类型 | 必填 | 说明 | | -------- | -------- | -------- | -------- | -| wantParam | {[key: string]: Object} | 是 | want相关参数。 | +| wantParam | {[key: string]: Object} | 是 | 待分享的数据。 | **示例：** -- Gitee From 6e2bed2e97caa6509a2a29234d600b2ddf6ab93e Mon Sep 17 00:00:00 2001 From: chenshixu1 Date: Thu, 24 Aug 2023 10:41:22 +0000 Subject: [PATCH 2/6] Update Signed-off-by: chenshixu1 --- .../apis/js-apis-system-parameter.md | 20 +++++++++---------- .../apis/js-apis-system-parameterEnhance.md | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md index 813277d8d46..d52fe35c797 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md @@ -42,7 +42,7 @@ getSync(key: string, def?: string): string ```ts try { - var info = systemparameter.getSync("const.ohos.apiversion"); + let info = systemparameter.getSync("const.ohos.apiversion"); console.log(JSON.stringify(info)); } catch(e) { console.log("getSync unexpected error: " + e); @@ -68,7 +68,7 @@ get(key: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", function (err, data) { + systemparameter.get("const.ohos.apiversion", (err:BusinessError, data:string) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -99,7 +99,7 @@ get(key: string, def: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", "default", function (err, data) { + systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:string) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -136,10 +136,10 @@ get(key: string, def?: string): Promise<string> ```ts try { - var p = systemparameter.get("const.ohos.apiversion"); - p.then(function (value) { + let p = systemparameter.get("const.ohos.apiversion"); + p.then((value:string) => { console.log("get test.parameter.key success: " + value); - }).catch(function (err) { + }).catch((err:BusinessError) => { console.log("get test.parameter.key error: " + err.code); }); } catch(e) { @@ -201,7 +201,7 @@ set(key: string, value: string, callback: AsyncCallback<void>): void ```ts try { - systemparameter.set("test.parameter.key", "testValue", function (err, data) { + systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:string) =>{ if (err == undefined) { console.log("set test.parameter.key value success :" + data) } else { @@ -241,10 +241,10 @@ set(key: string, value: string): Promise<void> ```ts try { - var p = systemparameter.set("test.parameter.key", "testValue"); - p.then(function (value) { + let p = systemparameter.set("test.parameter.key", "testValue"); + p.then((value:string) => { console.log("set test.parameter.key success: " + value); - }).catch(function (err) { + }).catch((err:BusinessError) => { console.log(" set test.parameter.key error: " + err.code); }); } catch(e) { diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md index deb3aa478fd..690b004d73d 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md @@ -41,7 +41,7 @@ getSync(key: string, def?: string): string ```ts try { - var info = systemparameter.getSync("const.ohos.apiversion"); + let info = systemparameter.getSync("const.ohos.apiversion"); console.log(JSON.stringify(info)); } catch(e) { console.log("getSync unexpected error: " + e); @@ -67,7 +67,7 @@ get(key: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", function (err, data) { + systemparameter.get("const.ohos.apiversion", (err : BusinessError, data : string) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -98,7 +98,7 @@ get(key: string, def: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", "default", function (err, data) { + systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:string) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -135,10 +135,10 @@ get(key: string, def?: string): Promise<string> ```ts try { - var p = systemparameter.get("const.ohos.apiversion"); - p.then(function (value) { + let p = systemparameter.get("const.ohos.apiversion"); + p.then((value:string) => { console.log("get test.parameter.key success: " + value); - }).catch(function (err) { + }).catch((err:BusinessError) => { console.log("get test.parameter.key error: " + err.code); }); } catch(e) { @@ -191,7 +191,7 @@ set(key: string, value: string, callback: AsyncCallback<void>): void ```ts try { - systemparameter.set("test.parameter.key", "testValue", function (err, data) { + systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:string) => { if (err == undefined) { console.log("set test.parameter.key value success :" + data) } else { @@ -227,10 +227,10 @@ set(key: string, value: string): Promise<void> ```ts try { - var p = systemparameter.set("test.parameter.key", "testValue"); - p.then(function (value) { + let p = systemparameter.set("test.parameter.key", "testValue"); + p.then((value:string) => { console.log("set test.parameter.key success: " + value); - }).catch(function (err) { + }).catch((err:BusinessError) => { console.log(" set test.parameter.key error: " + err.code); }); } catch(e) { -- Gitee From ffdefb917e94444838cc3f84775130a55425c8ac Mon Sep 17 00:00:00 2001 From: chenshixu1 Date: Fri, 25 Aug 2023 01:01:24 +0000 Subject: [PATCH 3/6] Update Signed-off-by: chenshixu1 --- .../reference/apis/js-apis-system-parameter.md | 10 +++++----- .../reference/apis/js-apis-system-parameterEnhance.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md index d52fe35c797..437a4a1269d 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md @@ -68,7 +68,7 @@ get(key: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", (err:BusinessError, data:string) => { + systemparameter.get("const.ohos.apiversion", (err:BusinessError, data:String) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -99,7 +99,7 @@ get(key: string, def: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:string) => { + systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:String) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -137,7 +137,7 @@ get(key: string, def?: string): Promise<string> ```ts try { let p = systemparameter.get("const.ohos.apiversion"); - p.then((value:string) => { + p.then((value:String) => { console.log("get test.parameter.key success: " + value); }).catch((err:BusinessError) => { console.log("get test.parameter.key error: " + err.code); @@ -201,7 +201,7 @@ set(key: string, value: string, callback: AsyncCallback<void>): void ```ts try { - systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:string) =>{ + systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:String) =>{ if (err == undefined) { console.log("set test.parameter.key value success :" + data) } else { @@ -242,7 +242,7 @@ set(key: string, value: string): Promise<void> ```ts try { let p = systemparameter.set("test.parameter.key", "testValue"); - p.then((value:string) => { + p.then((value:String) => { console.log("set test.parameter.key success: " + value); }).catch((err:BusinessError) => { console.log(" set test.parameter.key error: " + err.code); diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md index 690b004d73d..6cace78480f 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md @@ -67,7 +67,7 @@ get(key: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", (err : BusinessError, data : string) => { + systemparameter.get("const.ohos.apiversion", (err : BusinessError, data : String) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -98,7 +98,7 @@ get(key: string, def: string, callback: AsyncCallback<string>): void ```ts try { - systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:string) => { + systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:String) => { if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -136,7 +136,7 @@ get(key: string, def?: string): Promise<string> ```ts try { let p = systemparameter.get("const.ohos.apiversion"); - p.then((value:string) => { + p.then((value:String) => { console.log("get test.parameter.key success: " + value); }).catch((err:BusinessError) => { console.log("get test.parameter.key error: " + err.code); @@ -191,7 +191,7 @@ set(key: string, value: string, callback: AsyncCallback<void>): void ```ts try { - systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:string) => { + systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:String) => { if (err == undefined) { console.log("set test.parameter.key value success :" + data) } else { @@ -228,7 +228,7 @@ set(key: string, value: string): Promise<void> ```ts try { let p = systemparameter.set("test.parameter.key", "testValue"); - p.then((value:string) => { + p.then((value:String) => { console.log("set test.parameter.key success: " + value); }).catch((err:BusinessError) => { console.log(" set test.parameter.key error: " + err.code); -- Gitee From 084548eec8231a02d7213d53018063b99df0b123 Mon Sep 17 00:00:00 2001 From: chenshixu1 Date: Fri, 25 Aug 2023 01:32:27 +0000 Subject: [PATCH 4/6] Update Signed-off-by: chenshixu1 --- .../application-dev/reference/apis/js-apis-system-parameter.md | 3 ++- .../reference/apis/js-apis-system-parameterEnhance.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md index 437a4a1269d..03d5b4aa81c 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md @@ -14,7 +14,8 @@ ## 导入模块 ```ts -import systemparameter from '@ohos.systemparameter' +import systemparameter from '@ohos.systemparameter'; +import { BusinessError } from '@ohos.base'; ``` ## systemparameter.getSync(deprecated) diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md index 6cace78480f..c598a3a3b81 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md @@ -13,7 +13,8 @@ ## 导入模块 ```ts -import systemparameter from '@ohos.systemParameterEnhance' +import systemparameter from '@ohos.systemParameterEnhance'; +import { BusinessError } from '@ohos.base'; ``` ## systemparameter.getSync -- Gitee From 8bb17a709061d51615258accded2fd09211b2a35 Mon Sep 17 00:00:00 2001 From: chenshixu1 Date: Fri, 25 Aug 2023 09:45:32 +0000 Subject: [PATCH 5/6] Revert "update onShare" This reverts commit 3be6f67361cd0986808f9e13bb3ed7886bf51ad4. --- .../reference/apis/js-apis-app-ability-uiAbility.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md b/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md index 85f978f74b2..b74ca2da459 100644 --- a/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md +++ b/zh-cn/application-dev/reference/apis/js-apis-app-ability-uiAbility.md @@ -315,7 +315,7 @@ class MyUIAbility extends UIAbility { onShare(wantParam:{ [key: string]: Object }): void; -在跨端分享场景下，在UIAbility中设置分享方设备要分享的数据。 +ability设置分享数据，ohos.extra.param.key.shareUrl表示服务的在线地址。 **系统能力**：SystemCapability.Ability.AbilityRuntime.AbilityCore @@ -323,7 +323,7 @@ onShare(wantParam:{ [key: string]: Object }): void; | 参数名 | 类型 | 必填 | 说明 | | -------- | -------- | -------- | -------- | -| wantParam | {[key: string]: Object} | 是 | 待分享的数据。 | +| wantParam | {[key: string]: Object} | 是 | want相关参数。 | **示例：** -- Gitee From c46307b1b06b73dd38ddb2cc8064cb02c13a211d Mon Sep 17 00:00:00 2001 From: chenshixu1 Date: Fri, 25 Aug 2023 10:06:08 +0000 Subject: [PATCH 6/6] Resolve conflict Signed-off-by: chenshixu1 --- .../apis/js-apis-system-parameter.md | 6 ++-- .../apis/js-apis-system-parameterEnhance.md | 28 +++++++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md index 03d5b4aa81c..f6b9c5573d6 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameter.md @@ -43,7 +43,7 @@ getSync(key: string, def?: string): string ```ts try { - let info = systemparameter.getSync("const.ohos.apiversion"); + var info = systemparameter.getSync("const.ohos.apiversion"); console.log(JSON.stringify(info)); } catch(e) { console.log("getSync unexpected error: " + e); @@ -140,7 +140,7 @@ try { let p = systemparameter.get("const.ohos.apiversion"); p.then((value:String) => { console.log("get test.parameter.key success: " + value); - }).catch((err:BusinessError) => { + }).catch(function (err) { console.log("get test.parameter.key error: " + err.code); }); } catch(e) { @@ -245,7 +245,7 @@ try { let p = systemparameter.set("test.parameter.key", "testValue"); p.then((value:String) => { console.log("set test.parameter.key success: " + value); - }).catch((err:BusinessError) => { + }).catch(function (err) { console.log(" set test.parameter.key error: " + err.code); }); } catch(e) { diff --git a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md index c598a3a3b81..90179035677 100755 --- a/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md +++ b/zh-cn/application-dev/reference/apis/js-apis-system-parameterEnhance.md @@ -42,7 +42,7 @@ getSync(key: string, def?: string): string ```ts try { - let info = systemparameter.getSync("const.ohos.apiversion"); + var info = systemparameter.getSync("const.ohos.apiversion"); console.log(JSON.stringify(info)); } catch(e) { console.log("getSync unexpected error: " + e); @@ -68,7 +68,11 @@ get(key: string, callback: AsyncCallback<string>): void ```ts try { +<<<<<<< HEAD systemparameter.get("const.ohos.apiversion", (err : BusinessError, data : String) => { +======= + systemparameter.get("const.ohos.apiversion", function (err, data) { +>>>>>>> parent of 6e2bed2e97 (Update) if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -99,7 +103,11 @@ get(key: string, def: string, callback: AsyncCallback<string>): void ```ts try { +<<<<<<< HEAD systemparameter.get("const.ohos.apiversion", "default", (err:BusinessError, data:String) => { +======= + systemparameter.get("const.ohos.apiversion", "default", function (err, data) { +>>>>>>> parent of 6e2bed2e97 (Update) if (err == undefined) { console.log("get test.parameter.key value success:" + data) } else { @@ -136,10 +144,15 @@ get(key: string, def?: string): Promise<string> ```ts try { +<<<<<<< HEAD let p = systemparameter.get("const.ohos.apiversion"); p.then((value:String) => { +======= + var p = systemparameter.get("const.ohos.apiversion"); + p.then(function (value) { +>>>>>>> parent of 6e2bed2e97 (Update) console.log("get test.parameter.key success: " + value); - }).catch((err:BusinessError) => { + }).catch(function (err) { console.log("get test.parameter.key error: " + err.code); }); } catch(e) { @@ -192,7 +205,11 @@ set(key: string, value: string, callback: AsyncCallback<void>): void ```ts try { +<<<<<<< HEAD systemparameter.set("test.parameter.key", "testValue", (err:BusinessError, data:String) => { +======= + systemparameter.set("test.parameter.key", "testValue", function (err, data) { +>>>>>>> parent of 6e2bed2e97 (Update) if (err == undefined) { console.log("set test.parameter.key value success :" + data) } else { @@ -228,10 +245,15 @@ set(key: string, value: string): Promise<void> ```ts try { +<<<<<<< HEAD let p = systemparameter.set("test.parameter.key", "testValue"); p.then((value:String) => { +======= + var p = systemparameter.set("test.parameter.key", "testValue"); + p.then(function (value) { +>>>>>>> parent of 6e2bed2e97 (Update) console.log("set test.parameter.key success: " + value); - }).catch((err:BusinessError) => { + }).catch(function (err) { console.log(" set test.parameter.key error: " + err.code); }); } catch(e) { -- Gitee