调整C++ 代码

cppLib/CMakeLists.txt

@@ -20,7 +20,10 @@ ELSE()
 ENDIF()
 
 # 添加共享库
-add_library(${PROJECT_NAME} ${STATIC_OR_SHARED} library.cpp)
+add_library(${PROJECT_NAME} ${STATIC_OR_SHARED}
+    Calculate.cpp
+    CalculateInfo.h
+)
 
 # 解析配置
 if(EX_PLATFORM EQUAL 32)

cppLib/Calculate.cpp

@@ -1,4 +1,4 @@
-#include "library.h"
+#include "Calculate.h"
 
 #include <iostream>
 

cppLib/Calculate.h

@@ -2,12 +2,7 @@
 #define CPPLIB_LIBRARY_H
 
 #include <string>
-
+#include "CalculateInfo.h"
-struct CalculateInfo {
-    std::string name;
-    std::string versionName;
-    int versionCode;
-};
 
 class Calculate {
 public:

cppLib/CalculateInfo.h

@@ -1,11 +1,11 @@
 //
-// Created on 2024/4/22.
+// 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_CALCULATE_H
+#ifndef HM4DEMO_CALCULATEINFO_H
-#define HM4DEMO_CALCULATE_H
+#define HM4DEMO_CALCULATEINFO_H
 
 #include <string>
 struct CalculateInfo {
@@ -14,10 +14,4 @@ struct CalculateInfo {
     int versionCode;
 };
 
-class Calculate {
+#endif //HM4DEMO_CALCULATEINFO_H
-public:
-    static Calculate& getInstance();
-    int add(int a, int b);
-    CalculateInfo getInfo();
-};
-#endif //HM4DEMO_CALCULATE_H

native_lib/Index.ets

@@ -1 +1 @@
-export {} from './src/main/cpp/types/libnatvie_lib/index'
+export { CalculateAdapter } from './src/main/cpp/types/libnatvie_lib/index'

native_lib/src/main/cpp/CMakeLists.txt

@@ -11,6 +11,9 @@ endif()
 include_directories(${NATIVERENDER_ROOT_PATH}
                     ${NATIVERENDER_ROOT_PATH}/include)
 
-add_library(native_lib SHARED napi_init.cpp)
+add_library(native_lib SHARED
+    napi_init.cpp
+    CalculateInfo.h
+    CalculateAdaptor.cpp)
 
 target_link_libraries(native_lib PUBLIC ../../../../cppLib/dist/lib/arm64-v8a/libcalculate.so)

native_lib/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
+
+
+

native_lib/src/main/cpp/CalculateAdaptor.cpp

@@ -5,7 +5,8 @@
 // please include "napi/native_api.h".
 
 #include "CalculateAdaptor.h"
-#include "library.h"
+#include "Calculate.h"
+#include "CalculateInfo.h"
 
 CalculateAdaptor::CalculateAdaptor() { 
     _calculate = &Calculate::getInstance(); 

native_lib/src/main/cpp/CalculateAdaptor.h

@@ -7,7 +7,8 @@
 #ifndef HM4DEMO_CALCULATOR_H
 #define HM4DEMO_CALCULATOR_H
 
-#include "library.h"
+#include "CalculateInfo.h"
+#include "Calculate.h"
 #include "js_native_api.h"
 
 class CalculateAdaptor {

native_lib/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

native_lib/src/main/ets/Calculator.ets

@@ -1,5 +1,5 @@
 import { CalculateAdapter } from 'native_lib.so'
-import { CalculateInfo } from './CalculateDefine'
+import { CalculateInfo } from './CalculateInfo'
 
 export class Calculator {