diff --git a/CompilingAndBuilding/build-profile_ohmurl.json5 b/CompilingAndBuilding/build-profile_ohmurl.json5 index 1b5e1146a7c132582aff26c3e87bee8ba2dede34..c4fa9a6eec7a3a26326e05e18701557de88a7c36 100644 --- a/CompilingAndBuilding/build-profile_ohmurl.json5 +++ b/CompilingAndBuilding/build-profile_ohmurl.json5 @@ -33,8 +33,8 @@ // [Start build_profile_ohmurl_hsp] "modules": [ { - name: "hsp", // 引用的hsp包依赖 - srcPath: "../MyApplication_stageB/hsp", // 引用的hsp包的路径(绝对和相对都可以) + name: "hsp", // The referenced hsp package dependency + srcPath: "../MyApplication_stageB/hsp", // The path to the hsp package being referenced (both absolute and relative paths are okay) } ], // [End build_profile_ohmurl_hsp] diff --git a/CompilingAndBuilding/entry/src/rollup.config.js b/CompilingAndBuilding/entry/src/rollup.config.js index bc9faa22553327281dc08cb20cca9b2cff14ec49..895f5463b4dd2f9ad8e2dcfd3f6a444ba2692592 100644 --- a/CompilingAndBuilding/entry/src/rollup.config.js +++ b/CompilingAndBuilding/entry/src/rollup.config.js @@ -17,7 +17,7 @@ // [Start plugins] plugins: [ resolve({ - preferBuiltins: false, // true 或 false + preferBuiltins: false, // true or false mainFields: ['module', 'main'], extensions }) diff --git a/CompilingAndBuilding/library/src/main/ets/components/util.js b/CompilingAndBuilding/library/src/main/ets/components/util.js deleted file mode 100644 index 9f73ed2a15daf0d0b7b801f05a1f684462bdbf2b..0000000000000000000000000000000000000000 --- a/CompilingAndBuilding/library/src/main/ets/components/util.js +++ /dev/null @@ -1,7 +0,0 @@ -// 依赖包的实现文件 index.js -function sub(a, b) { - return a - b -} - -var allFunction = { sub } -module.exports = allFuntion \ No newline at end of file diff --git a/CompilingAndBuilding/library3/hvigorfile.ts b/CompilingAndBuilding/library3/hvigorfile.ts index 01e28d9a69a6412cb6628e03e9bdba587b35e0fe..5b7012fdb4149e8cfcbb6fdc787077d181d0c954 100644 --- a/CompilingAndBuilding/library3/hvigorfile.ts +++ b/CompilingAndBuilding/library3/hvigorfile.ts @@ -11,7 +11,7 @@ export function customPluginFunction1(str?: string) { pluginId: 'CustomPluginID1', apply(pluginContext) { pluginContext.registerTask({ - // 编写自定义任务 + // Write a custom task name: 'customTask1', run: (taskContext) => { console.log('run into: '); @@ -22,7 +22,7 @@ export function customPluginFunction1(str?: string) { console.log(err, 'err'); }) }, - // 确认自定义任务插入位置 + // Confirm custom task insertion position dependencies: ['default@BuildJS'], postDependencies: ['default@CompileArkTS'] }) diff --git a/CompilingAndBuilding/library3/hvigorfile_comfig.ts b/CompilingAndBuilding/library3/hvigorfile_comfig.ts index 598b31d43978c77bcd0d7ac487080e8a759a30ce..798f8b7fccd51257b304263ef3abb581ef266a00 100644 --- a/CompilingAndBuilding/library3/hvigorfile_comfig.ts +++ b/CompilingAndBuilding/library3/hvigorfile_comfig.ts @@ -1,16 +1,16 @@ //FAQ:如何快速关闭工程中所有字节码HAR配置 // [Start hvigorfile] -// 工程级hvigorfile.ts文件 +// Engineering-level hvigorfile.ts file import { hvigor, HvigorNode, HvigorPlugin } from '@ohos/hvigor'; import { appTasks, OhosHarContext, OhosPluginId, Target } from '@ohos/hvigor-ohos-plugin'; -// 实现自定义插件 +// Implement custom plugins export function customPlugin(): HvigorPlugin { return { pluginId: 'customPlugin', async apply(currentNode: HvigorNode): Promise { hvigor.afterNodeEvaluate(async () => { - // 注册模块级任务 + // Register module-level tasks harTask(currentNode); }); } @@ -22,22 +22,22 @@ function harTask(currentNode: HvigorNode) { context?.targets((target: Target) => { const targetName = target.getTargetName(); node.registerTask({ - // 任务名称 + // Task name name: `HarTask`, - // 任务执行逻辑主体函数 + // Main function of task execution logic run() { if (context.getBuildProfileOpt) { const buildProfile = context.getBuildProfileOpt(); console.log(buildProfile) - // 设置字节码har配置为false + // Set the bytecode har config to false buildProfile["buildOption"] = { arkOptions: { byteCodeHar: false } }; console.log(buildProfile) context.setBuildProfileOpt(buildProfile); } }, - // 配置前置任务依赖 + // Configure the dependency of the pre-task dependencies: [`${targetName}@PackageHar`], - // 配置任务的后置任务依赖 + // Post-task dependency for configuring tasks postDependencies: ['assembleHar'] }); }); diff --git a/CompilingAndBuilding/library3/src/main/ets/components/index.ets b/CompilingAndBuilding/library3/src/main/ets/components/index.ets index eb1543714ff3bdb329f0409bf5badbe64c9e8099..2d788b765b31b99a2cd37a9c3181d7102a38a415 100644 --- a/CompilingAndBuilding/library3/src/main/ets/components/index.ets +++ b/CompilingAndBuilding/library3/src/main/ets/components/index.ets @@ -18,7 +18,7 @@ */ // [Start import_test] -// index.ets文件 +// index.ets file import test from './test' diff --git a/CompilingAndBuilding/library3/src/main/ets/components/test.d.ts b/CompilingAndBuilding/library3/src/main/ets/components/test.d.ts index 3217f13d494017e3d54606df0b39c92652c305e5..2aeb165dbe96c8ab7115ea0b0ef224c2e31b1e14 100644 --- a/CompilingAndBuilding/library3/src/main/ets/components/test.d.ts +++ b/CompilingAndBuilding/library3/src/main/ets/components/test.d.ts @@ -18,7 +18,7 @@ */ // [Start addFunction] -// test.d.ts文件 +// test.d.ts file export const addFunction: { add: (a: number, b: number) => number } diff --git a/InterfacePreviewKit/entry/oh-package.json5 b/InterfacePreviewKit/entry/oh-package.json5 index 5016391b879f5e3f601213a08fd1844b22fc9b53..a854f7f2af82d00ab9e34e71a1e9012c8f89ba85 100644 --- a/InterfacePreviewKit/entry/oh-package.json5 +++ b/InterfacePreviewKit/entry/oh-package.json5 @@ -5,6 +5,8 @@ "main": "", "author": "", "license": "", + + // FAQ:预览告警“There are properties not initialized” // [Start add_hamock_dependecy] "dependencies": { // The version number needs to be modified according to the relationship between hvigor and the SDK diff --git a/InterfacePreviewKit/oh-package-lock.json5 b/InterfacePreviewKit/oh-package-lock.json5 index 7fcf818273347b97063c0c0a151bb14770ca1c79..0d2d482efa90cdee85cec4a5390cb4d255de8e06 100644 --- a/InterfacePreviewKit/oh-package-lock.json5 +++ b/InterfacePreviewKit/oh-package-lock.json5 @@ -13,7 +13,7 @@ "name": "@ohos/hamock", "version": "1.0.0", "integrity": "sha512-K6lDPYc6VkKe6ZBNQa9aoG+ZZMiwqfcR/7yAVFSUGIuOAhPvCJAo9+t1fZnpe0dBRBPxj2bxPPbKh69VuyAtDg==", - "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hamock/-/hamock-1.0.0.har", + "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hamock/-/hamock-1.0.0.har", "registryType": "ohpm" }, "@ohos/hypium@1.0.21": { diff --git a/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/CMakeLists1.txt b/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/CMakeLists1.txt index 4ecb899cc1d7231fcdb1d0af951e9c07db80324d..50b2c5cab302426dc755de7f6ce3ff6edad68129 100644 --- a/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/CMakeLists1.txt +++ b/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/CMakeLists1.txt @@ -1,5 +1,5 @@ # FAQ: CPP编译报错"A 'undefined symbol' error has occurred -# [Start cmake_minimum_required] +# [Start cmake_minimum_requiredNew] cmake_minimum_required(VERSION 3.10) project(MyProject) set(CMAKE_CXX_STANDARD 17) @@ -10,7 +10,7 @@ include_directories(${PATH_TO_EXTERNAL_LIBRARY} add_library(myProgram SAHRED main.cpp myLibrary.cpp) # Link to third-party libraries target_link_libraries(myProgram PUBLIC /path/to/external/library) -# [End cmake_minimum_required] +# [End cmake_minimum_requiredNew] # [Start CMAKE_VERBOSE_MAKEFILE] set(CMAKE_VERBOSE_MAKEFILE ON) diff --git a/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/myLibrary.cpp b/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/myLibrary.cpp index aade91065f4de75f4df2b2bb01a11330dc2b2f69..d5bd0603062e659c26fbbdd33f9b5f4f6d2cec46 100644 --- a/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/myLibrary.cpp +++ b/Ndk/Ndk2/UndefinedSymbol/src/main/cpp/myLibrary.cpp @@ -1,7 +1,7 @@ // FAQ: CPP编译报错"A 'undefined symbol' error has occurred -// [Start cmake_minimum_required] +// [Start cmake_minimum_required_lb] #include "myLibrary.h" void myFunction() { // Function implementation } -// [End cmake_minimum_required] \ No newline at end of file +// [End cmake_minimum_required_lb] \ No newline at end of file diff --git a/Ndk/Ndk2/UnknownType/src/main/cpp/mian.cpp b/Ndk/Ndk2/UnknownType/src/main/cpp/mian.cpp index d9249bd1fc00ec476871a1b5ce164aecd0966690..78e4a5afe9d1875eb5c290f56ebb90f019cabefd 100644 --- a/Ndk/Ndk2/UnknownType/src/main/cpp/mian.cpp +++ b/Ndk/Ndk2/UnknownType/src/main/cpp/mian.cpp @@ -3,7 +3,7 @@ #include "myLibrary.h" int main() { MyType obj; - // 使用自定义类型 + // Use custom types return 0; } // [End MyType] \ No newline at end of file diff --git a/ParameterTest/oh-package.json5 b/ParameterTest/oh-package.json5 index fa8fe5df602e4888cddbb520a440c01ffa6dbac7..16139abb564210853ed4950c406021faef3a25cf 100644 --- a/ParameterTest/oh-package.json5 +++ b/ParameterTest/oh-package.json5 @@ -1,3 +1,4 @@ +// FAQ:如何配置oh-package.json5动态依赖 // [Start parameterJson5] { "name": "parameter-test",