ohmos/harmony_demo_napi_drawing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 监听函数无法触发，因为C++对象的生命周期问题

Browse Source
This commit is contained in:
🍒cheliangzhao⭐ 2024-01-03 17:52:34 +08:00
parent 7f9ae9cb3b
commit fc56622ccb
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drawing/src/main/cpp/plugin/plugin_render.cpp
View File

@ -70,7 +70,7 @@ void DispatchTouchEventCB(OH_NativeXComponent *component, void *window) {
std::unordered_map<std::string, PluginRender *> PluginRender::instance_; std::unordered_map<std::string, PluginRender *> PluginRender::instance_;
PluginRender::~PluginRender() {} PluginRender::~PluginRender() = default;
PluginRender *PluginRender::GetInstance(std::string &id) { PluginRender *PluginRender::GetInstance(std::string &id) {
if (PluginRender::instance_.find(id) == PluginRender::instance_.end()) { if (PluginRender::instance_.find(id) == PluginRender::instance_.end()) {
@ -81,15 +81,16 @@ PluginRender *PluginRender::GetInstance(std::string &id) {
return PluginRender::instance_[id]; return PluginRender::instance_[id];
} }
void PluginRender::Export(napi_env env, napi_value value) {} void PluginRender::Export(napi_env env, napi_value value) {}
void PluginRender::RegisterCallback(OH_NativeXComponent *nativeXComponent) { void PluginRender::RegisterCallback(OH_NativeXComponent *nativeXComponent) {
this->renderCallback_.DispatchTouchEvent = DispatchTouchEventCB; this->renderCallback_ = new OH_NativeXComponent_Callback();
this->renderCallback_.OnSurfaceChanged = OnSurfaceChangedCB;
this->renderCallback_.OnSurfaceCreated = OnSurfaceCreatedCB; this->renderCallback_->DispatchTouchEvent = DispatchTouchEventCB;
this->renderCallback_.OnSurfaceDestroyed = OnSurfaceDestroyedCB; this->renderCallback_->OnSurfaceChanged = OnSurfaceChangedCB;
this->renderCallback_->OnSurfaceCreated = OnSurfaceCreatedCB;
this->renderCallback_->OnSurfaceDestroyed = OnSurfaceDestroyedCB;
// 将 callback 注册给 NativeXComponent // 将 callback 注册给 NativeXComponent
OH_NativeXComponent_RegisterCallback(nativeXComponent, &this->renderCallback_); OH_NativeXComponent_RegisterCallback(nativeXComponent, this->renderCallback_);
} }

12
drawing/src/main/cpp/plugin/plugin_render.h
View File

@ -24,19 +24,19 @@
#define HARMONY_DEMO_NAPI_DRAWING_PLUGIN_RENDER_H #define HARMONY_DEMO_NAPI_DRAWING_PLUGIN_RENDER_H
class PluginRender { class PluginRender {
private:
~PluginRender();
OH_NativeXComponent_Callback renderCallback_;
public: public:
static std::unordered_map<std::string, PluginRender *> instance_; ~PluginRender();
static PluginRender *GetInstance(std::string &id); static PluginRender *GetInstance(std::string &id);
void Export(napi_env env, napi_value); void Export(napi_env env, napi_value);
// 注册监听XComponent组件的回调，包括生命周期函数，手势监听函数等。 // 注册监听XComponent组件的回调，包括生命周期函数，手势监听函数等。
void RegisterCallback(OH_NativeXComponent *nativeXComponent); void RegisterCallback(OH_NativeXComponent *nativeXComponent);
private:
OH_NativeXComponent_Callback *renderCallback_;
static std::unordered_map<std::string, PluginRender *> instance_;
}; };
#endif // HARMONY_DEMO_NAPI_DRAWING_PLUGIN_RENDER_H #endif // HARMONY_DEMO_NAPI_DRAWING_PLUGIN_RENDER_H