From 977e7a199905f221bfae81fa9b06b390ca00d07e Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Thu, 7 Aug 2025 09:21:36 +0800 Subject: [PATCH] modify recordData Signed-off-by: zhangzezhong --- .../@ohos.app.ability.AtomicServiceOptions.ets | 3 ++- .../@ohos.app.ability.InsightIntentExecutor.ets | 17 +++++++++-------- .../ets/@ohos.app.ability.OpenLinkOptions.ets | 8 +++++--- ...os.app.ability.UIExtensionContentSession.ets | 14 +++++++------- frameworks/ets/ets/@ohos.app.ability.Want.ets | 3 ++- .../ets/ets/@ohos.app.ability.insightIntent.ets | 5 +++-- .../@ohos.app.ability.insightIntentDriver.ets | 4 ++-- .../ets/ets/@ohos.app.ability.wantAgent.ets | 6 +++--- frameworks/ets/ets/application/CustomData.ets | 5 +++-- .../ets/ets/application/UIAbilityContext.ets | 10 +++++----- frameworks/ets/ets/wantAgent/triggerInfo.ets | 9 +++++---- frameworks/ets/ets/wantAgent/wantAgentInfo.ets | 9 +++++---- 12 files changed, 51 insertions(+), 42 deletions(-) diff --git a/frameworks/ets/ets/@ohos.app.ability.AtomicServiceOptions.ets b/frameworks/ets/ets/@ohos.app.ability.AtomicServiceOptions.ets index 366dc566859..93b3c416704 100644 --- a/frameworks/ets/ets/@ohos.app.ability.AtomicServiceOptions.ets +++ b/frameworks/ets/ets/@ohos.app.ability.AtomicServiceOptions.ets @@ -14,8 +14,9 @@ */ import StartOptions from '@ohos.app.ability.StartOptions'; +import { RecordData } from '@ohos.base'; export default class AtomicServiceOptions extends StartOptions { flags?: int; - parameters?: Record; + parameters?: RecordData; } \ No newline at end of file diff --git a/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets b/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets index 8918a24a9d1..379756ac322 100644 --- a/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets +++ b/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets @@ -17,6 +17,7 @@ import window from '@ohos.window'; import insightIntent from './@ohos.app.ability.insightIntent'; import InsightIntentContext from '@ohos.app.ability.InsightIntentContext'; import type UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession'; +import { RecordData } from '@ohos.base'; export default class InsightIntentExecutor { context: InsightIntentContext = {}; @@ -30,7 +31,7 @@ export default class InsightIntentExecutor { public callOnExecuteInUIAbilityForegroundMode(name: string, param: Record, pageLoader: window.WindowStage): insightIntent.ExecuteResult { - let p = this.onExecuteInUIAbilityForegroundMode(name, param, pageLoader); + let p = this.onExecuteInUIAbilityForegroundMode(name, param as RecordData, pageLoader); if (p instanceof Promise) { this.isOnExecuteInUIAbilityForegroundModeAsync = true; p.then((result: insightIntent.ExecuteResult): void => { @@ -46,7 +47,7 @@ export default class InsightIntentExecutor { public callOnExecuteInUIAbilityBackgroundMode(name: string, param: Record): insightIntent.ExecuteResult { - let p = this.onExecuteInUIAbilityBackgroundMode(name, param); + let p = this.onExecuteInUIAbilityBackgroundMode(name, param as RecordData); if (p instanceof Promise) { this.isOnExecuteInUIAbilityBackgroundModeAsync = true; p.then((result: insightIntent.ExecuteResult): void => { @@ -62,7 +63,7 @@ export default class InsightIntentExecutor { public callOnExecuteInUIExtensionAbility(name: string, param: Record, pageLoader: UIExtensionContentSession): insightIntent.ExecuteResult { - let p = this.onExecuteInUIExtensionAbility(name, param, pageLoader); + let p = this.onExecuteInUIExtensionAbility(name, param as RecordData, pageLoader); if (p instanceof Promise) { this.isOnExecuteInUIExtensionAbilityAsync = true; p.then((result: insightIntent.ExecuteResult): void => { @@ -78,7 +79,7 @@ export default class InsightIntentExecutor { public callOnExecuteInServiceExtensionAbility(name: string, param: Record): insightIntent.ExecuteResult { - let p = this.onExecuteInServiceExtensionAbility(name, param); + let p = this.onExecuteInServiceExtensionAbility(name, param as RecordData); if (p instanceof Promise) { this.isOnExecuteInServiceExtensionAbilityAsync = true; p.then((result: insightIntent.ExecuteResult): void => { @@ -92,25 +93,25 @@ export default class InsightIntentExecutor { } } - onExecuteInUIAbilityForegroundMode(name: string, param: Record, pageLoader: window.WindowStage): + onExecuteInUIAbilityForegroundMode(name: string, param: RecordData, pageLoader: window.WindowStage): insightIntent.ExecuteResult | Promise { let ret: insightIntent.ExecuteResult = {}; return ret; } - onExecuteInUIAbilityBackgroundMode(name: string, param: Record): + onExecuteInUIAbilityBackgroundMode(name: string, param: RecordData): insightIntent.ExecuteResult | Promise { let ret: insightIntent.ExecuteResult = {}; return ret; } - onExecuteInUIExtensionAbility(name: string, param: Record, pageLoader: UIExtensionContentSession): + onExecuteInUIExtensionAbility(name: string, param: RecordData, pageLoader: UIExtensionContentSession): insightIntent.ExecuteResult | Promise { let ret: insightIntent.ExecuteResult = {}; return ret; } - onExecuteInServiceExtensionAbility(name: string, param: Record): + onExecuteInServiceExtensionAbility(name: string, param: RecordData): insightIntent.ExecuteResult | Promise { let ret: insightIntent.ExecuteResult = {}; return ret; diff --git a/frameworks/ets/ets/@ohos.app.ability.OpenLinkOptions.ets b/frameworks/ets/ets/@ohos.app.ability.OpenLinkOptions.ets index bd90238425e..683e8cd532c 100644 --- a/frameworks/ets/ets/@ohos.app.ability.OpenLinkOptions.ets +++ b/frameworks/ets/ets/@ohos.app.ability.OpenLinkOptions.ets @@ -13,12 +13,14 @@ * limitations under the License. */ +import { RecordData } from '@ohos.base'; + export default interface OpenLinkOptions { appLinkingOnly?: boolean; - parameters?: Record; + parameters?: RecordData; } class OpenLinkOptionsImpl implements OpenLinkOptions { appLinkingOnly?: boolean|undefined; - parameters?: Record|undefined; -} \ No newline at end of file + parameters?: RecordData|undefined; +} diff --git a/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets b/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets index 266dbed17a1..024548d3166 100644 --- a/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets +++ b/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets @@ -15,7 +15,7 @@ import { AbilityResult } from 'ability.abilityResult'; import { AsyncCallback } from '@ohos.base'; -import { BusinessError } from '@ohos.base'; +import { BusinessError, RecordData } from '@ohos.base'; import uiExtensionHost from '@ohos.uiExtensionHost'; import { LocalStorage } from '@ohos.arkui.stateManagement'; import AsyncCallbackWrapper from './utils/AbilityUtils'; @@ -60,8 +60,8 @@ export default class UIExtensionContentSession { native terminateSelfWithResultSync(parameter: AbilityResult, callback:AsyncCallbackWrapper): void; private native nativeStartAbilityByTypeSync(type: string, wantParam: Record, startCallback: AbilityStartCallback): BusinessError; - sendData(data: Record): void { - this.nativeSendData(data); + sendData(data: RecordData): void { + this.nativeSendData(data as Record); } setReceiveDataCallback(callback: (data: Record) => void): void { @@ -118,10 +118,10 @@ export default class UIExtensionContentSession { return p; } - startAbilityByType(type: string, wantParam: Record, startCallback: AbilityStartCallback, + startAbilityByType(type: string, wantParam: RecordData, startCallback: AbilityStartCallback, callback: AsyncCallback): void { let p1 = taskpool.execute((): BusinessError => { - return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback); + return this.nativeStartAbilityByTypeSync(type, wantParam as Record, startCallback); }); p1.then((e: NullishType) => { let retError = e as BusinessError; @@ -135,11 +135,11 @@ export default class UIExtensionContentSession { }); } - startAbilityByType(type: string, wantParam: Record, + startAbilityByType(type: string, wantParam: RecordData, startCallback: AbilityStartCallback): Promise { let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { let p1 = taskpool.execute((): BusinessError => { - return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback); + return this.nativeStartAbilityByTypeSync(type, wantParam as Record, startCallback); }); p1.then((e: NullishType) => { let retError = e as BusinessError; diff --git a/frameworks/ets/ets/@ohos.app.ability.Want.ets b/frameworks/ets/ets/@ohos.app.ability.Want.ets index 89350923dbc..c65d2256ebd 100644 --- a/frameworks/ets/ets/@ohos.app.ability.Want.ets +++ b/frameworks/ets/ets/@ohos.app.ability.Want.ets @@ -15,6 +15,7 @@ import hilog from '@ohos.hilog' import rpc from '@ohos.rpc'; +import { RecordData } from '@ohos.base'; type valueType = NullishType; const DOMAIN_ID = 0xD001300; @@ -398,7 +399,7 @@ export default class Want { type?: string; flags?: int; action?: string; - parameters?: Record; + parameters?: RecordData; entities?: Array; moduleName?: string; } diff --git a/frameworks/ets/ets/@ohos.app.ability.insightIntent.ets b/frameworks/ets/ets/@ohos.app.ability.insightIntent.ets index 0fcc3f864b6..1667a11434d 100644 --- a/frameworks/ets/ets/@ohos.app.ability.insightIntent.ets +++ b/frameworks/ets/ets/@ohos.app.ability.insightIntent.ets @@ -15,6 +15,7 @@ import Want from '@ohos.app.ability.Want'; import wantConstant from '@ohos.app.ability.wantConstant'; +import { RecordData } from '@ohos.base'; namespace insightIntent { @@ -27,14 +28,14 @@ namespace insightIntent { export interface ExecuteResult { code: int; - result?: Record; + result?: RecordData; uris?: Array; flags?: int; } export class ExecuteResultInner implements ExecuteResult{ code: int; - result?: Record; + result?: RecordData; uris?: Array; flags?: int; } diff --git a/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets b/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets index 20c9bcfe130..9400c228a80 100644 --- a/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets +++ b/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets @@ -15,7 +15,7 @@ import Want from '@ohos.app.ability.Want'; import wantConstant from '@ohos.app.ability.wantConstant'; -import { BusinessError, AsyncCallback } from '@ohos.base'; +import { BusinessError, AsyncCallback, RecordData } from '@ohos.base'; import insightIntent from './@ohos.app.ability.insightIntent'; import AsyncCallbackWrapper from './utils/AbilityUtils'; @@ -28,7 +28,7 @@ export default namespace insightIntentDriver { moduleName: string; abilityName: string; insightIntentName: string; - insightIntentParam: Record; + insightIntentParam: RecordData; executeMode: insightIntent.ExecuteMode; displayId?: long; uris?: Array; diff --git a/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets b/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets index b0ba39051db..3c00a8ea8e7 100644 --- a/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets +++ b/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { BusinessError, AsyncCallback } from '@ohos.base'; +import { BusinessError, AsyncCallback, RecordData } from '@ohos.base'; import Want from '@ohos.app.ability.Want'; import { WantAgentInfo as _WantAgentInfo } from 'wantAgent.wantAgentInfo'; import { TriggerInfo as _TriggerInfo } from 'wantAgent.triggerInfo'; @@ -323,7 +323,7 @@ namespace wantAgent { want: Want; finalCode: int; finalData: string; - extraInfo?: Record; + extraInfo?: RecordData; } class CompleteDataImpl implements CompleteData { @@ -331,7 +331,7 @@ namespace wantAgent { public want: Want; public finalCode: int; public finalData: string; - public extraInfo?: Record; + public extraInfo?: RecordData; } export type TriggerInfo = _TriggerInfo; diff --git a/frameworks/ets/ets/application/CustomData.ets b/frameworks/ets/ets/application/CustomData.ets index 5e588bee98f..2f1a7d3dbd1 100644 --- a/frameworks/ets/ets/application/CustomData.ets +++ b/frameworks/ets/ets/application/CustomData.ets @@ -12,11 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { RecordData } from '@ohos.base'; export default interface CustomData { - data: Record; + data: RecordData; } class CustomDataInner implements CustomData { - public data: Record = {}; + public data: RecordData = {}; } \ No newline at end of file diff --git a/frameworks/ets/ets/application/UIAbilityContext.ets b/frameworks/ets/ets/application/UIAbilityContext.ets index da67bf4a096..dbbef3f3f46 100644 --- a/frameworks/ets/ets/application/UIAbilityContext.ets +++ b/frameworks/ets/ets/application/UIAbilityContext.ets @@ -17,7 +17,7 @@ import { AbilityInfo } from 'bundleManager.AbilityInfo'; import Want from '@ohos.app.ability.Want'; import StartOptions from '@ohos.app.ability.StartOptions'; import { Caller } from '@ohos.app.ability.UIAbility'; -import { BusinessError, AsyncCallback } from '@ohos.base'; +import { BusinessError, AsyncCallback, RecordData } from '@ohos.base'; import { AbilityResult } from 'ability.abilityResult'; import { Configuration } from '@ohos.app.ability.Configuration'; import { ConnectOptions } from 'ability.connectOptions'; @@ -428,10 +428,10 @@ export default class UIAbilityContext extends Context { this.nativeSetColorMode(colorMode); } - startAbilityByType(type: string, wantParam: Record, startCallback: AbilityStartCallback, + startAbilityByType(type: string, wantParam: RecordData, startCallback: AbilityStartCallback, callback: AsyncCallback): void { let p1 = taskpool.execute((): BusinessError => { - return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback); + return this.nativeStartAbilityByTypeSync(type, wantParam as Record, startCallback); }); p1.then((e: NullishType) => { let retError = e as BusinessError; @@ -479,11 +479,11 @@ hideAbility(): Promise { return p; } - startAbilityByType(type: string, wantParam: Record, + startAbilityByType(type: string, wantParam: RecordData, startCallback: AbilityStartCallback): Promise { let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { let p1 = taskpool.execute((): BusinessError => { - return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback); + return this.nativeStartAbilityByTypeSync(type, wantParam as Record, startCallback); }); p1.then((e: NullishType) => { let retError = e as BusinessError; diff --git a/frameworks/ets/ets/wantAgent/triggerInfo.ets b/frameworks/ets/ets/wantAgent/triggerInfo.ets index 0653b0f4486..dc098bf13ff 100644 --- a/frameworks/ets/ets/wantAgent/triggerInfo.ets +++ b/frameworks/ets/ets/wantAgent/triggerInfo.ets @@ -15,13 +15,14 @@ import Want from '@ohos.app.ability.Want'; import StartOptions from '@ohos.app.ability.StartOptions'; +import { RecordData } from '@ohos.base'; export interface TriggerInfo { code: number; want?: Want; permission?: string; - extraInfo?: Record; - extraInfos?: Record; + extraInfo?: RecordData; + extraInfos?: RecordData; startOptions?: StartOptions; } @@ -29,7 +30,7 @@ class TriggerInfoImpl implements TriggerInfo { public code: number; public want?: Want; public permission?: string; - public extraInfo?: Record; - public extraInfos?: Record; + public extraInfo?: RecordData; + public extraInfos?: RecordData; public startOptions?: StartOptions; } diff --git a/frameworks/ets/ets/wantAgent/wantAgentInfo.ets b/frameworks/ets/ets/wantAgent/wantAgentInfo.ets index ae0859b67e6..d1f23ac97c6 100644 --- a/frameworks/ets/ets/wantAgent/wantAgentInfo.ets +++ b/frameworks/ets/ets/wantAgent/wantAgentInfo.ets @@ -16,14 +16,15 @@ import Want from '@ohos.app.ability.Want'; import wantAgent from '@ohos.app.ability.wantAgent'; import type abilityWantAgent from '@ohos.app.ability.wantAgent'; +import { RecordData } from '@ohos.base'; export interface WantAgentInfo { wants: Array; actionType?: abilityWantAgent.OperationType; requestCode: number; actionFlags?: Array; - extraInfo?: Record; - extraInfos?: Record; + extraInfo?: RecordData; + extraInfos?: RecordData; } class WantAgentInfoImpl implements WantAgentInfo { @@ -31,8 +32,8 @@ class WantAgentInfoImpl implements WantAgentInfo { public actionType?: abilityWantAgent.OperationType; public requestCode: number; public actionFlags?: Array; - public extraInfo?: Record; - public extraInfos?: Record; + public extraInfo?: RecordData; + public extraInfos?: RecordData; constructor(wants: Array) { this.wants = wants; -- Gitee