From 6e569b3ef5a7fe3e8cca4b5397c7a90eaa316906 Mon Sep 17 00:00:00 2001
From: DevWiki <devwiki@qq.com>
Date: Wed, 26 Jun 2024 15:57:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20cpp=20=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hmcalculate/src/main/cpp/CalculateAdaptor.cpp | 6 ++++--
 hmcalculate/src/main/cpp/CalculateAdaptor.h   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hmcalculate/src/main/cpp/CalculateAdaptor.cpp b/hmcalculate/src/main/cpp/CalculateAdaptor.cpp
index 9a43f9c..e8dd96c 100644
--- a/hmcalculate/src/main/cpp/CalculateAdaptor.cpp
+++ b/hmcalculate/src/main/cpp/CalculateAdaptor.cpp
@@ -11,9 +11,11 @@
 #include <stdint.h>
 
 CalculateAdaptor::CalculateAdaptor() { 
+    _calculate = &Calculate::getInstance();
 }
 
 CalculateAdaptor::CalculateAdaptor(napi_env env, napi_value thisVar) { 
+    _calculate = &Calculate::getInstance();
 }
 
 CalculateAdaptor::~CalculateAdaptor() {
@@ -59,8 +61,8 @@ napi_value calculate_getInfo(napi_env env, napi_callback_info info) {
     
     napi_value js_frame;
     napi_create_object(env, &js_frame);
-    util_set_object_string_property_value(env, js_frame, "name", info2.name);
-    util_set_object_string_property_value(env, js_frame, "versionName", &info2.versionName);
+    util_set_object_string_property_value(env, js_frame, "name", info2.name.c_str());
+    util_set_object_string_property_value(env, js_frame, "versionName", info2.versionName.c_str());
     util_set_object_int32_property_value(env, js_frame, "versionCode", info2.versionCode);
     
     return js_frame;
diff --git a/hmcalculate/src/main/cpp/CalculateAdaptor.h b/hmcalculate/src/main/cpp/CalculateAdaptor.h
index 51a1086..c8a4c6b 100644
--- a/hmcalculate/src/main/cpp/CalculateAdaptor.h
+++ b/hmcalculate/src/main/cpp/CalculateAdaptor.h
@@ -15,8 +15,8 @@ class CalculateAdaptor {
 public:
     CalculateAdaptor();
     CalculateAdaptor(napi_env env, napi_value thisVar);
-    ~CalculateAdaptor();
-    Calculate *_calculate;
+    virtual ~CalculateAdaptor();
+    Calculate *_calculate = nullptr;
 };
 
 CalculateAdaptor *util_get_napi_info(napi_env env, napi_callback_info cbinfo, size_t argc, napi_value *argv);