diff --git a/interfaces/kits/picker/include/modal_ui_callback.h b/interfaces/kits/picker/include/modal_ui_callback.h index eef34d8ccb14bb73b701865b01f3e6f909445fb1..3ad795294cc8ac159e194944cd3a2af8d75e9897 100644 --- a/interfaces/kits/picker/include/modal_ui_callback.h +++ b/interfaces/kits/picker/include/modal_ui_callback.h @@ -27,7 +27,7 @@ namespace Picker { class ModalUICallback { public: - explicit ModalUICallback(Ace::UIContent* uiContent, PickerCallBack* pickerCallBack); + explicit ModalUICallback(Ace::UIContent* uiContent, std::shared_ptr pickerCallBack); void OnRelease(int32_t releaseCode); void OnResultForModal(int32_t resultCode, const OHOS::AAFwk::Want& result); void OnReceive(const OHOS::AAFwk::WantParams& request); @@ -38,7 +38,7 @@ public: private: int32_t sessionId_ = 0; Ace::UIContent* uiContent; - PickerCallBack* pickerCallBack_; + std::shared_ptr pickerCallBack_; }; } // namespace Picker } // namespace OHOS diff --git a/interfaces/kits/picker/src/modal_ui_callback.cpp b/interfaces/kits/picker/src/modal_ui_callback.cpp index f1f1564e1177b349bb0c2b7f4b707fcfdfa09fbd..b2546fbb4842c67951419cc19b0821173d61d34a 100644 --- a/interfaces/kits/picker/src/modal_ui_callback.cpp +++ b/interfaces/kits/picker/src/modal_ui_callback.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace Picker { using namespace OHOS::Ace; using namespace std; -ModalUICallback::ModalUICallback(Ace::UIContent* uiContent, PickerCallBack* pickerCallBack) +ModalUICallback::ModalUICallback(Ace::UIContent* uiContent, std::shared_ptr pickerCallBack) { this->uiContent = uiContent; this->pickerCallBack_ = pickerCallBack; diff --git a/interfaces/kits/picker/src/picker_n_exporter.cpp b/interfaces/kits/picker/src/picker_n_exporter.cpp index 168193c283560c858a204c3febe333ab7ad4b8ad..fab7b0b4c50e689d5d48eedb66bd9c65f76fc595 100644 --- a/interfaces/kits/picker/src/picker_n_exporter.cpp +++ b/interfaces/kits/picker/src/picker_n_exporter.cpp @@ -198,7 +198,7 @@ static napi_value StartPickerExtension(napi_env env, napi_callback_info info, } request.SetParam(ABILITY_WANT_PARAMS_UIEXTENSIONTARGETTYPE, targetType); AsyncContext->pickerCallBack = make_shared(); - auto callback = std::make_shared(uiContent, AsyncContext->pickerCallBack.get()); + auto callback = std::make_shared(uiContent, AsyncContext->pickerCallBack); Ace::ModalUIExtensionCallbacks extensionCallback = { .onRelease = std::bind(&ModalUICallback::OnRelease, callback, std::placeholders::_1), .onResult = std::bind(&ModalUICallback::OnResultForModal, callback, std::placeholders::_1,