diff --git a/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/Use1from2/1.2.ets b/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/Use1from2/1.2.ets index 91f3c6325ae1953927e93e82778bab0157a4559e..17d4dd959ecdfe663ff402bedf69ced897c4f95f 100644 --- a/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/Use1from2/1.2.ets +++ b/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/Use1from2/1.2.ets @@ -28,7 +28,7 @@ export function test(): Array { let logs: Array = new Array(); // 1.文件导入 const module = - ESObject.load('@normalized:N&entry&com.samples.interopsample&arkts1_0har/src/main/ets/components/ArkTSVersion_1&1.0.0'); + ESValue.load('@normalized:N&entry&com.samples.interopsample&arkts1_0har/src/main/ets/components/ArkTSVersion_1&1.0.0'); let student = module.getProperty('Student'); const SUBJECT = module.getProperty('SUBJECT'); // 2.类实例化 @@ -42,11 +42,11 @@ export function test(): Array { let arggradePoint: double = 3.85; let argIsBoarder: boolean = false; let student1 = - student.instantiate(ESObject.wrapString(argName), argSex, ESObject.wrapShort(argstudentID), - ESObject.wrapByte(argAge), - ESObject.wrapInt(argHeight), - ESObject.wrapLong(argPhone), ESObject.wrapFloat(argAverageGrade), ESObject.wrapDouble(arggradePoint), - ESObject.wrapBoolean(argIsBoarder)); + student.instantiate(ESValue.wrapString(argName), argSex, ESValue.wrapShort(argstudentID), + ESValue.wrapByte(argAge), + ESValue.wrapInt(argHeight), + ESValue.wrapLong(argPhone), ESValue.wrapFloat(argAverageGrade), ESValue.wrapDouble(arggradePoint), + ESValue.wrapBoolean(argIsBoarder)); let score = [75, 68, 80, 90, 92, 78]; let index = 0; for (let item of SUBJECT) { @@ -69,7 +69,7 @@ export function test(): Array { let calAverageScore = module.getProperty('calAverageScore'); let totalScore = calTotalScore.invoke(student1).toNumber(); // 6.参数传递 - let averageScore = calAverageScore.invoke(ESObject.wrapNumber(totalScore), ESObject.wrapNumber(6)); + let averageScore = calAverageScore.invoke(ESValue.wrapNumber(totalScore), ESValue.wrapNumber(6)); logs.push(`总成绩:${totalScore},平均分:${averageScore}`); return logs; } @@ -77,7 +77,7 @@ export function test(): Array { // 7.异常 export function ErrorHandle(): string { const module = - ESObject.load('@normalized:N&entry&com.samples.interopsample&arkts1_0har/src/main/ets/components/ArkTSVersion_1&1.0.0'); + ESValue.load('@normalized:N&entry&com.samples.interopsample&arkts1_0har/src/main/ets/components/ArkTSVersion_1&1.0.0'); let referenceErr = module.getProperty('referenceErr'); let errorInfo = referenceErr.getProperty('message').toString(); return errorInfo; diff --git a/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseJSFrom2/1.2.ets b/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseJSFrom2/1.2.ets index c71a70fc2b4cd640b685b9ab330daa4163700418..f669b0bc6a5d20d396266602a030f54a321a8dab 100644 --- a/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseJSFrom2/1.2.ets +++ b/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseJSFrom2/1.2.ets @@ -27,12 +27,12 @@ export function test3(): Array { let logs: Array = new Array(); // 1.文件导入 - const module = ESObject.load('@normalized:N&entry&com.samples.interopsample&jshar/src/main/ets/components/JSTest&1.0.0'); + const module = ESValue.load('@normalized:N&entry&com.samples.interopsample&jshar/src/main/ets/components/JSTest&1.0.0'); let student = module.getProperty('Student'); const SUBJECT = module.getProperty('SUBJECT'); // 2.类实例化 - let student1 = student.instantiate(ESObject.wrapString('C'), ESObject.wrapNumber(19), ESObject.wrapString('F'), - ESObject.wrapBoolean(false)); + let student1 = student.instantiate(ESValue.wrapString('C'), ESValue.wrapNumber(19), ESValue.wrapString('F'), + ESValue.wrapBoolean(false)); let score = [90, 68, 80, 90, 92, 78]; let index = 0; for (let item of SUBJECT) { @@ -55,14 +55,14 @@ export function test3(): Array { let calAverageScore = module.getProperty('calAverageScore'); let totalScore = calTotalScore.invoke(student1).toNumber(); // 6.参数传递 - let averageScore = calAverageScore.invoke(ESObject.wrapNumber(totalScore), ESObject.wrapNumber(6)); + let averageScore = calAverageScore.invoke(ESValue.wrapNumber(totalScore), ESValue.wrapNumber(6)); logs.push(`总成绩:${totalScore},平均分:${averageScore}`); return logs; } // 7.异常处理 export function ErrorHandle3(): string { - const module = ESObject.load('@normalized:N&entry&com.samples.interopsample&jshar/src/main/ets/components/JSTest&1.0.0'); + const module = ESValue.load('@normalized:N&entry&com.samples.interopsample&jshar/src/main/ets/components/JSTest&1.0.0'); let referenceErr = module.getProperty('referenceErr'); let errorInfo = referenceErr.getProperty('message').toString(); return errorInfo; diff --git a/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseTSFrom2/1.2.ets b/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseTSFrom2/1.2.ets index 3e9e30e45f65a01784fdbdf26f5da76b404512d1..b4379991d5aa68ff6af9376e74e9c02735bac0fe 100644 --- a/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseTSFrom2/1.2.ets +++ b/code/ArkTS1.2/interopSample/entry/src/main/ets/pages/UseTSFrom2/1.2.ets @@ -27,12 +27,12 @@ export function test4(): Array { let logs: Array = new Array(); // 1.文件导入 - const module = ESObject.load('@normalized:N&entry&com.samples.interopsample&tshar/src/main/ets/components/TSTest&1.0.0'); + const module = ESValue.load('@normalized:N&entry&com.samples.interopsample&tshar/src/main/ets/components/TSTest&1.0.0'); let student = module.getProperty('Student'); const SUBJECT = module.getProperty('SUBJECT'); // 2.类实例化 - let student1 = student.instantiate(ESObject.wrapString('D'), ESObject.wrapNumber(21), ESObject.wrapString('F'), - ESObject.wrapBoolean(true)); + let student1 = student.instantiate(ESValue.wrapString('D'), ESValue.wrapNumber(21), ESValue.wrapString('F'), + ESValue.wrapBoolean(true)); let score = [78, 86, 90, 76, 82, 78]; let index = 0; for (let item of SUBJECT) { @@ -55,7 +55,7 @@ export function test4(): Array { let calAverageScore = module.getProperty('calAverageScore'); let totalScore = calTotalScore.invoke(student1).toNumber(); // 6.参数传递 - let averageScore = calAverageScore.invoke(ESObject.wrapNumber(totalScore), ESObject.wrapNumber(6)); + let averageScore = calAverageScore.invoke(ESValue.wrapNumber(totalScore), ESValue.wrapNumber(6)); logs.push(`总成绩:${totalScore},平均分:${averageScore}`); return logs; } @@ -63,7 +63,7 @@ export function test4(): Array { // 7.异常调用 export function ErrorHandle4(): string { let errorInfo = ''; - const module = ESObject.load('@normalized:N&entry&com.samples.interopsample&tshar/src/main/ets/components/TSTest&1.0.0'); + const module = ESValue.load('@normalized:N&entry&com.samples.interopsample&tshar/src/main/ets/components/TSTest&1.0.0'); let referenceErr = module.getProperty('referenceErr'); errorInfo = referenceErr.getProperty('message').toString(); return errorInfo; diff --git a/code/BasicFeature/ApplicationModels/DynamicRouter/RouterModule/src/main/ets/utils/RouterModule.ets b/code/BasicFeature/ApplicationModels/DynamicRouter/RouterModule/src/main/ets/utils/RouterModule.ets index a6c3b72b49670045c874b047c4b0d254978201d8..3f8643734acc8e3fe73134d3312e2b994a6e4f0f 100644 --- a/code/BasicFeature/ApplicationModels/DynamicRouter/RouterModule/src/main/ets/utils/RouterModule.ets +++ b/code/BasicFeature/ApplicationModels/DynamicRouter/RouterModule/src/main/ets/utils/RouterModule.ets @@ -53,7 +53,7 @@ export class RouterModule { path += "/" + params[i]; } // 动态引入要跳转的页面 - let ns: ESObject = await import(harName); + let ns: ESValue = await import(harName); ns.harInit(path); RouterModule.getRouter(routerName).pushPathByName(builderName, null); } diff --git a/code/BasicFeature/Connectivity/NetworkObserver/entry/src/main/ets/pages/VideoPage.ets b/code/BasicFeature/Connectivity/NetworkObserver/entry/src/main/ets/pages/VideoPage.ets index 75f96fb47d644d0fdc9dfd7dc014148dee28f34f..4fd1c3f7cc4bb2a15b5d04e8ba9bb23f82c91a79 100644 --- a/code/BasicFeature/Connectivity/NetworkObserver/entry/src/main/ets/pages/VideoPage.ets +++ b/code/BasicFeature/Connectivity/NetworkObserver/entry/src/main/ets/pages/VideoPage.ets @@ -219,7 +219,7 @@ export struct VideoPage { } @Builder - buildMap(name: string, param: ESObject) { + buildMap(name: string, param: ESValue) { if (name === 'SettingPage') { NavDestination() { SettingPage() diff --git a/code/DocsSample/ArkTS/ArkTsConcurrent/ConcurrentThreadCommunication/InterThreadCommunicationObjects/SendableObject/SendableObjectIntroduction/entry/src/main/ets/managers/classusage.ets b/code/DocsSample/ArkTS/ArkTsConcurrent/ConcurrentThreadCommunication/InterThreadCommunicationObjects/SendableObject/SendableObjectIntroduction/entry/src/main/ets/managers/classusage.ets index 0ec63eed40877aa6d3232d9a02f9cf2cd3cc40f0..6341b6550ce34b323ef976f53c90835991f99883 100755 --- a/code/DocsSample/ArkTS/ArkTsConcurrent/ConcurrentThreadCommunication/InterThreadCommunicationObjects/SendableObject/SendableObjectIntroduction/entry/src/main/ets/managers/classusage.ets +++ b/code/DocsSample/ArkTS/ArkTsConcurrent/ConcurrentThreadCommunication/InterThreadCommunicationObjects/SendableObject/SendableObjectIntroduction/entry/src/main/ets/managers/classusage.ets @@ -30,7 +30,7 @@ struct ClassUsage { middle: { anchor: '__container__', align: HorizontalAlign.Center } }) .onClick(() => { - import('class').then((ns: ESObject) => { + import('class').then((ns: ESValue) => { ns.object.printName(); }) this.message = 'success'; diff --git a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/main/ets/pages/Index.ets index 6eacb0025008ddd888ac7b6e2462400070ef8b0d..dad5ab05098d9f0fc647debe871aa47ac0821c28 100755 --- a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/main/ets/pages/Index.ets @@ -70,9 +70,9 @@ struct Index { .fontSize(16) .onClick(() => { if (item === resourceToString($r('app.string.business_expansion_scenario'))) { - import('harlibrary').then((ns: ESObject) => { + import('harlibrary').then((ns: ESValue) => { ns.Calc.staticAdd(8, 9); // 调用静态成员函数staticAdd() - let calc: ESObject = new ns.Calc(); // 实例化类Calc + let calc: ESValue = new ns.Calc(); // 实例化类Calc calc.instanceAdd(10, 11); // 调用成员函数instanceAdd() ns.addHarlibrary(6, 7); // 调用全局方法addHarlibrary() @@ -82,146 +82,146 @@ struct Index { let staticMethod = 'staticAdd'; let functionName = 'addHarlibrary'; ns[className][staticMethod](12, 13); // 调用静态成员函数staticAdd() - let calc1: ESObject = new ns[className](); // 实例化类Calc + let calc1: ESValue = new ns[className](); // 实例化类Calc calc1[methodName](14, 15); // 调用成员函数instanceAdd() ns[functionName](16, 17); // 调用全局方法addHarlibrary() }) } else if (item === resourceToString($r('app.string.dynamic_import_HAR_name'))) { //HAP常量动态import HAR模块名 - import('myhar').then((ns: ESObject) => { + import('myhar').then((ns: ESValue) => { console.info(ns.add(3, 5)); }) } else if (item === resourceToString($r('app.string.dynamic_import_HAR_path'))) { // HAP常量动态import HAR模块文件路径 - import('myhar/Index').then((ns: ESObject) => { + import('myhar/Index').then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_HSP_name'))) { // HAP常量动态import HSP模块名 - import('myhsp').then((ns: ESObject) => { + import('myhsp').then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_HSP_path'))) { // HAP常量动态import HSP模块名文件路径 - import('myhsp/Index').then((ns: ESObject) => { + import('myhsp/Index').then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_remote_HAR_name'))) { // HAP常量动态import远程HAR模块名 - import('@ohos/crypto-js').then((ns: ESObject) => { + import('@ohos/crypto-js').then((ns: ESValue) => { console.info('DynamicImport @ohos/crypto-js: ' + ns.CryptoJS.src); }); } else if (item === resourceToString($r('app.string.dynamic_import_ohpm'))) { // HAP常量动态import ohpm包 - import('@ohos/hypium').then((ns: ESObject) => { + import('@ohos/hypium').then((ns: ESValue) => { console.info('DynamicImport @ohos/hypium: ', ns.TestType.FUNCTION.toString()); }); } else if (item === resourceToString($r('app.string.dynamic_import_file'))) { // HAP常量动态import自己的单文件 - import('../Calc').then((ns: ESObject) => { + import('../Calc').then((ns: ESValue) => { console.info(ns.add(3, 5)); }) } else if (item === resourceToString($r('app.string.dynamic_import_native'))) { // HAP常量动态import自己的Native库 - import('libentry.so').then((ns: ESObject) => { + import('libentry.so').then((ns: ESValue) => { console.info('DynamicImport libnativeapi.so: ' + ns.default.add(2, 3)); }); } else if (item === resourceToString($r('app.string.dynamic_import_system_app'))) { // HAP常量动态import加载API - import('@system.app').then((ns: ESObject) => { + import('@system.app').then((ns: ESValue) => { ns.default.getInfo(); }); } else if (item === resourceToString($r('app.string.dynamic_import_ohos_curves'))) { // HAP常量动态import加载API - import('@ohos.curves').then((ns: ESObject) => { + import('@ohos.curves').then((ns: ESValue) => { ns.default.springMotion(0.555, 0.75, 0.001).interpolate(1); }); } else if (item === resourceToString($r('app.string.dynamic_import_ohos_matrix4'))) { // HAP常量动态import加载API - import('@ohos.matrix4').then((ns: ESObject) => { + import('@ohos.matrix4').then((ns: ESValue) => { ns.default.identity().transformPoint([1, 2])[0]; }); } else if (item === resourceToString($r('app.string.dynamic_import_ohos_hilog'))) { // HAP常量动态import加载API - import('@ohos.hilog').then((ns: ESObject) => { + import('@ohos.hilog').then((ns: ESValue) => { ns.default.info(0x0000, 'testTag', '%{public}s', 'DynamicImport @ohos.hilog.'); hilog.info(0x000, 'testTag', '%{public}s', ns.default.LogLevel.DEBUG); }); } else if (item === resourceToString($r('app.string.dynamic_import_module_myhar'))) { // 变量动态import其他模块myHar let harName = 'myhar'; - import(harName).then((ns: ESObject) => { + import(harName).then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_module_file'))) { // 变量动态import本模块自己的单文件 let filePath = '../utils/Calc'; - import(filePath).then((ns: ESObject) => { + import(filePath).then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_HAR_name_variable'))) { // HAP变量动态import HAR模块名 let harPackageName = 'myhar'; - import(harPackageName).then((ns: ESObject) => { + import(harPackageName).then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_HSP_name_variable'))) { // HAP变量动态import HSP模块名 let hspPackageName = 'myhsp'; - import(hspPackageName).then((ns: ESObject) => { + import(hspPackageName).then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_remote_HAR_name_variable'))) { // HAP变量动态import远程HAR模块名 let remoteHarPackageName = '@ohos/crypto-js'; - import(remoteHarPackageName).then((ns: ESObject) => { + import(remoteHarPackageName).then((ns: ESValue) => { console.info('DynamicImport @ohos/crypto-js: ' + ns.CryptoJS.src); }); } else if (item === resourceToString($r('app.string.dynamic_import_ohpm_variable'))) { // HAP变量动态import ohpm包 let ohpmPackageName = '@ohos/hypium'; - import(ohpmPackageName).then((ns: ESObject) => { + import(ohpmPackageName).then((ns: ESValue) => { console.info('DynamicImport @ohos/hypium: ', ns.TestType.FUNCTION.toString()); }); } else if (item === resourceToString($r('app.string.dynamic_import_file_variable'))) { // HAP变量动态import自己的单文件 let calcFilePath = '../Calc'; - import(calcFilePath).then((ns: ESObject) => { + import(calcFilePath).then((ns: ESValue) => { console.info(ns.add(3, 5)); }); } else if (item === resourceToString($r('app.string.dynamic_import_native_variable'))) { // HAP变量动态import自己的Native库 let soName = 'libentry.so'; - import(soName).then((ns: ESObject) => { + import(soName).then((ns: ESValue) => { console.info('DynamicImport libnativeapi.so: ' + ns.default.add(2, 3)); }); } else if (item === resourceToString($r('app.string.dynamic_import_system_app_variable'))) { // HAP变量动态import加载API let packageName = '@system.app'; - import(packageName).then((ns: ESObject) => { + import(packageName).then((ns: ESValue) => { ns.default.getInfo(); }); } else if (item === resourceToString($r('app.string.dynamic_import_ohos_curves_variable'))) { // HAP变量动态import加载API let packageName = '@ohos.curves'; - import(packageName).then((ns: ESObject) => { + import(packageName).then((ns: ESValue) => { ns.default.springMotion(0.555, 0.75, 0.001).interpolate(1); }); } else if (item === resourceToString($r('app.string.dynamic_import_ohos_matrix4_variable'))) { // HAP变量动态import加载API let packageName = '@ohos.matrix4'; - import(packageName).then((ns: ESObject) => { + import(packageName).then((ns: ESValue) => { ns.default.identity().transformPoint([1, 2])[0]; }); } else if (item === resourceToString($r('app.string.dynamic_import_ohos_hilog_variable'))) { // HAP变量动态import加载API let packageName = '@ohos.hilog'; - import(packageName).then((ns: ESObject) => { + import(packageName).then((ns: ESValue) => { ns.default.info(0x0000, 'testTag', '%{public}s', 'DynamicImport @ohos.hilog.'); }) } else if (item === resourceToString($r('app.string.dynamic_import_HAR'))) { let harName = 'har1'; - import(harName).then((ns: ESObject) => { + import(harName).then((ns: ESValue) => { console.info('DynamicImport addHar1 4 + 5 = ' + ns.addHar1(4, 5)); }); } diff --git a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/ohosTest/ets/test/DynamicImport.test.ets b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/ohosTest/ets/test/DynamicImport.test.ets index bb30af241ad49fc2635c248e2eaac1600491524b..9a18b89f2a0abbe6a7347e725d0357d358d95785 100755 --- a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/ohosTest/ets/test/DynamicImport.test.ets +++ b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/entry/src/ohosTest/ets/test/DynamicImport.test.ets @@ -20,9 +20,9 @@ export default function dynamicImportTest() { it('testDynamicImport001', 0, async () => { console.info('uitest: testDynamicImport001 begin'); - let har: ESObject = await import('harlibrary'); + let har: ESValue = await import('harlibrary'); expect(har.Calc.staticAdd(8, 9)).assertEqual(17); - let calc: ESObject = new har.Calc(); + let calc: ESValue = new har.Calc(); expect(calc.instanceAdd(10, 11)).assertEqual(21); expect(har.addHarlibrary(6, 7)).assertEqual(13); @@ -31,7 +31,7 @@ export default function dynamicImportTest() { let staticMethod = 'staticAdd'; let functionName = 'addHarlibrary'; expect(har[className][staticMethod](12, 13)).assertEqual(25); - let calc1: ESObject = new har[className](); + let calc1: ESValue = new har[className](); expect(calc1[methodName](14, 15)).assertEqual(29); expect(har[functionName](16, 17)).assertEqual(33); console.info('uitest: testDynamicImport001 end'); @@ -39,84 +39,84 @@ export default function dynamicImportTest() { it('testDynamicImport002', 0, async () => { console.info('uitest: testDynamicImport002 begin'); - let har: ESObject = await import('myhar'); + let har: ESValue = await import('myhar'); expect(har.add(2, 3)).assertEqual(5); console.info('uitest: testDynamicImport002 end'); }) it('testDynamicImport003', 0, async () => { console.info('uitest: testDynamicImport003 begin'); - let har: ESObject = await import('myhar/Index'); + let har: ESValue = await import('myhar/Index'); expect(har.add(2, 3)).assertEqual(5); console.info('uitest: testDynamicImport003 end'); }) it('testDynamicImport004', 0, async () => { console.info('uitest: testDynamicImport004 begin'); - let hsp: ESObject = await import('myhsp'); + let hsp: ESValue = await import('myhsp'); expect(hsp.add(2, 3)).assertEqual(5); console.info('uitest: testDynamicImport004 end'); }) it('testDynamicImport005', 0, async () => { console.info('uitest: testDynamicImport005 begin'); - let hsp: ESObject = await import('myhsp/Index'); + let hsp: ESValue = await import('myhsp/Index'); expect(hsp.add(2, 3)).assertEqual(5); console.info('uitest: testDynamicImport005 end'); }) it('testDynamicImport006', 0, async () => { console.info('uitest: testDynamicImport006 begin'); - let har: ESObject = await import('@ohos/crypto-js'); + let har: ESValue = await import('@ohos/crypto-js'); expect(har.CryptoJS.src).assertUndefined(); console.info('uitest: testDynamicImport006 end'); }) it('testDynamicImport007', 0, async () => { console.info('uitest: testDynamicImport007 begin'); - let ohpm: ESObject = await import('@ohos/hypium'); + let ohpm: ESValue = await import('@ohos/hypium'); expect(ohpm.TestType.FUNCTION).assertEqual(1); console.info('uitest: testDynamicImport007 end'); }) it('testDynamicImport008', 0, async () => { console.info('uitest: testDynamicImport008 begin'); - let singleFile: ESObject = await import('../../../../src/main/ets/Calc'); + let singleFile: ESValue = await import('../../../../src/main/ets/Calc'); expect(singleFile.add(3, 5)).assertEqual(8); console.info('uitest: testDynamicImport008 end'); }) it('testDynamicImport009', 0, async () => { console.info('uitest: testDynamicImport009 begin'); - let native: ESObject = await import('libentry.so'); + let native: ESValue = await import('libentry.so'); expect(native.default.add(2, 3)).assertEqual(5); console.info('uitest: testDynamicImport009 end'); }) it('testDynamicImport010', 0, async () => { console.info('uitest: testDynamicImport010 begin'); - let systemApp: ESObject = await import('@system.app'); + let systemApp: ESValue = await import('@system.app'); expect(systemApp.default.getInfo()).assertNull(); console.info('uitest: testDynamicImport010 end'); }) it('testDynamicImport011', 0, async () => { console.info('uitest: testDynamicImport011 begin'); - let curves: ESObject = await import('@ohos.curves'); + let curves: ESValue = await import('@ohos.curves'); expect(curves.default.springMotion(0.555, 0.75, 0.001).interpolate(1)).assertEqual(0); console.info('uitest: testDynamicImport011 end'); }) it('testDynamicImport012', 0, async () => { console.info('uitest: testDynamicImport012 begin'); - let matrix4: ESObject = await import('@ohos.matrix4'); + let matrix4: ESValue = await import('@ohos.matrix4'); expect(matrix4.default.identity().transformPoint([1, 2])[0]).assertEqual(1); console.info('uitest: testDynamicImport012 end'); }) it('testDynamicImport013', 0, async () => { console.info('uitest: testDynamicImport013 begin'); - let hilog: ESObject = await import('@ohos.hilog'); + let hilog: ESValue = await import('@ohos.hilog'); expect(hilog.default.LogLevel.DEBUG).assertEqual(3); console.info('uitest: testDynamicImport013 end'); }) @@ -124,7 +124,7 @@ export default function dynamicImportTest() { it('testDynamicImport014', 0, async () => { console.info('uitest: testDynamicImport014 begin'); let harName = 'myhar'; - let har: ESObject = await import(harName); + let har: ESValue = await import(harName); expect(har.add(3, 5)).assertEqual(8); console.info('uitest: testDynamicImport014 end'); }) @@ -132,7 +132,7 @@ export default function dynamicImportTest() { it('testDynamicImport015', 0, async () => { console.info('uitest: testDynamicImport015 begin'); let filePath = '../../../main/ets/utils/Calc'; - let file: ESObject = await import(filePath); + let file: ESValue = await import(filePath); expect(file.add(3, 5)).assertEqual(8); console.info('uitest: testDynamicImport015 end'); }) @@ -140,7 +140,7 @@ export default function dynamicImportTest() { it('testDynamicImport016', 0, async () => { console.info('uitest: testDynamicImport016 begin'); let harPackageName = 'myhar'; - let har: ESObject = await import(harPackageName); + let har: ESValue = await import(harPackageName); expect(har.add(3, 5)).assertEqual(8); console.info('uitest: testDynamicImport016 end'); }) @@ -148,7 +148,7 @@ export default function dynamicImportTest() { it('testDynamicImport017', 0, async () => { console.info('uitest: testDynamicImport017 begin'); let hspPackageName = 'myhsp'; - let hsp: ESObject = await import(hspPackageName); + let hsp: ESValue = await import(hspPackageName); expect(hsp.add(3, 5)).assertEqual(8); console.info('uitest: testDynamicImport017 end'); }) @@ -156,7 +156,7 @@ export default function dynamicImportTest() { it('testDynamicImport018', 0, async () => { console.info('uitest: testDynamicImport018 begin'); let remoteHarPackageName = '@ohos/crypto-js'; - let har: ESObject = await import(remoteHarPackageName); + let har: ESValue = await import(remoteHarPackageName); expect(har.CryptoJS.src).assertUndefined(); console.info('uitest: testDynamicImport018 end'); }) @@ -164,7 +164,7 @@ export default function dynamicImportTest() { it('testDynamicImport019', 0, async () => { console.info('uitest: testDynamicImport019 begin'); let ohpmPackageName = '@ohos/hypium'; - let ohpm: ESObject = await import(ohpmPackageName); + let ohpm: ESValue = await import(ohpmPackageName); expect(ohpm.TestType.FUNCTION).assertEqual(1); console.info('uitest: testDynamicImport019 end'); }) @@ -172,7 +172,7 @@ export default function dynamicImportTest() { it('testDynamicImport020', 0, async () => { console.info('uitest: testDynamicImport020 begin'); let calcFilePath = '../../../../src/main/ets/Calc'; - let singleFile: ESObject = await import(calcFilePath); + let singleFile: ESValue = await import(calcFilePath); expect(singleFile.add(3, 5)).assertEqual(8); console.info('uitest: testDynamicImport020 end'); }) @@ -180,7 +180,7 @@ export default function dynamicImportTest() { it('testDynamicImport021', 0, async () => { console.info('uitest: testDynamicImport021 begin'); let soName = 'libentry.so'; - let native: ESObject = await import(soName); + let native: ESValue = await import(soName); expect(native.default.add(2, 3)).assertEqual(5); console.info('uitest: testDynamicImport021 end'); }) @@ -188,7 +188,7 @@ export default function dynamicImportTest() { it('testDynamicImport022', 0, async () => { console.info('uitest: testDynamicImport022 begin'); let packageName = '@system.app'; - let systemApp: ESObject = await import(packageName); + let systemApp: ESValue = await import(packageName); expect(systemApp.default.getInfo()).assertNull(); console.info('uitest: testDynamicImport022 end'); }) @@ -196,7 +196,7 @@ export default function dynamicImportTest() { it('testDynamicImport023', 0, async () => { console.info('uitest: testDynamicImport023 begin'); let packageName = '@ohos.curves'; - let curves: ESObject = await import(packageName); + let curves: ESValue = await import(packageName); expect(curves.default.springMotion(0.555, 0.75, 0.001).interpolate(1)).assertEqual(0); console.info('uitest: testDynamicImport023 end'); }) @@ -204,7 +204,7 @@ export default function dynamicImportTest() { it('testDynamicImport024', 0, async () => { console.info('uitest: testDynamicImport024 begin'); let packageName = '@ohos.matrix4'; - let matrix4: ESObject = await import(packageName); + let matrix4: ESValue = await import(packageName); expect(matrix4.default.identity().transformPoint([1, 2])[0]).assertEqual(1); console.info('uitest: testDynamicImport024 end'); }) @@ -212,7 +212,7 @@ export default function dynamicImportTest() { it('testDynamicImport025', 0, async () => { console.info('uitest: testDynamicImport025 begin'); let packageName = '@ohos.hilog'; - let hilog: ESObject = await import(packageName); + let hilog: ESValue = await import(packageName); expect(hilog.default.LogLevel.DEBUG).assertEqual(3); console.info('uitest: testDynamicImport025 end'); }) @@ -220,7 +220,7 @@ export default function dynamicImportTest() { it('testDynamicImport026', 0, async () => { console.info('uitest: testDynamicImport026 begin'); let harName = 'har1'; - let har: ESObject = await import(harName); + let har: ESValue = await import(harName); expect(har.addHar1(4, 5)).assertEqual(9); console.info('uitest: testDynamicImport026 end'); }) diff --git a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/har1/src/main/ets/utils/Calc.ets b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/har1/src/main/ets/utils/Calc.ets index 91ff3de13565e5b0a6c883ec691a8befcbb24712..645193e27a7891126849f8eb62d99f9a5e9a2018 100755 --- a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/har1/src/main/ets/utils/Calc.ets +++ b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/DynamicImport/har1/src/main/ets/utils/Calc.ets @@ -18,7 +18,7 @@ export function addHar1(a: number, b: number): number { console.info('DynamicImport I am har1, %d + %d = %d', a, b, c); let harName = 'har2'; - import(harName).then((ns: ESObject) => { + import(harName).then((ns: ESValue) => { console.info('DynamicImport addHar2 4 + 5 = ' + ns.addHar2(4, 5)); }); return c; diff --git a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/JsApisLoadNativeModule/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/JsApisLoadNativeModule/entry/src/main/ets/pages/Index.ets index 82e54f7fe6437b37ce3118ba5ff7bf7f112dd086..168164eb541278c3c76a66969f5d0f35bee34cb0 100755 --- a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/JsApisLoadNativeModule/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/JsApisLoadNativeModule/entry/src/main/ets/pages/Index.ets @@ -25,7 +25,7 @@ struct Index { .margin({ bottom: 3 }) .onClick(() => { //HAP加载系统库模块 - let hilog: ESObject = loadNativeModule('@ohos.hilog'); + let hilog: ESValue = loadNativeModule('@ohos.hilog'); hilog.info(0, 'testTag', 'loadNativeModule ohos.hilog success'); this.message = 'loadNativeModule ohos.hilog success' }) @@ -35,7 +35,7 @@ struct Index { .margin({ bottom: 3 }) .onClick(() => { //HAP加载Native库 - let module: ESObject = loadNativeModule('libentry.so'); + let module: ESValue = loadNativeModule('libentry.so'); let sum: number = module.add(1, 2); this.message = 'loadNativeModule libentry.so success result: ' + sum.toString(); }) diff --git a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/LazyImport/entry/src/main/ets/pages/main.ets b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/LazyImport/entry/src/main/ets/pages/main.ets index 24e9cd4a0a6613cbdebfb9b0a6b7df9537c57f93..eeb577343c124ff8b7ea74ccb3587d3bc883f55c 100755 --- a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/LazyImport/entry/src/main/ets/pages/main.ets +++ b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/LazyImport/entry/src/main/ets/pages/main.ets @@ -57,7 +57,7 @@ struct Index { .width('50%') .margin({ bottom: 3 }) .onClick(() => { - import('./middle').then((res: ESObject) => { + import('./middle').then((res: ESValue) => { console.info(res.c); }).catch((e: Error) => { hilog.error(0x0000, '[Sample_LazyImport]', 'Test Assert error: %{public}s', e.toString()); @@ -68,7 +68,7 @@ struct Index { .width('50%') .margin({ bottom: 3 }) .onClick(() => { - import('./middle').then((res: ESObject) => { + import('./middle').then((res: ESValue) => { console.info(res.ns.c); }).catch((e: Error) => { hilog.error(0x0000, '[Sample_LazyImport]', 'Test Assert error: %{public}s', e.toString()); diff --git a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/ModuleLoadingSideEffects/entry/src/main/ets/pages/ModifyingGlobalVariables/main.ets b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/ModuleLoadingSideEffects/entry/src/main/ets/pages/ModifyingGlobalVariables/main.ets index 3dc293c62260fc2c2eb54eb39b59457da69abdbf..713bc33f8f52b829cdc06dcae37d34667ccf327b 100755 --- a/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/ModuleLoadingSideEffects/entry/src/main/ets/pages/ModifyingGlobalVariables/main.ets +++ b/code/DocsSample/ArkTs/ArkTSRuntime/ArkTSModule/ModuleLoadingSideEffects/entry/src/main/ets/pages/ModifyingGlobalVariables/main.ets @@ -29,7 +29,7 @@ struct main { Column() { Button($r('app.string.circular_dependency')) .onClick(() => { - import('./a').then((ns: ESObject) => { + import('./a').then((ns: ESValue) => { hilog.info(0, '[Sample_ModifyingGlobalVariables]', '%{public}s', ns.b); }).catch((e: Error) => { hilog.error(0x0000, 'testTag', 'Test Assert error: %{public}s', e.toString()); @@ -54,7 +54,7 @@ struct main { .width('40%') .margin({ bottom: 3 }) .onClick(() => { - import('./modifyPrototype').then((es: ESObject) => { + import('./modifyPrototype').then((es: ESValue) => { let arr = [1, 2, 3, 4]; console.log(arr.includes(1).toString()); // 此时调用的是modifyPrototype.ts中的Array.prototype.includes方法 this.message2 = 'Optimize: ' + arr.includes(1).toString(); diff --git a/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_five.ets b/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_five.ets index ed51646668e47d380ebce1d77b98c7ad0ee1fe3d..1dd79ab21a4187085cb0396d30eea9a73d12ab73 100755 --- a/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_five.ets +++ b/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_five.ets @@ -35,7 +35,7 @@ public objReturn: ObjOther this.objReturn = new ObjOther(['testOther']); } - test(): ESObject { + test(): ESValue { return this.objReturn } diff --git a/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_four.ets b/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_four.ets index c4575230150c38a58f42576348426157c43b1549..4d81da5bb93e068f6b109e9d52a41bcfb0bda1e8 100755 --- a/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_four.ets +++ b/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_four.ets @@ -20,7 +20,7 @@ class TestClass { constructor() { } - test(param: ESObject): void { + test(param: ESValue): void { param.hello('call obj func'); } diff --git a/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_two.ets b/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_two.ets index 0ce20f5dfd9538f662d825d877ab92df89b6fcc2..4271049ef2c0a62d714f790004b38d8dcf1bdbc2 100755 --- a/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_two.ets +++ b/code/DocsSample/ArkWeb/UseFrontendJSApp/entry2/src/main/ets/pages/UsageOfComplexTypes_two.ets @@ -31,7 +31,7 @@ class TestClass { return st; } - toString(param: ESObject): void { + toString(param: ESValue): void { console.log('Web Component toString' + param['name']); } } diff --git a/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/DrawXCompAVPBtn.ets b/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/DrawXCompAVPBtn.ets index f1725a0155ea31cd34f47a5681b38a1ded6bf503..1edc28c504e6e7776829439a7cb17b0149214828 100755 --- a/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/DrawXCompAVPBtn.ets +++ b/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/DrawXCompAVPBtn.ets @@ -180,7 +180,7 @@ struct WebIndex { } else if (embed.status == NativeEmbedStatus.UPDATE) { let nodeController = this.nodeControllerMap.get(componentId); nodeController?.updateNode({ - textOne: 'update', width: px2vp(embed.info?.width), height: px2vp(embed.info?.height)} as ESObject); + textOne: 'update', width: px2vp(embed.info?.width), height: px2vp(embed.info?.height)} as ESValue); } else { let nodeController = this.nodeControllerMap.get(componentId); nodeController?.setDestroy(true); diff --git a/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_one.ets b/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_one.ets index 454fd7bc143928a672889793e231749429d8c30a..b4ed602b74f84ac03348c0b31f341ab031186ece 100755 --- a/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_one.ets +++ b/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_one.ets @@ -198,7 +198,7 @@ struct Page{ this.widthMap.set(componentId, px2vp(embed.info?.width)); this.heightMap.set(componentId, px2vp(embed.info?.height)); nodeController?.updateNode( - {textOne: 'update', width: px2vp(embed.info?.width), height: px2vp(embed.info?.height)} as ESObject); + {textOne: 'update', width: px2vp(embed.info?.width), height: px2vp(embed.info?.height)} as ESValue); } else if (embed.status == NativeEmbedStatus.DESTROY) { console.log('NativeEmbed destroy' + JSON.stringify(embed)); let nodeController = this.nodeControllerMap.get(componentId); diff --git a/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_two.ets b/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_two.ets index 5ad45c2b350ab4baf0ef968086a660cc3e88b234..65490de88c1d373ebeb08b9bfd6b5c3ee4aea7f1 100755 --- a/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_two.ets +++ b/code/DocsSample/ArkWeb/UseSameLayerRender/entry/src/main/ets/pages/RenderTxtBoxSameLayer_two.ets @@ -200,7 +200,7 @@ struct Page{ this.widthMap.set(componentId, px2vp(embed.info?.width)); this.heightMap.set(componentId, px2vp(embed.info?.height)); nodeController?.updateNode( - {textOne: 'update', width: px2vp(embed.info?.width), height: px2vp(embed.info?.height)} as ESObject); + {textOne: 'update', width: px2vp(embed.info?.width), height: px2vp(embed.info?.height)} as ESValue); } else if (embed.status == NativeEmbedStatus.DESTROY) { console.log('NativeEmbed destroy' + JSON.stringify(embed)); let nodeController = this.nodeControllerMap.get(componentId); diff --git a/code/Performance/OperateRDBInTaskPool/casesfeature/operaterdbintaskpool/src/main/ets/view/AddressBookList.ets b/code/Performance/OperateRDBInTaskPool/casesfeature/operaterdbintaskpool/src/main/ets/view/AddressBookList.ets index a4c2c20796c7d22ecfbd96b536ed80eea047d3b0..221db78d16fa63135cd8ba39f1c1ed2ac64e9169 100644 --- a/code/Performance/OperateRDBInTaskPool/casesfeature/operaterdbintaskpool/src/main/ets/view/AddressBookList.ets +++ b/code/Performance/OperateRDBInTaskPool/casesfeature/operaterdbintaskpool/src/main/ets/view/AddressBookList.ets @@ -26,7 +26,7 @@ import { CommonConstants } from '../constant/CommonConstant'; struct ItemComponent { @State name: string = '' - aboutToReuse(params: Record) { + aboutToReuse(params: Record) { this.name = params.name; } diff --git a/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/ComponentFactory.ets b/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/ComponentFactory.ets index a951adc2dc3df859dd8b5f287c09f7ddc4a92008..ee56aeb7b7167031f62ff161672009d023e476ff 100644 --- a/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/ComponentFactory.ets +++ b/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/ComponentFactory.ets @@ -47,7 +47,7 @@ export class ComponentFactory { * @param name - tab项标题 * @returns: tab项内容 */ - public getContent(name: string): WrappedBuilder<[ESObject]> | undefined { + public getContent(name: string): WrappedBuilder<[ESValue]> | undefined { return this.tabsInfo.get(name)?.contentBuilder; } @@ -65,7 +65,7 @@ export class ComponentFactory { * @param name - tab项标题 * @returns: 输入参数 */ - public getParams(name: string): ESObject { + public getParams(name: string): ESValue { return this.tabsInfo.get(name)?.params; } diff --git a/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/TabInfo.ets b/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/TabInfo.ets index 03c4cdfb54301a8c1c2dcbf40fb01c76515855fa..87ab6addccbc58f1dbe673fc39cc34c038fa607d 100644 --- a/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/TabInfo.ets +++ b/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/model/TabInfo.ets @@ -22,11 +22,11 @@ export class TabInfo { // tab项标题(页签内容) public title: string; // tab项内容 - public contentBuilder: WrappedBuilder<[ESObject]>; + public contentBuilder: WrappedBuilder<[ESValue]>; // tabBar(页签样式) public barBuilder?: WrappedBuilder<[TabBarItemInterface]>; // tabBarIndex - public params?: ESObject; + public params?: ESValue; /** * TabInfo构造器 @@ -34,8 +34,8 @@ export class TabInfo { * @param contentBuilder - tab项内容 * @param barBuilder - tabBar */ - constructor(title: string, contentBuilder: WrappedBuilder<[ESObject]>, - barBuilder?: WrappedBuilder<[TabBarItemInterface]>, params?: ESObject) { + constructor(title: string, contentBuilder: WrappedBuilder<[ESValue]>, + barBuilder?: WrappedBuilder<[TabBarItemInterface]>, params?: ESValue) { this.title = title; this.contentBuilder = contentBuilder; this.barBuilder = barBuilder; diff --git a/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/utils/CustomAnimationTab.ets b/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/utils/CustomAnimationTab.ets index 9f6a4b8858be7beeacf91f7ab24a899d32cba06e..558df69a2b3ec5f6bf7c195660377ce1e399470f 100644 --- a/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/utils/CustomAnimationTab.ets +++ b/code/UI/CustomAnimationTab/customanimationtab/src/main/ets/utils/CustomAnimationTab.ets @@ -587,7 +587,7 @@ export struct CustomAnimationTab { * 默认tabContent样式 */ @Builder -function baseBuilder(params: ESObject) { +function baseBuilder(params: ESValue) { Column() { Text('Text') .fontSize(CommonConstants.DEFAULT_TAB_CONTENT_FONT_SIZE) diff --git a/code/UI/FoldableAdaptation/README_zh.md b/code/UI/FoldableAdaptation/README_zh.md index 450a096461eba1a32910c8f992bf02f530545616..fa09fc85cce44735945a8e7fa335a5ca96e8cbfa 100644 --- a/code/UI/FoldableAdaptation/README_zh.md +++ b/code/UI/FoldableAdaptation/README_zh.md @@ -194,7 +194,7 @@ * @param uri 路由名称 * @param param 路由参数 */ - public static pushUri(uri: string, param?: ESObject) { + public static pushUri(uri: string, param?: ESValue) { // 记录当前进入路由名称 AppStorage.setOrCreate('enterRouteName', uri); // 定义emitter事件 diff --git a/code/UI/FoldableAdaptation/entry/src/main/ets/pages/HomePage.ets b/code/UI/FoldableAdaptation/entry/src/main/ets/pages/HomePage.ets index c45611d371db4703f4cd9270a2b3f4a2c1e0fb39..7b357efde31d34bcfdfc0e0aed8df7f20c8bd885 100644 --- a/code/UI/FoldableAdaptation/entry/src/main/ets/pages/HomePage.ets +++ b/code/UI/FoldableAdaptation/entry/src/main/ets/pages/HomePage.ets @@ -159,7 +159,7 @@ struct HomePage { } @Builder - buildMap(name: string, param?: ESObject) { + buildMap(name: string, param?: ESValue) { NavDestination() { if (name === NORMAL_PAGE_NAME) { NormalPage({ imageSrc: param as ResourceStr }) diff --git a/code/UI/FoldableAdaptation/entry/src/main/ets/utils/RouterUtils.ets b/code/UI/FoldableAdaptation/entry/src/main/ets/utils/RouterUtils.ets index 7df3e063529ed9087d1b5a8f1be92eb3d1e73ca5..125f186a553dcb29db3a2d50897194604e90dd90 100644 --- a/code/UI/FoldableAdaptation/entry/src/main/ets/utils/RouterUtils.ets +++ b/code/UI/FoldableAdaptation/entry/src/main/ets/utils/RouterUtils.ets @@ -76,7 +76,7 @@ export class RouterUtils { * @param uri 路由名称 * @param param 路由参数 */ - public static pushUri(uri: string, param?: ESObject) { + public static pushUri(uri: string, param?: ESValue) { // 记录当前进入路由名称 AppStorage.setOrCreate('enterRouteName', uri); // 定义emitter事件 diff --git a/code/UI/ImageViewer/entry/src/main/ets/picturepreviewsample/PicturePreviewSample.ets b/code/UI/ImageViewer/entry/src/main/ets/picturepreviewsample/PicturePreviewSample.ets index 69becd98372b77957749e6abff6ebaf4b266bb1d..2c68973cb57f4ea0c972823559602d99bd198b2b 100644 --- a/code/UI/ImageViewer/entry/src/main/ets/picturepreviewsample/PicturePreviewSample.ets +++ b/code/UI/ImageViewer/entry/src/main/ets/picturepreviewsample/PicturePreviewSample.ets @@ -42,7 +42,7 @@ export struct PicturePreviewSample { @State listDirection: Axis = Axis.Horizontal; aboutToAppear(): void { - let imageSource:string = $r('app.media.picturepreview_image') as ESObject; + let imageSource:string = $r('app.media.picturepreview_image') as ESValue; this.imageList.push( imageSource, imageSource, diff --git a/code/UI/ImperativeDynamicLayouts/README.md b/code/UI/ImperativeDynamicLayouts/README.md index 8dadb7c5f1888a7ee3c49a06886de948bd1f6b78..b14c10e909c7269d796be2d7047ac86f20a4ca0e 100644 --- a/code/UI/ImperativeDynamicLayouts/README.md +++ b/code/UI/ImperativeDynamicLayouts/README.md @@ -53,7 +53,7 @@ class VM { type?: string content?: string - css?: ESObject + css?: ESValue children?: VM[] id?: string } @@ -68,11 +68,11 @@ function FrameNodeFactory(vm: VM, context: UIContext): FrameNode | null { return null; } -function setColumnNodeAttr(node: typeNode.Column, css: ESObject) { +function setColumnNodeAttr(node: typeNode.Column, css: ESValue) { ... } -function setRowNodeAttr(node: typeNode.Row, css: ESObject) { +function setRowNodeAttr(node: typeNode.Row, css: ESValue) { ... } ``` diff --git a/code/UI/ImperativeDynamicLayouts/casesfeature/imperativedynamiclayouts/src/main/ets/view/ImperativeView.ets b/code/UI/ImperativeDynamicLayouts/casesfeature/imperativedynamiclayouts/src/main/ets/view/ImperativeView.ets index 4615b8fe9f65277ace5dc22a4997410f060b4db3..e122b1b2e1e152126eaaf7875588e6480d1ee71f 100644 --- a/code/UI/ImperativeDynamicLayouts/casesfeature/imperativedynamiclayouts/src/main/ets/view/ImperativeView.ets +++ b/code/UI/ImperativeDynamicLayouts/casesfeature/imperativedynamiclayouts/src/main/ets/view/ImperativeView.ets @@ -22,7 +22,7 @@ import { typeNode } from '@ohos.arkui.node'; class VM { public type?: string; public content?: string; - public css?: ESObject; + public css?: ESValue; public children?: VM[]; public id?: string; } @@ -101,7 +101,7 @@ function frameNodeFactory(vm: VM, context: UIContext): FrameNode | null { return null; } -function setColumnNodeAttr(node: typeNode.Column, css: ESObject) { +function setColumnNodeAttr(node: typeNode.Column, css: ESValue) { node.attribute.width(css.width); node.attribute.height(css.height); node.attribute.backgroundColor(css.backgroundColor); @@ -110,7 +110,7 @@ function setColumnNodeAttr(node: typeNode.Column, css: ESObject) { } } -function setRowNodeAttr(node: typeNode.Row, css: ESObject) { +function setRowNodeAttr(node: typeNode.Row, css: ESValue) { node.attribute.width(css.width); if (css.padding !== undefined) { node.attribute.padding(css.padding as Padding); diff --git a/code/UI/ImperativeDynamicLayouts/docs/imperative_dynamic_layouts.md b/code/UI/ImperativeDynamicLayouts/docs/imperative_dynamic_layouts.md index 33d17419ddb55d4c8ceaec6ef1cbb6deb8e75a6a..5461920346863d697cad4e1e647e70f9c29c1b85 100644 --- a/code/UI/ImperativeDynamicLayouts/docs/imperative_dynamic_layouts.md +++ b/code/UI/ImperativeDynamicLayouts/docs/imperative_dynamic_layouts.md @@ -284,7 +284,7 @@ class VM { type?: string content?: string - css?: ESObject + css?: ESValue children?: VM[] id?: string } @@ -365,7 +365,7 @@ function FrameNodeFactory(vm: VM, context: UIContext): FrameNode | null { return null; } -function setColumnNodeAttr(node: typeNode.Column, css: ESObject) { +function setColumnNodeAttr(node: typeNode.Column, css: ESValue) { node.attribute.width(css.width); node.attribute.height(css.height); node.attribute.backgroundColor(css.backgroundColor); @@ -374,7 +374,7 @@ function setColumnNodeAttr(node: typeNode.Column, css: ESObject) { } } -function setRowNodeAttr(node: typeNode.Row, css: ESObject) { +function setRowNodeAttr(node: typeNode.Row, css: ESValue) { node.attribute.width(css.width); if (css.padding !== undefined) { node.attribute.padding(css.padding as Padding)