diff --git a/xcomponent/NapiDemo/README_zh.md b/native/JSNativeDemo/README_zh.md similarity index 92% rename from xcomponent/NapiDemo/README_zh.md rename to native/JSNativeDemo/README_zh.md index 57f2ec03c00a64e413ddc5f55738d2d69513ab70..888d3b55e3b855260a6603fdb6a64dee14e2596c 100644 --- a/xcomponent/NapiDemo/README_zh.md +++ b/native/JSNativeDemo/README_zh.md @@ -1,4 +1,4 @@ -# NapiDemo +# JSNativeDemo ## 简介 本示例使用JS和C++开发,使用JS调用C++代码,并在UI上显示C++代码运行结果 diff --git a/xcomponent/NapiDemo/build.gradle b/native/JSNativeDemo/build.gradle similarity index 100% rename from xcomponent/NapiDemo/build.gradle rename to native/JSNativeDemo/build.gradle diff --git a/xcomponent/NapiDemo/entry/build.gradle b/native/JSNativeDemo/entry/build.gradle similarity index 100% rename from xcomponent/NapiDemo/entry/build.gradle rename to native/JSNativeDemo/entry/build.gradle diff --git a/xcomponent/NapiDemo/entry/src/main/config.json b/native/JSNativeDemo/entry/src/main/config.json similarity index 79% rename from xcomponent/NapiDemo/entry/src/main/config.json rename to native/JSNativeDemo/entry/src/main/config.json index 463d48c128c5ccdeb3d4af4dbd5f1ca4ae3f4c08..763201e2f133e9b378c432fb45050376cf7fc0d4 100644 --- a/xcomponent/NapiDemo/entry/src/main/config.json +++ b/native/JSNativeDemo/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "ohos.samples.napidemo", + "bundleName": "ohos.samples.jsnativedemo", "vendor": "samples", "version": { "code": 1000000, @@ -9,9 +9,9 @@ }, "deviceConfig": {}, "module": { - "package": "ohos.samples.napidemo", + "package": "ohos.samples.jsnativedemo", "name": ".MyApplication", - "mainAbility": "ohos.samples.napidemo.MainAbility", + "mainAbility": "ohos.samples.jsnativedemo.MainAbility", "deviceType": [ "phone" ], @@ -34,7 +34,7 @@ } ], "visible": true, - "name": "ohos.samples.napidemo.MainAbility", + "name": "ohos.samples.jsnativedemo.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/xcomponent/NapiDemo/entry/src/main/cpp/CMakeLists.txt b/native/JSNativeDemo/entry/src/main/cpp/CMakeLists.txt similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/cpp/CMakeLists.txt rename to native/JSNativeDemo/entry/src/main/cpp/CMakeLists.txt diff --git a/xcomponent/NapiDemo/entry/src/main/cpp/demo_javascript_class.cpp b/native/JSNativeDemo/entry/src/main/cpp/demo_javascript_class.cpp similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/cpp/demo_javascript_class.cpp rename to native/JSNativeDemo/entry/src/main/cpp/demo_javascript_class.cpp diff --git a/xcomponent/NapiDemo/entry/src/main/cpp/demo_javascript_class.h b/native/JSNativeDemo/entry/src/main/cpp/demo_javascript_class.h similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/cpp/demo_javascript_class.h rename to native/JSNativeDemo/entry/src/main/cpp/demo_javascript_class.h diff --git a/xcomponent/NapiDemo/entry/src/main/cpp/hello.cpp b/native/JSNativeDemo/entry/src/main/cpp/hello.cpp similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/cpp/hello.cpp rename to native/JSNativeDemo/entry/src/main/cpp/hello.cpp diff --git a/xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo/MainAbility.java b/native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo/MainAbility.java similarity index 84% rename from xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo/MainAbility.java rename to native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo/MainAbility.java index 191b26e9d5fbe09dbb1218a9eb7e7dd5d06948a4..a2928979c84148c3a0b6e857aa0ee2bee531b434 100644 --- a/xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo/MainAbility.java +++ b/native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo/MainAbility.java @@ -1,4 +1,4 @@ -package ohos.samples.napidemo; +package ohos.samples.jsnativedemo; import ohos.ace.ability.AceAbility; import ohos.aafwk.content.Intent; diff --git a/xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo/MyApplication.java b/native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo/MyApplication.java similarity index 80% rename from xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo/MyApplication.java rename to native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo/MyApplication.java index a0c1c3964c05f1ec3fa2e9b4335e794accf49d33..4a83e6e9a8135bdaade13c4d4b1b28c15288fd51 100644 --- a/xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo/MyApplication.java +++ b/native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo/MyApplication.java @@ -1,4 +1,4 @@ -package ohos.samples.napidemo; +package ohos.samples.jsnativedemo; import ohos.aafwk.ability.AbilityPackage; diff --git a/xcomponent/NapiDemo/entry/src/main/js/default/app.js b/native/JSNativeDemo/entry/src/main/js/default/app.js similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/js/default/app.js rename to native/JSNativeDemo/entry/src/main/js/default/app.js diff --git a/xcomponent/NapiDemo/entry/src/main/js/default/i18n/en-US.json b/native/JSNativeDemo/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/js/default/i18n/en-US.json rename to native/JSNativeDemo/entry/src/main/js/default/i18n/en-US.json diff --git a/xcomponent/NapiDemo/entry/src/main/js/default/i18n/zh-CN.json b/native/JSNativeDemo/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/js/default/i18n/zh-CN.json rename to native/JSNativeDemo/entry/src/main/js/default/i18n/zh-CN.json diff --git a/xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.css b/native/JSNativeDemo/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.css rename to native/JSNativeDemo/entry/src/main/js/default/pages/index/index.css diff --git a/xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.hml b/native/JSNativeDemo/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.hml rename to native/JSNativeDemo/entry/src/main/js/default/pages/index/index.hml diff --git a/xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.js b/native/JSNativeDemo/entry/src/main/js/default/pages/index/index.js similarity index 90% rename from xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.js rename to native/JSNativeDemo/entry/src/main/js/default/pages/index/index.js index 9014941bf5fad6f552f546d025d381c5e8a3ec5b..0fa7df3701b4e76aab8a71b9aaac1633e7850f20 100644 --- a/xcomponent/NapiDemo/entry/src/main/js/default/pages/index/index.js +++ b/native/JSNativeDemo/entry/src/main/js/default/pages/index/index.js @@ -21,7 +21,7 @@ export default { }, napiTest() { console.info("Ace Kee NapiTest"); - console.info("AceApplication NapiDemoAdd demo.add = " + hello.add(123, 456)); + console.info("AceApplication JSNativeDemo demo.add = " + hello.add(123, 456)); this.napiResult = '123 + 456 = ' + hello.add(123, 456); } } diff --git a/xcomponent/NapiDemo/entry/src/main/resources/base/element/string.json b/native/JSNativeDemo/entry/src/main/resources/base/element/string.json similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/resources/base/element/string.json rename to native/JSNativeDemo/entry/src/main/resources/base/element/string.json diff --git a/xcomponent/NapiDemo/entry/src/main/resources/base/media/icon.png b/native/JSNativeDemo/entry/src/main/resources/base/media/icon.png similarity index 100% rename from xcomponent/NapiDemo/entry/src/main/resources/base/media/icon.png rename to native/JSNativeDemo/entry/src/main/resources/base/media/icon.png diff --git a/xcomponent/NapiDemo/screenshots/device/afterNapiCalled.png b/native/JSNativeDemo/screenshots/device/afterNapiCalled.png similarity index 100% rename from xcomponent/NapiDemo/screenshots/device/afterNapiCalled.png rename to native/JSNativeDemo/screenshots/device/afterNapiCalled.png diff --git a/xcomponent/NapiDemo/screenshots/device/beforeNapiCalled.png b/native/JSNativeDemo/screenshots/device/beforeNapiCalled.png similarity index 100% rename from xcomponent/NapiDemo/screenshots/device/beforeNapiCalled.png rename to native/JSNativeDemo/screenshots/device/beforeNapiCalled.png diff --git a/xcomponent/NapiDemo/settings.gradle b/native/JSNativeDemo/settings.gradle similarity index 100% rename from xcomponent/NapiDemo/settings.gradle rename to native/JSNativeDemo/settings.gradle