添加x86_64 架构

app/oh-package.json5

@@ -9,7 +9,7 @@
     "@devwiki/common_ui": "file:../common_ui",
     "@devwiki/base": "file:../base",
     "@ohos/axios": "^2.2.0",
-    "@devwiki/native_lib": "file:../native_lib"
+    "@devwiki/hmcalculate": "file:../hmcalculate"
   },
   "devDependencies": {},
   "dynamicDependencies": {}

app/src/main/ets/pages/Index.ets

@@ -7,8 +7,7 @@ import { BusinessError } from '@ohos.base';
 import { Log } from '@devwiki/base';
 import { BaseLocalStorage, ScreenUtil } from '@devwiki/base';
 import { HomeItem, HomeItemGroup } from '../model/Home';
-import { common, Want } from '@kit.AbilityKit';
+import { CalculateAdapter } from '@devwiki/hmcalculate';
-import { CalculateAdapter } from '@devwiki/native_lib/src/main/cpp/types/libnatvie_lib';
 
 
 @Entry

build-profile.json5

@@ -81,8 +81,8 @@
       ]
     },
     {
-      "name": "native_lib",
+      "name": "hmcalculate",
-      "srcPath": "./native_lib",
+      "srcPath": "./hmcalculate",
       "targets": [
         {
           "name": "default",

cppLib/build.bat

@@ -6,6 +6,11 @@ set cmake_root=%native_path%build-tools\cmake\
 set cmake_path=%cmake_root%bin\cmake.exe
 set ninja_path=%cmake_root%bin\ninja.exe
 set make_path=C:\MinGW\msys\1.0\bin\make.exe
+set arch=arm64-v8a
+
+IF NOT "%~1"=="" (
+    set arch=%1
+)
 
 if exist build (
     del /q /s build
@@ -14,16 +19,20 @@ if exist build (
 )
 
 if exist dist (
-    del /q /s dist
+    cd dist
+    if exist "%arch%" (
+        del /q /s ""%arch%"
+    )
+    cd ../
 )
 
 cd build
 :: 使用 make 构建
-:: %cmake_path% -G"Unix Makefiles" -DCMAKE_MAKE_PROGRAM="%make_path%" -DOHOS_STL=c++_static -DOHOS_ARCH=arm64-v8a -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE=%toolchain% ..
+:: %cmake_path% -G"Unix Makefiles" -DCMAKE_MAKE_PROGRAM="%make_path%" -DOHOS_STL=c++_static -DOHOS_ARCH="%arch%" -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE=%toolchain% ..
 :: %make_path%
 
 :: 使用 ninja 构建
-%cmake_path% -GNinja -DCMAKE_MAKE_PROGRAM="%ninja_path%" -DOHOS_STL=c++_static -DOHOS_ARCH=arm64-v8a -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE=%toolchain% ..
+%cmake_path% -GNinja -DCMAKE_MAKE_PROGRAM="%ninja_path%" -DOHOS_STL=c++_static -DOHOS_ARCH="%arch%" -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE=%toolchain% ..
 %ninja_path%
 cd ../
 

cppLib/build_all.bat

@@ -0,0 +1,7 @@
+@echo off
+chcp 65001 > nul
+build.bat
+
+build.bat x86_64
+
+build.bat

hmcalculate/Index.ets

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

hmcalculate/build-profile.json5

@@ -4,7 +4,11 @@
     "externalNativeOptions": {
       "path": "./src/main/cpp/CMakeLists.txt",
       "arguments": "",
-      "cppFlags": ""
+      "cppFlags": "",
+      "abiFilters": [
+        "arm64-v8a",
+        "x86_64"
+      ]
     }
   },
   "buildOptionSet": [

hmcalculate/oh-package.json5

@@ -1,5 +1,5 @@
 {
-  "name": "@devwiki/native_lib",
+  "name": "@devwiki/hmcalculate",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
@@ -7,6 +7,6 @@
   "license": "Apache-2.0",
   "packageType": "InterfaceHar",
   "dependencies": {
-    "native_lib.so": "file:./src/main/cpp/types/libnatvie_lib"
+    "libhmcalculate.so": "file:./src/main/cpp/types/libhmcalculate"
   }
 }

hmcalculate/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,28 @@
+# 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)
+
+# 根据不同的架构选择不同的库文件路径
+IF(OHOS_ARCH STREQUAL "arm64-v8a")
+    set(LIB_DIR ${NATIVERENDER_ROOT_PATH}/../../../../cppLib/dist/lib/arm64-v8a)
+ELSEIF(OHOS_ARCH STREQUAL "x86_64")
+    set(LIB_DIR ${NATIVERENDER_ROOT_PATH}/../../../../cppLib/dist/lib/x86_64)
+ELSE()
+    MESSAGE(FATAL_ERROR "Unsupported architecture: ${OHOS_ARCH}")
+ENDIF()
+
+target_link_libraries(hmcalculate PUBLIC ${LIB_DIR}/libcalculate.so)

hmcalculate/src/main/cpp/napi_init.cpp

@@ -18,9 +18,6 @@ napi_value JS_Constructor(napi_env env, napi_callback_info info) {
     return thisVar;
 }
 
-EXTERN_C_START
-
-
 napi_value Init(napi_env env, napi_value exports)
 {
     const char className[] = "CalculateAdaptor";
@@ -35,7 +32,6 @@ napi_value Init(napi_env env, napi_value exports)
     napi_set_named_property(env, exports, "CalculateAdaptor", result);
     return exports;
 }
-EXTERN_C_END
 
 static napi_module demoModule = {
     .nm_version = 1,

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

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

hmcalculate/src/main/module.json5

@@ -1,6 +1,6 @@
 {
   "module": {
-    "name": "native_lib",
+    "name": "hmcalculate",
     "type": "shared",
     "description": "$string:shared_desc",
     "deviceTypes": [

native_lib/Index.ets

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

native_lib/src/main/cpp/CMakeLists.txt

@@ -1,19 +0,0 @@
-# the minimum version of CMake.
-cmake_minimum_required(VERSION 3.4.1)
-project(myNpmLib)
-
-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(native_lib SHARED
-    napi_init.cpp
-    CalculateInfo.h
-    CalculateAdaptor.cpp)
-
-target_link_libraries(native_lib PUBLIC ../../../../cppLib/dist/lib/arm64-v8a/libcalculate.so)