Compare commits

..

No commits in common. "c0c8d90c4fcac2958880463f2ff7526bec99d9ee" and "472fc2e5742eaf16aefe2b8d950a466069682ade" have entirely different histories.

3 changed files with 8 additions and 6 deletions

View File

@ -69,6 +69,10 @@ struct Index {
aboutToAppear(): void {
ScreenUtil.getInstance().initScreenSize();
BaseLocalStorage.getInstance().init(getContext(this));
let cal:Calculator = new Calculator();
let sum = cal.add(1,2);
let info = cal.getInfo();
}
onPageShow(): void {

View File

@ -11,11 +11,9 @@
#include <stdint.h>
CalculateAdaptor::CalculateAdaptor() {
_calculate = &Calculate::getInstance();
}
CalculateAdaptor::CalculateAdaptor(napi_env env, napi_value thisVar) {
_calculate = &Calculate::getInstance();
}
CalculateAdaptor::~CalculateAdaptor() {
@ -61,8 +59,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.c_str());
util_set_object_string_property_value(env, js_frame, "versionName", info2.versionName.c_str());
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_int32_property_value(env, js_frame, "versionCode", info2.versionCode);
return js_frame;

View File

@ -15,8 +15,8 @@ class CalculateAdaptor {
public:
CalculateAdaptor();
CalculateAdaptor(napi_env env, napi_value thisVar);
virtual ~CalculateAdaptor();
Calculate *_calculate = nullptr;
~CalculateAdaptor();
Calculate *_calculate;
};
CalculateAdaptor *util_get_napi_info(napi_env env, napi_callback_info cbinfo, size_t argc, napi_value *argv);