From c23d9bb31f0f10900a1eb5aa104bf6e3ca96f923 Mon Sep 17 00:00:00 2001 From: zhangbingce Date: Thu, 4 Nov 2021 14:48:47 +0800 Subject: [PATCH] Move JSNativeDemo to native Signed-off-by: zhangbingce --- .../NapiDemo => native/JSNativeDemo}/README_zh.md | 2 +- .../NapiDemo => native/JSNativeDemo}/build.gradle | 0 .../JSNativeDemo}/entry/build.gradle | 0 .../JSNativeDemo}/entry/src/main/config.json | 8 ++++---- .../JSNativeDemo}/entry/src/main/cpp/CMakeLists.txt | 0 .../entry/src/main/cpp/demo_javascript_class.cpp | 0 .../entry/src/main/cpp/demo_javascript_class.h | 0 .../JSNativeDemo}/entry/src/main/cpp/hello.cpp | 0 .../ohos/samples/jsnativedemo}/MainAbility.java | 2 +- .../ohos/samples/jsnativedemo}/MyApplication.java | 2 +- .../JSNativeDemo}/entry/src/main/js/default/app.js | 0 .../entry/src/main/js/default/i18n/en-US.json | 0 .../entry/src/main/js/default/i18n/zh-CN.json | 0 .../entry/src/main/js/default/pages/index/index.css | 0 .../entry/src/main/js/default/pages/index/index.hml | 0 .../entry/src/main/js/default/pages/index/index.js | 2 +- .../src/main/resources/base/element/string.json | 0 .../entry/src/main/resources/base/media/icon.png | Bin .../screenshots/device/afterNapiCalled.png | Bin .../screenshots/device/beforeNapiCalled.png | Bin .../JSNativeDemo}/settings.gradle | 0 21 files changed, 8 insertions(+), 8 deletions(-) rename {xcomponent/NapiDemo => native/JSNativeDemo}/README_zh.md (92%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/build.gradle (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/build.gradle (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/config.json (79%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/cpp/CMakeLists.txt (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/cpp/demo_javascript_class.cpp (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/cpp/demo_javascript_class.h (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/cpp/hello.cpp (100%) rename {xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo => native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo}/MainAbility.java (84%) rename {xcomponent/NapiDemo/entry/src/main/java/ohos/samples/napidemo => native/JSNativeDemo/entry/src/main/java/ohos/samples/jsnativedemo}/MyApplication.java (80%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/js/default/app.js (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/js/default/i18n/en-US.json (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/js/default/i18n/zh-CN.json (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/js/default/pages/index/index.css (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/js/default/pages/index/index.hml (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/js/default/pages/index/index.js (90%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/resources/base/element/string.json (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/entry/src/main/resources/base/media/icon.png (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/screenshots/device/afterNapiCalled.png (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/screenshots/device/beforeNapiCalled.png (100%) rename {xcomponent/NapiDemo => native/JSNativeDemo}/settings.gradle (100%) 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 57f2ec03..888d3b55 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 463d48c1..763201e2 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 191b26e9..a2928979 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 a0c1c396..4a83e6e9 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 9014941b..0fa7df37 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 -- Gitee