diff --git a/01_EnvironmentSetup/01_Complete/build-profile.json5 b/01_EnvironmentSetup/01_Complete/build-profile.json5 index c033ce4278fb0641d84107c3c134047ac487368e..591688068faf142cb11fafe66c1f0994ee905856 100644 --- a/01_EnvironmentSetup/01_Complete/build-profile.json5 +++ b/01_EnvironmentSetup/01_Complete/build-profile.json5 @@ -5,7 +5,7 @@ { "name": "default", "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", + "compatibleSdkVersion": "5.0.5(17)", "runtimeOS": "HarmonyOS", } ], diff --git a/01_EnvironmentSetup/01_Complete/hvigor/hvigor-config.json5 b/01_EnvironmentSetup/01_Complete/hvigor/hvigor-config.json5 index 06b2783670a348f95533b352c1ceda909a842bbc..5bebc9755447385d82ce4138f54d991b1f85f348 100644 --- a/01_EnvironmentSetup/01_Complete/hvigor/hvigor-config.json5 +++ b/01_EnvironmentSetup/01_Complete/hvigor/hvigor-config.json5 @@ -1,5 +1,5 @@ { - "modelVersion": "5.0.0", + "modelVersion": "5.0.5", "dependencies": { }, "execution": { diff --git a/01_EnvironmentSetup/01_Complete/oh-package.json5 b/01_EnvironmentSetup/01_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..32b8eee5309f91f59aac4382a365f5451b9c14fb 100644 --- a/01_EnvironmentSetup/01_Complete/oh-package.json5 +++ b/01_EnvironmentSetup/01_Complete/oh-package.json5 @@ -1,10 +1,9 @@ { - "modelVersion": "5.0.0", + "modelVersion": "5.0.5", "description": "Please describe the basic information.", "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/02_UseSwiperToBuildBanner/02_Complete/oh-package.json5 b/02_UseSwiperToBuildBanner/02_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/02_UseSwiperToBuildBanner/02_Complete/oh-package.json5 +++ b/02_UseSwiperToBuildBanner/02_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/02_UseSwiperToBuildBanner/02_StartingPoint/build-profile.json5 b/02_UseSwiperToBuildBanner/02_StartingPoint/build-profile.json5 index c033ce4278fb0641d84107c3c134047ac487368e..591688068faf142cb11fafe66c1f0994ee905856 100644 --- a/02_UseSwiperToBuildBanner/02_StartingPoint/build-profile.json5 +++ b/02_UseSwiperToBuildBanner/02_StartingPoint/build-profile.json5 @@ -5,7 +5,7 @@ { "name": "default", "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", + "compatibleSdkVersion": "5.0.5(17)", "runtimeOS": "HarmonyOS", } ], diff --git a/02_UseSwiperToBuildBanner/02_StartingPoint/hvigor/hvigor-config.json5 b/02_UseSwiperToBuildBanner/02_StartingPoint/hvigor/hvigor-config.json5 index 06b2783670a348f95533b352c1ceda909a842bbc..5bebc9755447385d82ce4138f54d991b1f85f348 100644 --- a/02_UseSwiperToBuildBanner/02_StartingPoint/hvigor/hvigor-config.json5 +++ b/02_UseSwiperToBuildBanner/02_StartingPoint/hvigor/hvigor-config.json5 @@ -1,5 +1,5 @@ { - "modelVersion": "5.0.0", + "modelVersion": "5.0.5", "dependencies": { }, "execution": { diff --git a/02_UseSwiperToBuildBanner/02_StartingPoint/oh-package.json5 b/02_UseSwiperToBuildBanner/02_StartingPoint/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..32b8eee5309f91f59aac4382a365f5451b9c14fb 100644 --- a/02_UseSwiperToBuildBanner/02_StartingPoint/oh-package.json5 +++ b/02_UseSwiperToBuildBanner/02_StartingPoint/oh-package.json5 @@ -1,10 +1,9 @@ { - "modelVersion": "5.0.0", + "modelVersion": "5.0.5", "description": "Please describe the basic information.", "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/03_BuildItem/03_Complete/oh-package.json5 b/03_BuildItem/03_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/03_BuildItem/03_Complete/oh-package.json5 +++ b/03_BuildItem/03_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/03_BuildItem/03_StartingPoint/oh-package.json5 b/03_BuildItem/03_StartingPoint/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/03_BuildItem/03_StartingPoint/oh-package.json5 +++ b/03_BuildItem/03_StartingPoint/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/04_BuildGridAndList/04_Complete/entry/src/main/ets/pages/Index.ets b/04_BuildGridAndList/04_Complete/entry/src/main/ets/pages/Index.ets index f7a58d799586f94a9ced0dd876642863ce0129ff..9321cfd55652bfd29070d7c5af070c8c9e6f254f 100644 --- a/04_BuildGridAndList/04_Complete/entry/src/main/ets/pages/Index.ets +++ b/04_BuildGridAndList/04_Complete/entry/src/main/ets/pages/Index.ets @@ -58,7 +58,6 @@ struct Index { } } -@Preview @Component struct Banner { @State bannerList: Array = [ @@ -95,7 +94,6 @@ struct Banner { } } -@Preview @Component struct TutorialItem { @Prop tutorialItem: ArticleClass; @@ -143,7 +141,6 @@ struct TutorialItem { } } -@Preview @Component struct EnablementItem { @Prop enablementItem: ArticleClass; diff --git a/04_BuildGridAndList/04_Complete/oh-package.json5 b/04_BuildGridAndList/04_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/04_BuildGridAndList/04_Complete/oh-package.json5 +++ b/04_BuildGridAndList/04_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/04_BuildGridAndList/04_StartingPoint/oh-package.json5 b/04_BuildGridAndList/04_StartingPoint/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/04_BuildGridAndList/04_StartingPoint/oh-package.json5 +++ b/04_BuildGridAndList/04_StartingPoint/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/05_MVVMPatternDesign/05_Complete/build-profile.json5 b/05_MVVMPatternDesign/05_Complete/build-profile.json5 index 7ae3f2a4be402c2d3bb413e572ca16ae6271b2a2..7ce8a7df9f129fbb020a298cd22d0b3b91b5e8c8 100644 --- a/05_MVVMPatternDesign/05_Complete/build-profile.json5 +++ b/05_MVVMPatternDesign/05_Complete/build-profile.json5 @@ -1,7 +1,7 @@ { "app": { "signingConfigs": [ - + ], "products": [ { diff --git a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/util/BufferUtil.ets b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/util/BufferUtil.ets index 3e1137870526d0460b5ec51c48f4cf6fd2cf18eb..27994473e50bed694c73ba745d3b44f7d818bdc3 100644 --- a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/util/BufferUtil.ets +++ b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/util/BufferUtil.ets @@ -1,11 +1,9 @@ import { util } from '@kit.ArkTS'; -export function bufferToString(buffer: ArrayBufferLike): string { +export function bufferToString(buffer: Uint8Array): string { let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM: true }); - let resultPut = textDecoder.decodeWithStream(new Uint8Array(buffer), { - stream: true - }); + let resultPut = textDecoder.decodeToString(buffer); return resultPut; } \ No newline at end of file diff --git a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/Banner.ets b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/Banner.ets index 1858232fbd0da53eec2bc3065f8bd882ee99e771..d274e2f37464fe77f7c79315c939b3d4e885cd1c 100644 --- a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/Banner.ets +++ b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/Banner.ets @@ -10,9 +10,9 @@ export struct Banner { } getBannerDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('BannerData.json').then(value => { - this.bannerList = JSON.parse(bufferToString(value.buffer)) as BannerClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('BannerData.json').then(value => { + this.bannerList = JSON.parse(bufferToString(value)) as BannerClass[]; + }); } build() { diff --git a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/EnablementView.ets b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/EnablementView.ets index 2c5fd0efb4660e11597cff0719fe6d64b6603334..38249da03467910f10390989b5f4bed91ca733a0 100644 --- a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/EnablementView.ets +++ b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/EnablementView.ets @@ -10,9 +10,9 @@ export struct EnablementView { } getEnablementDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('EnablementData.json').then(value => { - this.enablementList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('EnablementData.json').then(value => { + this.enablementList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { @@ -54,7 +54,7 @@ struct EnablementItem { Image($r(this.enablementItem.imageSrc)) .width('100%') .objectFit(ImageFit.Cover) - .height(96) + .height(96) .borderRadius({ topLeft: 16, topRight: 16 diff --git a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/TutorialView.ets b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/TutorialView.ets index 2222e77e0a2862e7114d8f38d48acd0728a284fd..309e8511be39ccec00c2f72626db321d004d3492 100644 --- a/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/TutorialView.ets +++ b/05_MVVMPatternDesign/05_Complete/entry/src/main/ets/view/TutorialView.ets @@ -10,9 +10,9 @@ export struct TutorialView { } getTutorialDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('TutorialData.json').then(value => { - this.tutorialList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('TutorialData.json').then(value => { + this.tutorialList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/05_MVVMPatternDesign/05_Complete/oh-package.json5 b/05_MVVMPatternDesign/05_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/05_MVVMPatternDesign/05_Complete/oh-package.json5 +++ b/05_MVVMPatternDesign/05_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/05_MVVMPatternDesign/05_StartPoint/entry/src/main/ets/pages/Index.ets b/05_MVVMPatternDesign/05_StartPoint/entry/src/main/ets/pages/Index.ets index f7a58d799586f94a9ced0dd876642863ce0129ff..9321cfd55652bfd29070d7c5af070c8c9e6f254f 100644 --- a/05_MVVMPatternDesign/05_StartPoint/entry/src/main/ets/pages/Index.ets +++ b/05_MVVMPatternDesign/05_StartPoint/entry/src/main/ets/pages/Index.ets @@ -58,7 +58,6 @@ struct Index { } } -@Preview @Component struct Banner { @State bannerList: Array = [ @@ -95,7 +94,6 @@ struct Banner { } } -@Preview @Component struct TutorialItem { @Prop tutorialItem: ArticleClass; @@ -143,7 +141,6 @@ struct TutorialItem { } } -@Preview @Component struct EnablementItem { @Prop enablementItem: ArticleClass; diff --git a/05_MVVMPatternDesign/05_StartPoint/oh-package.json5 b/05_MVVMPatternDesign/05_StartPoint/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/05_MVVMPatternDesign/05_StartPoint/oh-package.json5 +++ b/05_MVVMPatternDesign/05_StartPoint/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/06_LayerArchitectureDesign/QS06_Complete/build-profile.json5 b/06_LayerArchitectureDesign/QS06_Complete/build-profile.json5 index 353e68e261cbbca99a493e2c585e3c6c36c4f0e5..8805cc5cd368d636619c0f85d19ab42e766c9c68 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/build-profile.json5 +++ b/06_LayerArchitectureDesign/QS06_Complete/build-profile.json5 @@ -1,6 +1,8 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + + ], "products": [ { "name": "default", diff --git a/06_LayerArchitectureDesign/QS06_Complete/commons/uicomponents/BuildProfile.ets b/06_LayerArchitectureDesign/QS06_Complete/commons/uicomponents/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/commons/uicomponents/BuildProfile.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/commons/uicomponents/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/06_LayerArchitectureDesign/QS06_Complete/commons/utils/BuildProfile.ets b/06_LayerArchitectureDesign/QS06_Complete/commons/utils/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/commons/utils/BuildProfile.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/commons/utils/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/learning/BuildProfile.ets b/06_LayerArchitectureDesign/QS06_Complete/features/learning/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/learning/BuildProfile.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/learning/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/learning/oh-package.json5 b/06_LayerArchitectureDesign/QS06_Complete/features/learning/oh-package.json5 index d983b9a33765d22b0402dd2164362857f994accb..c0c6d3c0cfb0177f407631e09fbbd78ed4afd991 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/learning/oh-package.json5 +++ b/06_LayerArchitectureDesign/QS06_Complete/features/learning/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/map/BuildProfile.ets b/06_LayerArchitectureDesign/QS06_Complete/features/map/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/map/BuildProfile.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/map/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/map/oh-package.json5 b/06_LayerArchitectureDesign/QS06_Complete/features/map/oh-package.json5 index 202f67134dd8ed53296b9128282e922c9b8c95b3..27bc1482548136ebc4a9fc4a989a4b9c65c6ecc9 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/map/oh-package.json5 +++ b/06_LayerArchitectureDesign/QS06_Complete/features/map/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/BuildProfile.ets b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/BuildProfile.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/oh-package.json5 b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/oh-package.json5 index fcb51f0808b46171f97f00ab30ac903309bf454b..c5f8e5cafb7ab9e74cfc04d6261e87386bd5d66e 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/oh-package.json5 +++ b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets index 3e1137870526d0460b5ec51c48f4cf6fd2cf18eb..27994473e50bed694c73ba745d3b44f7d818bdc3 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets @@ -1,11 +1,9 @@ import { util } from '@kit.ArkTS'; -export function bufferToString(buffer: ArrayBufferLike): string { +export function bufferToString(buffer: Uint8Array): string { let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM: true }); - let resultPut = textDecoder.decodeWithStream(new Uint8Array(buffer), { - stream: true - }); + let resultPut = textDecoder.decodeToString(buffer); return resultPut; } \ No newline at end of file diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/Banner.ets b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/Banner.ets index f1f455b3abf15735b2ddb62ebb402c59e38b4ff3..d8c83be2ed059a90993b64414091335df21cbdef 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/Banner.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/Banner.ets @@ -10,9 +10,9 @@ export struct Banner { } getBannerDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('BannerData.json').then(value => { - this.bannerList = JSON.parse(bufferToString(value.buffer)) as BannerClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('BannerData.json').then(value => { + this.bannerList = JSON.parse(bufferToString(value)) as BannerClass[]; + }); } build() { diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/EnablementView.ets b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/EnablementView.ets index 332382cb8e32bcd0e0be300865713ef750095432..18a12fb64bc3aa53cb1a2900df7a9d9f120df3a4 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/EnablementView.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/EnablementView.ets @@ -10,9 +10,9 @@ export struct EnablementView { } getEnablementDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('EnablementData.json').then(value => { - this.enablementList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('EnablementData.json').then(value => { + this.enablementList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/TutorialView.ets b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/TutorialView.ets index d0837c451bc10d735688d61a0d93d182f75073e5..00f51019b51f2ad8beb56c13a28dde9661e11cbb 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/TutorialView.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/features/quickstart/src/main/ets/view/TutorialView.ets @@ -10,9 +10,9 @@ export struct TutorialView { } getTutorialDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('TutorialData.json').then(value => { - this.tutorialList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('TutorialData.json').then(value => { + this.tutorialList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/06_LayerArchitectureDesign/QS06_Complete/oh-package.json5 b/06_LayerArchitectureDesign/QS06_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/oh-package.json5 +++ b/06_LayerArchitectureDesign/QS06_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/06_LayerArchitectureDesign/QS06_Complete/products/default/oh-package.json5 b/06_LayerArchitectureDesign/QS06_Complete/products/default/oh-package.json5 index efc4a7dd43fb15389b91eda3a8ba17514ce3431c..43b877711a4a425dbaacd02afd45c9e2f9682bd7 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/products/default/oh-package.json5 +++ b/06_LayerArchitectureDesign/QS06_Complete/products/default/oh-package.json5 @@ -6,8 +6,8 @@ "author": "", "license": "", "dependencies": { - "@ohos/learning": "file:../../features/learning", - "@ohos/map": "file:../../features/map", - "@ohos/quickstart": "file:../../features/quickstart" + "learning": "file:../../features/learning", + "map": "file:../../features/map", + "quickstart": "file:../../features/quickstart" } } \ No newline at end of file diff --git a/06_LayerArchitectureDesign/QS06_Complete/products/default/src/main/ets/pages/Index.ets b/06_LayerArchitectureDesign/QS06_Complete/products/default/src/main/ets/pages/Index.ets index 7996aad9fce58a4f4a18413a7af9c70aa4fe38b7..934c11fcb5c5b6ac663d0697f45dde939ecf5568 100644 --- a/06_LayerArchitectureDesign/QS06_Complete/products/default/src/main/ets/pages/Index.ets +++ b/06_LayerArchitectureDesign/QS06_Complete/products/default/src/main/ets/pages/Index.ets @@ -1,4 +1,4 @@ -import { QuickStartPage } from '@ohos/quickstart'; +import { QuickStartPage } from 'quickstart'; @Entry @Component diff --git a/06_LayerArchitectureDesign/QS06_StartPoint/build-profile.json5 b/06_LayerArchitectureDesign/QS06_StartPoint/build-profile.json5 index 7ae3f2a4be402c2d3bb413e572ca16ae6271b2a2..7ce8a7df9f129fbb020a298cd22d0b3b91b5e8c8 100644 --- a/06_LayerArchitectureDesign/QS06_StartPoint/build-profile.json5 +++ b/06_LayerArchitectureDesign/QS06_StartPoint/build-profile.json5 @@ -1,7 +1,7 @@ { "app": { "signingConfigs": [ - + ], "products": [ { diff --git a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/util/BufferUtil.ets b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/util/BufferUtil.ets index 3e1137870526d0460b5ec51c48f4cf6fd2cf18eb..27994473e50bed694c73ba745d3b44f7d818bdc3 100644 --- a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/util/BufferUtil.ets +++ b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/util/BufferUtil.ets @@ -1,11 +1,9 @@ import { util } from '@kit.ArkTS'; -export function bufferToString(buffer: ArrayBufferLike): string { +export function bufferToString(buffer: Uint8Array): string { let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM: true }); - let resultPut = textDecoder.decodeWithStream(new Uint8Array(buffer), { - stream: true - }); + let resultPut = textDecoder.decodeToString(buffer); return resultPut; } \ No newline at end of file diff --git a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/Banner.ets b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/Banner.ets index 1858232fbd0da53eec2bc3065f8bd882ee99e771..d274e2f37464fe77f7c79315c939b3d4e885cd1c 100644 --- a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/Banner.ets +++ b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/Banner.ets @@ -10,9 +10,9 @@ export struct Banner { } getBannerDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('BannerData.json').then(value => { - this.bannerList = JSON.parse(bufferToString(value.buffer)) as BannerClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('BannerData.json').then(value => { + this.bannerList = JSON.parse(bufferToString(value)) as BannerClass[]; + }); } build() { diff --git a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/EnablementView.ets b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/EnablementView.ets index 2c5fd0efb4660e11597cff0719fe6d64b6603334..38249da03467910f10390989b5f4bed91ca733a0 100644 --- a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/EnablementView.ets +++ b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/EnablementView.ets @@ -10,9 +10,9 @@ export struct EnablementView { } getEnablementDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('EnablementData.json').then(value => { - this.enablementList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('EnablementData.json').then(value => { + this.enablementList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { @@ -54,7 +54,7 @@ struct EnablementItem { Image($r(this.enablementItem.imageSrc)) .width('100%') .objectFit(ImageFit.Cover) - .height(96) + .height(96) .borderRadius({ topLeft: 16, topRight: 16 diff --git a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/TutorialView.ets b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/TutorialView.ets index 2222e77e0a2862e7114d8f38d48acd0728a284fd..309e8511be39ccec00c2f72626db321d004d3492 100644 --- a/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/TutorialView.ets +++ b/06_LayerArchitectureDesign/QS06_StartPoint/entry/src/main/ets/view/TutorialView.ets @@ -10,9 +10,9 @@ export struct TutorialView { } getTutorialDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('TutorialData.json').then(value => { - this.tutorialList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('TutorialData.json').then(value => { + this.tutorialList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/06_LayerArchitectureDesign/QS06_StartPoint/oh-package.json5 b/06_LayerArchitectureDesign/QS06_StartPoint/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/06_LayerArchitectureDesign/QS06_StartPoint/oh-package.json5 +++ b/06_LayerArchitectureDesign/QS06_StartPoint/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/07_ArkWebPageAdaptation/07_Complete/build-profile.json5 b/07_ArkWebPageAdaptation/07_Complete/build-profile.json5 index 353e68e261cbbca99a493e2c585e3c6c36c4f0e5..d6785855f726be14bb51a5729b370e494cf9556f 100644 --- a/07_ArkWebPageAdaptation/07_Complete/build-profile.json5 +++ b/07_ArkWebPageAdaptation/07_Complete/build-profile.json5 @@ -1,6 +1,8 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + + ], "products": [ { "name": "default", diff --git a/07_ArkWebPageAdaptation/07_Complete/commons/uicomponents/BuildProfile.ets b/07_ArkWebPageAdaptation/07_Complete/commons/uicomponents/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_Complete/commons/uicomponents/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_Complete/commons/uicomponents/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_Complete/commons/utils/BuildProfile.ets b/07_ArkWebPageAdaptation/07_Complete/commons/utils/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_Complete/commons/utils/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_Complete/commons/utils/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_Complete/features/learning/BuildProfile.ets b/07_ArkWebPageAdaptation/07_Complete/features/learning/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/learning/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/learning/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_Complete/features/learning/oh-package.json5 b/07_ArkWebPageAdaptation/07_Complete/features/learning/oh-package.json5 index d983b9a33765d22b0402dd2164362857f994accb..c0c6d3c0cfb0177f407631e09fbbd78ed4afd991 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/learning/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_Complete/features/learning/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/07_ArkWebPageAdaptation/07_Complete/features/map/BuildProfile.ets b/07_ArkWebPageAdaptation/07_Complete/features/map/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/map/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/map/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_Complete/features/map/oh-package.json5 b/07_ArkWebPageAdaptation/07_Complete/features/map/oh-package.json5 index 202f67134dd8ed53296b9128282e922c9b8c95b3..27bc1482548136ebc4a9fc4a989a4b9c65c6ecc9 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/map/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_Complete/features/map/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/BuildProfile.ets b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/oh-package.json5 b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/oh-package.json5 index fcb51f0808b46171f97f00ab30ac903309bf454b..c5f8e5cafb7ab9e74cfc04d6261e87386bd5d66e 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets index 3e1137870526d0460b5ec51c48f4cf6fd2cf18eb..27994473e50bed694c73ba745d3b44f7d818bdc3 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets @@ -1,11 +1,9 @@ import { util } from '@kit.ArkTS'; -export function bufferToString(buffer: ArrayBufferLike): string { +export function bufferToString(buffer: Uint8Array): string { let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM: true }); - let resultPut = textDecoder.decodeWithStream(new Uint8Array(buffer), { - stream: true - }); + let resultPut = textDecoder.decodeToString(buffer); return resultPut; } \ No newline at end of file diff --git a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/Banner.ets b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/Banner.ets index 8ac27f92cc5bcf5c4ed946fc05f7cd69751d2f18..5bf7d487330472992ad13afcdbde63a3dea6544a 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/Banner.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/Banner.ets @@ -10,9 +10,9 @@ export struct Banner { } getBannerDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('BannerData.json').then(value => { - this.bannerList = JSON.parse(bufferToString(value.buffer)) as BannerClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('BannerData.json').then(value => { + this.bannerList = JSON.parse(bufferToString(value)) as BannerClass[]; + }); } build() { diff --git a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/EnablementView.ets b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/EnablementView.ets index 332382cb8e32bcd0e0be300865713ef750095432..18a12fb64bc3aa53cb1a2900df7a9d9f120df3a4 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/EnablementView.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/EnablementView.ets @@ -10,9 +10,9 @@ export struct EnablementView { } getEnablementDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('EnablementData.json').then(value => { - this.enablementList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('EnablementData.json').then(value => { + this.enablementList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/TutorialView.ets b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/TutorialView.ets index d0837c451bc10d735688d61a0d93d182f75073e5..00f51019b51f2ad8beb56c13a28dde9661e11cbb 100644 --- a/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/TutorialView.ets +++ b/07_ArkWebPageAdaptation/07_Complete/features/quickstart/src/main/ets/view/TutorialView.ets @@ -10,9 +10,9 @@ export struct TutorialView { } getTutorialDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('TutorialData.json').then(value => { - this.tutorialList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('TutorialData.json').then(value => { + this.tutorialList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/07_ArkWebPageAdaptation/07_Complete/oh-package.json5 b/07_ArkWebPageAdaptation/07_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/07_ArkWebPageAdaptation/07_Complete/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/07_ArkWebPageAdaptation/07_Complete/products/default/oh-package.json5 b/07_ArkWebPageAdaptation/07_Complete/products/default/oh-package.json5 index efc4a7dd43fb15389b91eda3a8ba17514ce3431c..43b877711a4a425dbaacd02afd45c9e2f9682bd7 100644 --- a/07_ArkWebPageAdaptation/07_Complete/products/default/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_Complete/products/default/oh-package.json5 @@ -6,8 +6,8 @@ "author": "", "license": "", "dependencies": { - "@ohos/learning": "file:../../features/learning", - "@ohos/map": "file:../../features/map", - "@ohos/quickstart": "file:../../features/quickstart" + "learning": "file:../../features/learning", + "map": "file:../../features/map", + "quickstart": "file:../../features/quickstart" } } \ No newline at end of file diff --git a/07_ArkWebPageAdaptation/07_Complete/products/default/src/main/ets/pages/Index.ets b/07_ArkWebPageAdaptation/07_Complete/products/default/src/main/ets/pages/Index.ets index e0ef23844d01025fb35b2a648340d2e0aa254c34..eb382a6192cc8b1ea9fd7151cbd30d69760a13a5 100644 --- a/07_ArkWebPageAdaptation/07_Complete/products/default/src/main/ets/pages/Index.ets +++ b/07_ArkWebPageAdaptation/07_Complete/products/default/src/main/ets/pages/Index.ets @@ -1,5 +1,5 @@ // import { QuickStartPage } from '@ohos/quickstart/'; -import { CourseLearning } from '@ohos/learning'; +import { CourseLearning } from 'learning'; @Entry diff --git a/07_ArkWebPageAdaptation/07_StartPoint/build-profile.json5 b/07_ArkWebPageAdaptation/07_StartPoint/build-profile.json5 index 353e68e261cbbca99a493e2c585e3c6c36c4f0e5..8805cc5cd368d636619c0f85d19ab42e766c9c68 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/build-profile.json5 +++ b/07_ArkWebPageAdaptation/07_StartPoint/build-profile.json5 @@ -1,6 +1,8 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + + ], "products": [ { "name": "default", diff --git a/07_ArkWebPageAdaptation/07_StartPoint/commons/uicomponents/BuildProfile.ets b/07_ArkWebPageAdaptation/07_StartPoint/commons/uicomponents/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/commons/uicomponents/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/commons/uicomponents/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_StartPoint/commons/utils/BuildProfile.ets b/07_ArkWebPageAdaptation/07_StartPoint/commons/utils/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/commons/utils/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/commons/utils/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/learning/BuildProfile.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/learning/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/learning/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/learning/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/learning/oh-package.json5 b/07_ArkWebPageAdaptation/07_StartPoint/features/learning/oh-package.json5 index d983b9a33765d22b0402dd2164362857f994accb..c0c6d3c0cfb0177f407631e09fbbd78ed4afd991 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/learning/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/learning/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/map/BuildProfile.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/map/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/map/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/map/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/map/oh-package.json5 b/07_ArkWebPageAdaptation/07_StartPoint/features/map/oh-package.json5 index 202f67134dd8ed53296b9128282e922c9b8c95b3..27bc1482548136ebc4a9fc4a989a4b9c65c6ecc9 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/map/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/map/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/BuildProfile.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/BuildProfile.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/oh-package.json5 b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/oh-package.json5 index fcb51f0808b46171f97f00ab30ac903309bf454b..c5f8e5cafb7ab9e74cfc04d6261e87386bd5d66e 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/util/BufferUtil.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/util/BufferUtil.ets index 3e1137870526d0460b5ec51c48f4cf6fd2cf18eb..27994473e50bed694c73ba745d3b44f7d818bdc3 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/util/BufferUtil.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/util/BufferUtil.ets @@ -1,11 +1,9 @@ import { util } from '@kit.ArkTS'; -export function bufferToString(buffer: ArrayBufferLike): string { +export function bufferToString(buffer: Uint8Array): string { let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM: true }); - let resultPut = textDecoder.decodeWithStream(new Uint8Array(buffer), { - stream: true - }); + let resultPut = textDecoder.decodeToString(buffer); return resultPut; } \ No newline at end of file diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/Banner.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/Banner.ets index f1f455b3abf15735b2ddb62ebb402c59e38b4ff3..d8c83be2ed059a90993b64414091335df21cbdef 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/Banner.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/Banner.ets @@ -10,9 +10,9 @@ export struct Banner { } getBannerDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('BannerData.json').then(value => { - this.bannerList = JSON.parse(bufferToString(value.buffer)) as BannerClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('BannerData.json').then(value => { + this.bannerList = JSON.parse(bufferToString(value)) as BannerClass[]; + }); } build() { diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/EnablementView.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/EnablementView.ets index 332382cb8e32bcd0e0be300865713ef750095432..18a12fb64bc3aa53cb1a2900df7a9d9f120df3a4 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/EnablementView.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/EnablementView.ets @@ -10,9 +10,9 @@ export struct EnablementView { } getEnablementDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('EnablementData.json').then(value => { - this.enablementList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('EnablementData.json').then(value => { + this.enablementList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/TutorialView.ets b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/TutorialView.ets index d0837c451bc10d735688d61a0d93d182f75073e5..00f51019b51f2ad8beb56c13a28dde9661e11cbb 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/TutorialView.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/features/quickstart/src/main/ets/view/TutorialView.ets @@ -10,9 +10,9 @@ export struct TutorialView { } getTutorialDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('TutorialData.json').then(value => { - this.tutorialList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('TutorialData.json').then(value => { + this.tutorialList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/07_ArkWebPageAdaptation/07_StartPoint/oh-package.json5 b/07_ArkWebPageAdaptation/07_StartPoint/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_StartPoint/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/07_ArkWebPageAdaptation/07_StartPoint/products/default/oh-package.json5 b/07_ArkWebPageAdaptation/07_StartPoint/products/default/oh-package.json5 index efc4a7dd43fb15389b91eda3a8ba17514ce3431c..43b877711a4a425dbaacd02afd45c9e2f9682bd7 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/products/default/oh-package.json5 +++ b/07_ArkWebPageAdaptation/07_StartPoint/products/default/oh-package.json5 @@ -6,8 +6,8 @@ "author": "", "license": "", "dependencies": { - "@ohos/learning": "file:../../features/learning", - "@ohos/map": "file:../../features/map", - "@ohos/quickstart": "file:../../features/quickstart" + "learning": "file:../../features/learning", + "map": "file:../../features/map", + "quickstart": "file:../../features/quickstart" } } \ No newline at end of file diff --git a/07_ArkWebPageAdaptation/07_StartPoint/products/default/src/main/ets/pages/Index.ets b/07_ArkWebPageAdaptation/07_StartPoint/products/default/src/main/ets/pages/Index.ets index 7996aad9fce58a4f4a18413a7af9c70aa4fe38b7..934c11fcb5c5b6ac663d0697f45dde939ecf5568 100644 --- a/07_ArkWebPageAdaptation/07_StartPoint/products/default/src/main/ets/pages/Index.ets +++ b/07_ArkWebPageAdaptation/07_StartPoint/products/default/src/main/ets/pages/Index.ets @@ -1,4 +1,4 @@ -import { QuickStartPage } from '@ohos/quickstart'; +import { QuickStartPage } from 'quickstart'; @Entry @Component diff --git a/08_DataDrivenUIUpdates/08_Complete/build-profile.json5 b/08_DataDrivenUIUpdates/08_Complete/build-profile.json5 index 353e68e261cbbca99a493e2c585e3c6c36c4f0e5..7434180024c30c88a847e8e0a3d2d29c4604942c 100644 --- a/08_DataDrivenUIUpdates/08_Complete/build-profile.json5 +++ b/08_DataDrivenUIUpdates/08_Complete/build-profile.json5 @@ -1,6 +1,8 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + + ], "products": [ { "name": "default", diff --git a/08_DataDrivenUIUpdates/08_Complete/commons/uicomponents/BuildProfile.ets b/08_DataDrivenUIUpdates/08_Complete/commons/uicomponents/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_Complete/commons/uicomponents/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_Complete/commons/uicomponents/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_Complete/commons/utils/BuildProfile.ets b/08_DataDrivenUIUpdates/08_Complete/commons/utils/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_Complete/commons/utils/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_Complete/commons/utils/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_Complete/features/learning/BuildProfile.ets b/08_DataDrivenUIUpdates/08_Complete/features/learning/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/learning/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/learning/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_Complete/features/learning/oh-package.json5 b/08_DataDrivenUIUpdates/08_Complete/features/learning/oh-package.json5 index d983b9a33765d22b0402dd2164362857f994accb..c0c6d3c0cfb0177f407631e09fbbd78ed4afd991 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/learning/oh-package.json5 +++ b/08_DataDrivenUIUpdates/08_Complete/features/learning/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/08_DataDrivenUIUpdates/08_Complete/features/map/BuildProfile.ets b/08_DataDrivenUIUpdates/08_Complete/features/map/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/map/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/map/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_Complete/features/map/oh-package.json5 b/08_DataDrivenUIUpdates/08_Complete/features/map/oh-package.json5 index 202f67134dd8ed53296b9128282e922c9b8c95b3..27bc1482548136ebc4a9fc4a989a4b9c65c6ecc9 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/map/oh-package.json5 +++ b/08_DataDrivenUIUpdates/08_Complete/features/map/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/08_DataDrivenUIUpdates/08_Complete/features/map/src/main/ets/pages/KnowledgeMap.ets b/08_DataDrivenUIUpdates/08_Complete/features/map/src/main/ets/pages/KnowledgeMap.ets index 4826fa21fa02a64b9b1fd78b6d820d2e4d254483..218b6a02127763655cddf53e297d97d0460303fe 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/map/src/main/ets/pages/KnowledgeMap.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/map/src/main/ets/pages/KnowledgeMap.ets @@ -18,11 +18,12 @@ export struct KnowledgeMap { private getSections() { try { - getContext(this).resourceManager.getRawFileContent("MapData.json", (error: BusinessError, value: Uint8Array) => { - const textDecoder = util.TextDecoder.create("utf-8"); - const res = textDecoder.decodeWithStream(value, { stream: false }); - this.sections = JSON.parse(res); - }); + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent("MapData.json", + (error: BusinessError, value: Uint8Array) => { + const textDecoder = util.TextDecoder.create("utf-8"); + const res = textDecoder.decodeToString(value, { stream: false }); + this.sections = JSON.parse(res); + }); } catch (error) { console.error(`callback getRawFileContent failed, error is ${JSON.stringify(error)}`) } diff --git a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/BuildProfile.ets b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/oh-package.json5 b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/oh-package.json5 index fcb51f0808b46171f97f00ab30ac903309bf454b..c5f8e5cafb7ab9e74cfc04d6261e87386bd5d66e 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/oh-package.json5 +++ b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets index 3e1137870526d0460b5ec51c48f4cf6fd2cf18eb..27994473e50bed694c73ba745d3b44f7d818bdc3 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/util/BufferUtil.ets @@ -1,11 +1,9 @@ import { util } from '@kit.ArkTS'; -export function bufferToString(buffer: ArrayBufferLike): string { +export function bufferToString(buffer: Uint8Array): string { let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM: true }); - let resultPut = textDecoder.decodeWithStream(new Uint8Array(buffer), { - stream: true - }); + let resultPut = textDecoder.decodeToString(buffer); return resultPut; } \ No newline at end of file diff --git a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/Banner.ets b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/Banner.ets index 8ac27f92cc5bcf5c4ed946fc05f7cd69751d2f18..5bf7d487330472992ad13afcdbde63a3dea6544a 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/Banner.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/Banner.ets @@ -10,9 +10,9 @@ export struct Banner { } getBannerDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('BannerData.json').then(value => { - this.bannerList = JSON.parse(bufferToString(value.buffer)) as BannerClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('BannerData.json').then(value => { + this.bannerList = JSON.parse(bufferToString(value)) as BannerClass[]; + }); } build() { diff --git a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/EnablementView.ets b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/EnablementView.ets index dd7eff7d9c6ff0ee2a7c9256b34c6d4c64f36773..cc68118369850b153d5f136260bfaab78e167a15 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/EnablementView.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/EnablementView.ets @@ -10,9 +10,9 @@ export struct EnablementView { } getEnablementDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('EnablementData.json').then(value => { - this.enablementList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('EnablementData.json').then(value => { + this.enablementList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/TutorialView.ets b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/TutorialView.ets index d0837c451bc10d735688d61a0d93d182f75073e5..00f51019b51f2ad8beb56c13a28dde9661e11cbb 100644 --- a/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/TutorialView.ets +++ b/08_DataDrivenUIUpdates/08_Complete/features/quickstart/src/main/ets/view/TutorialView.ets @@ -10,9 +10,9 @@ export struct TutorialView { } getTutorialDataFromJSON() { - getContext(this).resourceManager.getRawFileContent('TutorialData.json').then(value => { - this.tutorialList = JSON.parse(bufferToString(value.buffer)) as ArticleClass[]; - }) + this.getUIContext().getHostContext()?.resourceManager.getRawFileContent('TutorialData.json').then(value => { + this.tutorialList = JSON.parse(bufferToString(value)) as ArticleClass[]; + }); } build() { diff --git a/08_DataDrivenUIUpdates/08_Complete/oh-package.json5 b/08_DataDrivenUIUpdates/08_Complete/oh-package.json5 index ebdda7e54d1c41e952f1c7f6993c6d15ea3d146d..f99751777f966ebe9cc4bf631221ec9e232d6c24 100644 --- a/08_DataDrivenUIUpdates/08_Complete/oh-package.json5 +++ b/08_DataDrivenUIUpdates/08_Complete/oh-package.json5 @@ -4,7 +4,6 @@ "dependencies": { }, "devDependencies": { - "@ohos/hypium": "1.0.18", - "@ohos/hamock": "1.0.0" + } } diff --git a/08_DataDrivenUIUpdates/08_Complete/products/default/oh-package.json5 b/08_DataDrivenUIUpdates/08_Complete/products/default/oh-package.json5 index 6ecfca8f20f57a1ab9f1055aa49f6ac6dc7c1165..a90a640fceb1b011efe28dacba6c5cc7cf1f333e 100644 --- a/08_DataDrivenUIUpdates/08_Complete/products/default/oh-package.json5 +++ b/08_DataDrivenUIUpdates/08_Complete/products/default/oh-package.json5 @@ -6,10 +6,10 @@ "author": "", "license": "", "dependencies": { - "@ohos/learning": "file:../../features/learning", - "@ohos/quickstart": "file:../../features/quickstart", - "@ohos/map": "file:../../features/map", - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "learning": "file:../../features/learning", + "quickstart": "file:../../features/quickstart", + "map": "file:../../features/map", + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } \ No newline at end of file diff --git a/08_DataDrivenUIUpdates/08_Complete/products/default/src/main/ets/pages/Index.ets b/08_DataDrivenUIUpdates/08_Complete/products/default/src/main/ets/pages/Index.ets index 7adf539a965a9c9b62abd21101a98d649506ae09..4aace4a3ee188e0347f1fbead388d08685fa0a35 100644 --- a/08_DataDrivenUIUpdates/08_Complete/products/default/src/main/ets/pages/Index.ets +++ b/08_DataDrivenUIUpdates/08_Complete/products/default/src/main/ets/pages/Index.ets @@ -1,5 +1,5 @@ -// import { CourseLearning } from '@ohos/learning'; -import { KnowledgeMap } from '@ohos/map'; +// import { CourseLearning } from 'learning'; +import { KnowledgeMap } from 'map'; @Entry @Component diff --git a/08_DataDrivenUIUpdates/08_StartPoint/build-profile.json5 b/08_DataDrivenUIUpdates/08_StartPoint/build-profile.json5 index 353e68e261cbbca99a493e2c585e3c6c36c4f0e5..d6785855f726be14bb51a5729b370e494cf9556f 100644 --- a/08_DataDrivenUIUpdates/08_StartPoint/build-profile.json5 +++ b/08_DataDrivenUIUpdates/08_StartPoint/build-profile.json5 @@ -1,6 +1,8 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + + ], "products": [ { "name": "default", diff --git a/08_DataDrivenUIUpdates/08_StartPoint/commons/uicomponents/BuildProfile.ets b/08_DataDrivenUIUpdates/08_StartPoint/commons/uicomponents/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_StartPoint/commons/uicomponents/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_StartPoint/commons/uicomponents/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_StartPoint/commons/utils/BuildProfile.ets b/08_DataDrivenUIUpdates/08_StartPoint/commons/utils/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_StartPoint/commons/utils/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_StartPoint/commons/utils/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_StartPoint/features/learning/BuildProfile.ets b/08_DataDrivenUIUpdates/08_StartPoint/features/learning/BuildProfile.ets index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..6033e79a01b85a7b72e746eb3c8eba704e312bd5 100644 --- a/08_DataDrivenUIUpdates/08_StartPoint/features/learning/BuildProfile.ets +++ b/08_DataDrivenUIUpdates/08_StartPoint/features/learning/BuildProfile.ets @@ -2,8 +2,8 @@ * Use these variables when you tailor your ArkTS code. They must be of the const type. */ export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; +export const BUILD_MODE_NAME = 'release'; +export const DEBUG = false; export const TARGET_NAME = 'default'; /** diff --git a/08_DataDrivenUIUpdates/08_StartPoint/features/learning/oh-package.json5 b/08_DataDrivenUIUpdates/08_StartPoint/features/learning/oh-package.json5 index d983b9a33765d22b0402dd2164362857f994accb..c0c6d3c0cfb0177f407631e09fbbd78ed4afd991 100644 --- a/08_DataDrivenUIUpdates/08_StartPoint/features/learning/oh-package.json5 +++ b/08_DataDrivenUIUpdates/08_StartPoint/features/learning/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@ohos/utils": "file:../../commons/utils", - "@ohos/uicomponents": "file:../../commons/uicomponents" + "utils": "file:../../commons/utils", + "uicomponents": "file:../../commons/uicomponents" } } diff --git a/08_DataDrivenUIUpdates/08_StartPoint/features/learning/src/main/resources/rawfile/course_learning/static/js/main.8604981c.js b/08_DataDrivenUIUpdates/08_StartPoint/features/learning/src/main/resources/rawfile/course_learning/static/js/main.8604981c.js deleted file mode 100644 index 6ca6c4dc531ba48d055c10a6046ae2f70bb554a4..0000000000000000000000000000000000000000 --- a/08_DataDrivenUIUpdates/08_StartPoint/features/learning/src/main/resources/rawfile/course_learning/static/js/main.8604981c.js +++ /dev/null @@ -1,3 +0,0 @@ -/*! For license information please see main.8604981c.js.LICENSE.txt */ -(()=>{var e={132:(e,t)=>{"use strict";var n,r=Symbol.for("react.element"),o=Symbol.for("react.portal"),a=Symbol.for("react.fragment"),i=Symbol.for("react.strict_mode"),l=Symbol.for("react.profiler"),u=Symbol.for("react.provider"),c=Symbol.for("react.context"),s=Symbol.for("react.server_context"),f=Symbol.for("react.forward_ref"),d=Symbol.for("react.suspense"),p=Symbol.for("react.suspense_list"),h=Symbol.for("react.memo"),m=Symbol.for("react.lazy"),v=Symbol.for("react.offscreen");function g(e){if("object"===typeof e&&null!==e){var t=e.$$typeof;switch(t){case r:switch(e=e.type){case a:case l:case i:case d:case p:return e;default:switch(e=e&&e.$$typeof){case s:case c:case f:case m:case h:case u:return e;default:return t}}case o:return t}}}n=Symbol.for("react.module.reference"),t.ForwardRef=f,t.isMemo=function(e){return g(e)===h}},816:(e,t,n)=>{"use strict";e.exports=n(132)},730:(e,t,n)=>{"use strict";var r=n(43),o=n(853);function a(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,n=1;n