From f7536e71b61d2dd23ee5878cd6c447bf5c879d15 Mon Sep 17 00:00:00 2001
From: liyi0309 <liyi58@huawei.com>
Date: Wed, 13 Aug 2025 19:01:22 +0800
Subject: [PATCH] =?UTF-8?q?dialog=E7=A8=B3=E5=AE=9A=E6=96=B0=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20Signed-off-by:=20liyi0309=20<liyi58@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../native/node/custom_dialog_model.cpp       | 50 +++++++++++++++++--
 .../unittest/interfaces/dialog_model_test.cpp |  2 +-
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/frameworks/core/interfaces/native/node/custom_dialog_model.cpp b/frameworks/core/interfaces/native/node/custom_dialog_model.cpp
index b55e345d368..c4ded094780 100644
--- a/frameworks/core/interfaces/native/node/custom_dialog_model.cpp
+++ b/frameworks/core/interfaces/native/node/custom_dialog_model.cpp
@@ -12,6 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <atomic>
+#include <unordered_map>
+#include <mutex>
 #include "core/interfaces/native/node/custom_dialog_model.h"
 
 #include "interfaces/native/node/dialog_model.h"
@@ -60,9 +64,40 @@ namespace {
     DialogProperties g_dialogProperties;
 } // namespace
 
+class NativeDialogManager {
+public:
+    static void RegisterDialog(ArkUIDialogHandle handle) {
+        std::lock_guard<std::mutex> lock(nativeDialogMutex_);
+        nativeDialogMap_[handle] = std::make_shared<std::atomic<bool>>(true);
+    }
+
+    static void UnregisterDialog(ArkUIDialogHandle handle) {
+        std::lock_guard<std::mutex> lock(nativeDialogMutex_);
+        if (auto it = nativeDialogMap_.find(handle); it != nativeDialogMap_.end()) {
+            it->second->store(false);
+            nativeDialogMap_.erase(it);
+        }
+        delete handle;
+    }
+
+    static std::shared_ptr<std::atomic<bool>> GetSafeController(ArkUIDialogHandle handle) {
+        std::lock_guard<std::mutex> lock(nativeDialogMutex_);
+        if (auto it = nativeDialogMap_.find(handle); it != nativeDialogMap_.end()) {
+            return it->second;
+        }
+        return nullptr;
+    }
+private:
+    static std::mutex nativeDialogMutex_;
+    static std::unordered_map<ArkUIDialogHandle, std::shared_ptr<std::atomic<bool>>> nativeDialogMap_;
+};
+
+std::mutex NativeDialogManager::nativeDialogMutex_;
+std::unordered_map<ArkUIDialogHandle, std::shared_ptr<std::atomic<bool>>> NativeDialogManager::nativeDialogMap_;
+
 ArkUIDialogHandle CreateDialog()
 {
-    return new _ArkUIDialog({ .dialogHandle = nullptr,
+    auto* dialog = new _ArkUIDialog({ .dialogHandle = nullptr,
         .contentHandle = nullptr,
         .alignment = DEFAULT_DIALOG_ALIGNMENT,
         .offsetX = 0.0f,
@@ -120,6 +155,8 @@ ArkUIDialogHandle CreateDialog()
         .focusable = true,
         .dialogState = nullptr,
     });
+    NativeDialogManager::RegisterDialog(dialog);
+    return dialog;
 }
 
 void DisposeDialog(ArkUIDialogHandle controllerHandler)
@@ -150,7 +187,7 @@ void DisposeDialog(ArkUIDialogHandle controllerHandler)
     controllerHandler->onWillDismissCall = nullptr;
     controllerHandler->onWillDismissCallByNDK  = nullptr;
     controllerHandler->userData = nullptr;
-    delete controllerHandler;
+    NativeDialogManager::UnregisterDialog(controllerHandler);
 }
 
 DialogAlignment GetDialogAlignment(int32_t alignment)
@@ -201,10 +238,13 @@ void ParseDialogOnWillDismiss(DialogProperties& dialogProperties, ArkUIDialogHan
     if (!controllerHandler->onWillDismissCall) {
         return;
     }
-    dialogProperties.onWillDismiss = [controllerHandler](int32_t reason, int32_t instanceId) {
+    auto safeController = NativeDialogManager::GetSafeController(controllerHandler);
+    CHECK_NULL_VOID(safeController);
+    dialogProperties.onWillDismiss = [safeController, controllerHandler](int32_t reason, int32_t instanceId) {
         CHECK_NULL_VOID(controllerHandler);
-        CHECK_NULL_VOID(controllerHandler->onWillDismissCall);
-        (*(controllerHandler->onWillDismissCall))(reason);
+        if (safeController->load() && controllerHandler->onWillDismissCall){
+            (*(controllerHandler->onWillDismissCall))(reason);
+        }
     };
 }
 
diff --git a/test/unittest/interfaces/dialog_model_test.cpp b/test/unittest/interfaces/dialog_model_test.cpp
index 35d5e4ff292..8fd11a8a709 100644
--- a/test/unittest/interfaces/dialog_model_test.cpp
+++ b/test/unittest/interfaces/dialog_model_test.cpp
@@ -726,7 +726,7 @@ HWTEST_F(DialogModelTest, DialogModelTest047, TestSize.Level1)
     ArkUI_LengthMetricUnit unit = ARKUI_LENGTH_METRIC_UNIT_DEFAULT;
     float distance = 1.0f;
     int32_t ret = SetKeyboardAvoidDistance(nativeDialogHandle, distance, unit);
-    ASSERT_NE(ret, 1);
+    ASSERT_NE(ret, 1); // success
     Dispose(nativeDialogHandle);
     nativeDialogHandle = nullptr;
 }
-- 
Gitee