调整C++ 代码

hmcalculate/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,19 @@
+# the minimum version of CMake.
+cmake_minimum_required(VERSION 3.4.1)
+project(hmcalculate)
+
+set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(DEFINED PACKAGE_FIND_FILE)
+    include(${PACKAGE_FIND_FILE})
+endif()
+
+include_directories(${NATIVERENDER_ROOT_PATH}
+                    ${NATIVERENDER_ROOT_PATH}/include)
+
+add_library(hmcalculate SHARED
+    napi_init.cpp
+    CalculateInfo.h
+    CalculateAdaptor.cpp)
+
+target_link_libraries(hmcalculate PUBLIC ${NATIVERENDER_ROOT_PATH}/../../../../cppLib/dist/lib/arm64-v8a/libcalculate.so)

hmcalculate/src/main/cpp/Calculate.h

@@ -0,0 +1,25 @@
+#ifndef CPPLIB_LIBRARY_H
+#define CPPLIB_LIBRARY_H
+
+#include <string>
+#include "CalculateInfo.h"
+
+class Calculate {
+public:
+    static Calculate& getInstance();
+    int add(int a, int b);
+    CalculateInfo getInfo();
+
+    // 删除拷贝构造函数和赋值运算符
+    Calculate(const Calculate&) = delete;
+    Calculate& operator=(const Calculate&) = delete;
+
+private:
+    // 构造函数和析构函数私有化
+    Calculate() {}
+    ~Calculate() {}
+};
+#endif //CPPLIB_LIBRARY_H
+
+
+

hmcalculate/src/main/cpp/CalculateAdaptor.cpp

@@ -0,0 +1,64 @@
+//
+// Created on 2024/4/22.
+//
+// Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
+// please include "napi/native_api.h".
+
+#include "CalculateAdaptor.h"
+#include "Calculate.h"
+#include "CalculateInfo.h"
+
+CalculateAdaptor::CalculateAdaptor() { 
+    _calculate = &Calculate::getInstance(); 
+}
+
+CalculateAdaptor::CalculateAdaptor(napi_env env, napi_value thisVar) { 
+    _calculate = &Calculate::getInstance();
+}
+
+CalculateAdaptor::~CalculateAdaptor() {
+    
+}
+
+CalculateAdaptor *util_get_napi_info(napi_env env, napi_callback_info cbinfo, size_t argc, napi_value *argv) 
+{
+    napi_value thisVar = nullptr;
+    void *data = nullptr;
+    napi_get_cb_info(env, cbinfo, &argc, argv, &thisVar, &data);
+    CalculateAdaptor *calculator = nullptr;
+    napi_unwrap(env, thisVar, (void **)&calculator);
+    return calculator;
+}
+
+
+napi_value calculate_add(napi_env env, napi_callback_info info) {
+    size_t argc = 2;
+    napi_value argv[2] = {0};
+    CalculateAdaptor *calculator = util_get_napi_info(env, info, argc, argv);
+
+    int32_t result = 0;
+    napi_status a = napi_ok;
+    a = napi_get_value_int32(env, argv[0], &result);
+
+    napi_status b = napi_ok;
+    b = napi_get_value_int32(env, argv[1], &result);
+    
+    napi_value value;
+    napi_create_int32(env, calculator->_calculate->add(a, b), &value);
+    return value;
+}
+
+napi_value calculate_getInfo(napi_env env, napi_callback_info info) {
+    size_t argc = 0;
+    napi_value argv[1] = {0};
+    CalculateAdaptor *calculator = util_get_napi_info(env, info, argc, argv);
+    
+    CalculateInfo info2;
+    info2.name = calculator->_calculate->getInfo().name;
+    info2.versionCode = calculator->_calculate->getInfo().versionCode;
+    info2.versionName = calculator->_calculate->getInfo().versionName;
+    
+    napi_value value;
+    
+    return value;
+}

hmcalculate/src/main/cpp/CalculateAdaptor.h

@@ -0,0 +1,28 @@
+//
+// Created on 2024/4/22.
+//
+// Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
+// please include "napi/native_api.h".
+
+#ifndef HM4DEMO_CALCULATOR_H
+#define HM4DEMO_CALCULATOR_H
+
+#include "CalculateInfo.h"
+#include "Calculate.h"
+#include "js_native_api.h"
+
+class CalculateAdaptor {
+public:
+    CalculateAdaptor();
+    CalculateAdaptor(napi_env env, napi_value thisVar);
+    ~CalculateAdaptor();
+    Calculate *_calculate;
+};
+
+CalculateAdaptor *util_get_napi_info(napi_env env, napi_callback_info cbinfo, size_t argc, napi_value *argv);
+
+napi_value calculate_add(napi_env env, napi_callback_info info);
+napi_value calculate_getInfo(napi_env env, napi_callback_info info);
+
+
+#endif //HM4DEMO_CALCULATOR_H

hmcalculate/src/main/cpp/CalculateInfo.h

@@ -0,0 +1,17 @@
+//
+// Created on 2024/5/28.
+//
+// Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
+// please include "napi/native_api.h".
+
+#ifndef HM4DEMO_CALCULATEINFO_H
+#define HM4DEMO_CALCULATEINFO_H
+
+#include <string>
+struct CalculateInfo {
+    std::string name;
+    std::string versionName;
+    int versionCode;
+};
+
+#endif //HM4DEMO_CALCULATEINFO_H

hmcalculate/src/main/cpp/napi_init.cpp

@@ -0,0 +1,49 @@
+#include "napi/native_api.h"
+#include "CalculateAdaptor.h"
+#include "js_native_api.h"
+
+napi_value JS_Constructor(napi_env env, napi_callback_info info) {
+    napi_value thisVar = nullptr;
+    void *data = nullptr;
+    napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data);
+    CalculateAdaptor *adaptor = new CalculateAdaptor(env, thisVar);
+    napi_wrap(
+        env, thisVar, adaptor,
+        [](napi_env env, void *data, void *hint) {
+            CalculateAdaptor *ada = (CalculateAdaptor *)data;
+            delete ada;
+        },
+        nullptr, nullptr);
+
+    return thisVar;
+}
+
+napi_value Init(napi_env env, napi_value exports)
+{
+    const char className[] = "CalculateAdaptor";
+    napi_property_descriptor desc[] = {{"add", nullptr, calculate_add, nullptr, nullptr, nullptr, napi_default, nullptr},
+                                       {"getInfo", nullptr, calculate_getInfo, nullptr, nullptr, nullptr, napi_default, nullptr}};
+    napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
+
+    napi_value result = nullptr;
+    napi_define_class(env, className, sizeof(className), JS_Constructor, nullptr,
+                      sizeof(desc) / sizeof(desc[0]), desc, &result);
+
+    napi_set_named_property(env, exports, "CalculateAdaptor", result);
+    return exports;
+}
+
+static napi_module demoModule = {
+    .nm_version = 1,
+    .nm_flags = 0,
+    .nm_filename = nullptr,
+    .nm_register_func = Init,
+    .nm_modname = "native_lib",
+    .nm_priv = ((void*)0),
+    .reserved = { 0 },
+};
+
+extern "C" __attribute__((constructor)) void RegisterNatvie_libModule(void)
+{
+    napi_module_register(&demoModule);
+}

hmcalculate/src/main/cpp/types/libhmcalculate/index.d.ts

@@ -0,0 +1,4 @@
+export class CalculateAdapter {
+  add(a: number, b: number): number;
+  getInfo(): Object;
+}

hmcalculate/src/main/cpp/types/libhmcalculate/oh-package.json5

@@ -0,0 +1,6 @@
+{
+  "name": "libhmcalculate.so",
+  "types": "./index.d.ts",
+  "version": "",
+  "description": "Please describe the basic information."
+}

hmcalculate/src/main/ets/CalculateInfo.ets

@@ -0,0 +1,6 @@
+
+export interface CalculateInfo {
+  name: string;
+  versionName: string;
+  versionCode: number;
+}

hmcalculate/src/main/ets/Calculator.ets

@@ -0,0 +1,20 @@
+import { CalculateAdapter } from 'native_lib.so'
+import { CalculateInfo } from './CalculateInfo'
+
+export class Calculator {
+
+  private adaptor!:CalculateAdapter;
+
+  constructor() {
+    this.adaptor = new CalculateAdapter();
+  }
+
+  add(a:number, b: number): number {
+    return this.adaptor.add(a, b);
+  }
+
+  getInfo(): CalculateInfo {
+    return this.adaptor.getInfo() as CalculateInfo;
+  }
+
+}

hmcalculate/src/main/ets/pages/Index.ets

@@ -0,0 +1,21 @@
+import { hilog } from '@kit.PerformanceAnalysisKit';
+
+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World';
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+          .onClick(() => {
+          })
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}

hmcalculate/src/main/module.json5

@@ -0,0 +1,14 @@
+{
+  "module": {
+    "name": "hmcalculate",
+    "type": "shared",
+    "description": "$string:shared_desc",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "pages": "$profile:main_pages"
+  }
+}

hmcalculate/src/main/resources/base/element/color.json

@@ -0,0 +1,8 @@
+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}

hmcalculate/src/main/resources/base/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "shared_desc",
+      "value": "description"
+    }
+  ]
+}

hmcalculate/src/main/resources/base/profile/main_pages.json

@@ -0,0 +1,5 @@
+{
+  "src": [
+    "pages/Index"
+  ]
+}