@react-native-ohos/react-native-svg 15.12.1-rc.1 → 15.12.1-rc.2

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFilterComponentInstance.cpp

@@ -1,199 +1,199 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#include "RNSVGFilterComponentInstance.h"
-#include "RNSVGFeColorMatrixComponentInstance.h"
-#include "RNSVGFeBlendComponentInstance.h"
-#include "RNSVGFeCompositeComponentInstance.h"
-#include "RNSVGFeFloodComponentInstance.h"
-#include "RNSVGFeOffsetComponentInstance.h"
-#include "RNSVGFeGaussianBlurComponentInstance.h"
-#include "utils/FilterManager.h"
-#include <sstream>
-#include <utility>
-#include <folly/dynamic.h>
-#include <cmath>
-#include <iomanip>
-#include <string>
-namespace rnoh {
-namespace svg {
-
-RNSVGFilterComponentInstance::RNSVGFilterComponentInstance(Context context)
-    : RNSVGBaseComponentInstance(std::move(context)) {
-    SetSvgNode(m_svgFilter);
-}
-
-void RNSVGFilterComponentInstance::onPropsChanged(SharedConcreteProps const &props) {}
-
-void RNSVGFilterComponentInstance::UpdateElementProps() {
-    m_svgFilter->UpdateCommonProps(m_props);
-    // Set the name as the ID for the SvgNode using the UpdateHrefRenderProps method
-    m_svgFilter->UpdateHrefRenderProps(m_props);
-    parseFilterId();
-    collectFilterEffectsInOrder();
-}
-
-void RNSVGFilterComponentInstance::parseFilterId() {
-    if (m_props) {
-        filterId_ = m_props->name;
-    }
-}
-
-void RNSVGFilterComponentInstance::collectFilterEffectsInOrder()
-{
-    if (m_svgFilter) {
-        m_svgFilter->ClearFilterEffects();
-    }
-    
-    auto children = getChildren();
-    if (collectFeDropShadowInfo()) {
-        return;
-    }
-
-    for (const auto& child : children) {
-        if (auto childInstance = std::dynamic_pointer_cast<ComponentInstance>(child)) {
-            std::string childComponentName = childInstance->getComponentName();
-            if (childComponentName.find("FeColorMatrix") != std::string::npos) {
-                collectSingleFeColorMatrix(childInstance);
-            } else if (childComponentName.find("FeFlood") != std::string::npos) {
-                collectSingleFeFlood(childInstance);
-            } else if (childComponentName.find("FeOffset") != std::string::npos) {
-                collectSingleFeOffset(childInstance);
-            } else if (childComponentName.find("FeComposite") != std::string::npos) {
-                collectSingleFeComposite(childInstance);
-            } else if (childComponentName.find("FeGaussianBlur") != std::string::npos) {
-                collectSingleFeGaussianBlur(childInstance);
-            } else if (childComponentName.find("FeBlend") != std::string::npos) {
-                collectSingleFeBlend(childInstance);
-            }
-        }
-    }
-}
-
-bool RNSVGFilterComponentInstance::collectFeDropShadowInfo()
-{
-    auto children = getChildren();
-
-    std::shared_ptr<RNSVGFeGaussianBlurComponentInstance> blurInstance = nullptr;
-    std::shared_ptr<RNSVGFeOffsetComponentInstance> offsetInstance = nullptr;
-    std::shared_ptr<RNSVGFeFloodComponentInstance> floodInstance = nullptr;
-    std::shared_ptr<RNSVGFeCompositeComponentInstance> compositeInstance = nullptr;
-
-    for (const auto& child : children) {
-        if (auto childInstance = std::dynamic_pointer_cast<ComponentInstance>(child)) {
-            std::string childComponentName = childInstance->getComponentName();
-            if (childComponentName.find("FeGaussianBlur") != std::string::npos) {
-                blurInstance = std::dynamic_pointer_cast<RNSVGFeGaussianBlurComponentInstance>(childInstance);
-            } else if (childComponentName.find("FeOffset") != std::string::npos) {
-                offsetInstance = std::dynamic_pointer_cast<RNSVGFeOffsetComponentInstance>(childInstance);
-            } else if (childComponentName.find("FeFlood") != std::string::npos) {
-                floodInstance = std::dynamic_pointer_cast<RNSVGFeFloodComponentInstance>(childInstance);
-            }
-        }
-    }
-    
-    if (blurInstance && offsetInstance && floodInstance) {
-        std::string in = blurInstance->getIn();
-        float dx = offsetInstance->getDx();
-        float dy = offsetInstance->getDy();
-        float stdDeviation = blurInstance->getStdDeviationX();
-        std::string floodColorStr = floodInstance->getFloodColor();
-        if (floodColorStr.empty()) {
-            floodColorStr = "black";
-        }
-        float floodOpacity = floodInstance->getFloodOpacity();
-        FilterEffect dropShadowEffect(FilterType::DROP_SHADOW, in, dx, dy, stdDeviation, floodColorStr, floodOpacity);
-        m_svgFilter->AddFilterEffect(dropShadowEffect);
-        return true;
-    }
-    return false;
-}
-
-void RNSVGFilterComponentInstance::collectSingleFeColorMatrix(std::shared_ptr<ComponentInstance> childInstance)
-{
-    if (auto feColorMatrixInstance = std::dynamic_pointer_cast<RNSVGFeColorMatrixComponentInstance>(childInstance)) {
-        std::string in = feColorMatrixInstance->getIn();
-        std::string type = feColorMatrixInstance->getType();
-        std::vector<float> values = feColorMatrixInstance->getValues();
-        std::string result = feColorMatrixInstance->getResult();
-        FilterEffect colorMatrixEffect(FilterType::COLOR_MATRIX, values, in, type, result);
-        m_svgFilter->AddFilterEffect(colorMatrixEffect);
-    }
-}
-
-void RNSVGFilterComponentInstance::collectSingleFeFlood(std::shared_ptr<ComponentInstance> childInstance)
-{
-    auto feFloodInstance = std::dynamic_pointer_cast<RNSVGFeFloodComponentInstance>(childInstance);
-    if (feFloodInstance) {
-        std::string in = feFloodInstance->getIn();
-        std::string floodColorStr = feFloodInstance->getFloodColor();
-        if (floodColorStr.empty()) {
-            floodColorStr = "black";
-        }
-        float floodOpacity = feFloodInstance->getFloodOpacity();
-        std::string result = feFloodInstance->getResult();
-        FilterEffect floodEffect(FilterType::FEFLOOD, in, floodColorStr, floodOpacity, result);
-        m_svgFilter->AddFilterEffect(floodEffect);
-    }
-}
-
-void RNSVGFilterComponentInstance::collectSingleFeOffset(std::shared_ptr<ComponentInstance> childInstance)
-{
-    if (auto feOffsetInstance = std::dynamic_pointer_cast<RNSVGFeOffsetComponentInstance>(childInstance)) {
-        std::string in = feOffsetInstance->getIn();
-        std::string result = feOffsetInstance->getResult();
-        float dx = feOffsetInstance->getDx();
-        float dy = feOffsetInstance->getDy();
-        FilterEffect offsetEffect(FilterType::FEOFFSET, in, dx, dy, result);
-        m_svgFilter->AddFilterEffect(offsetEffect);
-    }
-}
-
-void RNSVGFilterComponentInstance::collectSingleFeComposite(std::shared_ptr<ComponentInstance> childInstance)
-{
-    if (auto feCompositeInstance = std::dynamic_pointer_cast<RNSVGFeCompositeComponentInstance>(childInstance)) {
-        std::string in = feCompositeInstance->getIn();
-        std::string in2 = feCompositeInstance->getIn2();
-        std::string operatorType = feCompositeInstance->getOperator();
-        std::string k1 = "0", k2 = "0", k3 = "0", k4 = "0";
-        if (operatorType == "arithmetic") {
-            k1 = feCompositeInstance->getK1();
-            k2 = feCompositeInstance->getK2();
-            k3 = feCompositeInstance->getK3();
-            k4 = feCompositeInstance->getK4();
-        }
-        std::string result = feCompositeInstance->getResult();
-        FilterEffect compositeEffect(FilterType::COMPOSITE, in, in2, operatorType, k1, k2, k3, k4, result);
-        m_svgFilter->AddFilterEffect(compositeEffect);
-    }
-}
-
-void RNSVGFilterComponentInstance::collectSingleFeGaussianBlur(std::shared_ptr<ComponentInstance> childInstance)
-{
-    if (auto feGaussianBlurInstance = std::dynamic_pointer_cast<RNSVGFeGaussianBlurComponentInstance>(childInstance)) {
-        std::string in = feGaussianBlurInstance->getIn();
-        float stdDeviationX = feGaussianBlurInstance->getStdDeviationX();
-        float stdDeviationY = feGaussianBlurInstance->getStdDeviationY();
-        std::string edgeMode = feGaussianBlurInstance->getEdgeMode();
-        std::string result = feGaussianBlurInstance->getResult();
-        FilterEffect gaussianBlurEffect(FilterType::GAUSSIAN_BLUR, in, stdDeviationX, stdDeviationY, edgeMode, result);
-        m_svgFilter->AddFilterEffect(gaussianBlurEffect);
-    }
-}
-
-void RNSVGFilterComponentInstance::collectSingleFeBlend(std::shared_ptr<ComponentInstance> childInstance)
-{
-    if (auto feBlendInstance = std::dynamic_pointer_cast<RNSVGFeBlendComponentInstance>(childInstance)) {
-        std::string in = feBlendInstance->getIn();
-        std::string in2 = feBlendInstance->getIn2();
-        std::string mode = feBlendInstance->getMode();
-        std::string result = feBlendInstance->getResult();
-        FilterEffect blendEffect(FilterType::BLEND, in, in2, mode, result);
-        m_svgFilter->AddFilterEffect(blendEffect);
-    }
-}
-}
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#include "RNSVGFilterComponentInstance.h"
+#include "RNSVGFeColorMatrixComponentInstance.h"
+#include "RNSVGFeBlendComponentInstance.h"
+#include "RNSVGFeCompositeComponentInstance.h"
+#include "RNSVGFeFloodComponentInstance.h"
+#include "RNSVGFeOffsetComponentInstance.h"
+#include "RNSVGFeGaussianBlurComponentInstance.h"
+#include "utils/FilterManager.h"
+#include <sstream>
+#include <utility>
+#include <folly/dynamic.h>
+#include <cmath>
+#include <iomanip>
+#include <string>
+namespace rnoh {
+namespace svg {
+
+RNSVGFilterComponentInstance::RNSVGFilterComponentInstance(Context context)
+    : RNSVGBaseComponentInstance(std::move(context)) {
+    SetSvgNode(m_svgFilter);
+}
+
+void RNSVGFilterComponentInstance::onPropsChanged(SharedConcreteProps const &props) {}
+
+void RNSVGFilterComponentInstance::UpdateElementProps() {
+    m_svgFilter->UpdateCommonProps(m_props);
+    // Set the name as the ID for the SvgNode using the UpdateHrefRenderProps method
+    m_svgFilter->UpdateHrefRenderProps(m_props);
+    parseFilterId();
+    collectFilterEffectsInOrder();
+}
+
+void RNSVGFilterComponentInstance::parseFilterId() {
+    if (m_props) {
+        filterId_ = m_props->name;
+    }
+}
+
+void RNSVGFilterComponentInstance::collectFilterEffectsInOrder()
+{
+    if (m_svgFilter) {
+        m_svgFilter->ClearFilterEffects();
+    }
+    
+    auto children = getChildren();
+    if (collectFeDropShadowInfo()) {
+        return;
+    }
+
+    for (const auto& child : children) {
+        if (auto childInstance = std::dynamic_pointer_cast<ComponentInstance>(child)) {
+            std::string childComponentName = childInstance->getComponentName();
+            if (childComponentName.find("FeColorMatrix") != std::string::npos) {
+                collectSingleFeColorMatrix(childInstance);
+            } else if (childComponentName.find("FeFlood") != std::string::npos) {
+                collectSingleFeFlood(childInstance);
+            } else if (childComponentName.find("FeOffset") != std::string::npos) {
+                collectSingleFeOffset(childInstance);
+            } else if (childComponentName.find("FeComposite") != std::string::npos) {
+                collectSingleFeComposite(childInstance);
+            } else if (childComponentName.find("FeGaussianBlur") != std::string::npos) {
+                collectSingleFeGaussianBlur(childInstance);
+            } else if (childComponentName.find("FeBlend") != std::string::npos) {
+                collectSingleFeBlend(childInstance);
+            }
+        }
+    }
+}
+
+bool RNSVGFilterComponentInstance::collectFeDropShadowInfo()
+{
+    auto children = getChildren();
+
+    std::shared_ptr<RNSVGFeGaussianBlurComponentInstance> blurInstance = nullptr;
+    std::shared_ptr<RNSVGFeOffsetComponentInstance> offsetInstance = nullptr;
+    std::shared_ptr<RNSVGFeFloodComponentInstance> floodInstance = nullptr;
+    std::shared_ptr<RNSVGFeCompositeComponentInstance> compositeInstance = nullptr;
+
+    for (const auto& child : children) {
+        if (auto childInstance = std::dynamic_pointer_cast<ComponentInstance>(child)) {
+            std::string childComponentName = childInstance->getComponentName();
+            if (childComponentName.find("FeGaussianBlur") != std::string::npos) {
+                blurInstance = std::dynamic_pointer_cast<RNSVGFeGaussianBlurComponentInstance>(childInstance);
+            } else if (childComponentName.find("FeOffset") != std::string::npos) {
+                offsetInstance = std::dynamic_pointer_cast<RNSVGFeOffsetComponentInstance>(childInstance);
+            } else if (childComponentName.find("FeFlood") != std::string::npos) {
+                floodInstance = std::dynamic_pointer_cast<RNSVGFeFloodComponentInstance>(childInstance);
+            }
+        }
+    }
+    
+    if (blurInstance && offsetInstance && floodInstance) {
+        std::string in = blurInstance->getIn();
+        float dx = offsetInstance->getDx();
+        float dy = offsetInstance->getDy();
+        float stdDeviation = blurInstance->getStdDeviationX();
+        std::string floodColorStr = floodInstance->getFloodColor();
+        if (floodColorStr.empty()) {
+            floodColorStr = "black";
+        }
+        float floodOpacity = floodInstance->getFloodOpacity();
+        FilterEffect dropShadowEffect(FilterType::DROP_SHADOW, in, dx, dy, stdDeviation, floodColorStr, floodOpacity);
+        m_svgFilter->AddFilterEffect(dropShadowEffect);
+        return true;
+    }
+    return false;
+}
+
+void RNSVGFilterComponentInstance::collectSingleFeColorMatrix(std::shared_ptr<ComponentInstance> childInstance)
+{
+    if (auto feColorMatrixInstance = std::dynamic_pointer_cast<RNSVGFeColorMatrixComponentInstance>(childInstance)) {
+        std::string in = feColorMatrixInstance->getIn();
+        std::string type = feColorMatrixInstance->getType();
+        std::vector<float> values = feColorMatrixInstance->getValues();
+        std::string result = feColorMatrixInstance->getResult();
+        FilterEffect colorMatrixEffect(FilterType::COLOR_MATRIX, values, in, type, result);
+        m_svgFilter->AddFilterEffect(colorMatrixEffect);
+    }
+}
+
+void RNSVGFilterComponentInstance::collectSingleFeFlood(std::shared_ptr<ComponentInstance> childInstance)
+{
+    auto feFloodInstance = std::dynamic_pointer_cast<RNSVGFeFloodComponentInstance>(childInstance);
+    if (feFloodInstance) {
+        std::string in = feFloodInstance->getIn();
+        std::string floodColorStr = feFloodInstance->getFloodColor();
+        if (floodColorStr.empty()) {
+            floodColorStr = "black";
+        }
+        float floodOpacity = feFloodInstance->getFloodOpacity();
+        std::string result = feFloodInstance->getResult();
+        FilterEffect floodEffect(FilterType::FEFLOOD, in, floodColorStr, floodOpacity, result);
+        m_svgFilter->AddFilterEffect(floodEffect);
+    }
+}
+
+void RNSVGFilterComponentInstance::collectSingleFeOffset(std::shared_ptr<ComponentInstance> childInstance)
+{
+    if (auto feOffsetInstance = std::dynamic_pointer_cast<RNSVGFeOffsetComponentInstance>(childInstance)) {
+        std::string in = feOffsetInstance->getIn();
+        std::string result = feOffsetInstance->getResult();
+        float dx = feOffsetInstance->getDx();
+        float dy = feOffsetInstance->getDy();
+        FilterEffect offsetEffect(FilterType::FEOFFSET, in, dx, dy, result);
+        m_svgFilter->AddFilterEffect(offsetEffect);
+    }
+}
+
+void RNSVGFilterComponentInstance::collectSingleFeComposite(std::shared_ptr<ComponentInstance> childInstance)
+{
+    if (auto feCompositeInstance = std::dynamic_pointer_cast<RNSVGFeCompositeComponentInstance>(childInstance)) {
+        std::string in = feCompositeInstance->getIn();
+        std::string in2 = feCompositeInstance->getIn2();
+        std::string operatorType = feCompositeInstance->getOperator();
+        std::string k1 = "0", k2 = "0", k3 = "0", k4 = "0";
+        if (operatorType == "arithmetic") {
+            k1 = feCompositeInstance->getK1();
+            k2 = feCompositeInstance->getK2();
+            k3 = feCompositeInstance->getK3();
+            k4 = feCompositeInstance->getK4();
+        }
+        std::string result = feCompositeInstance->getResult();
+        FilterEffect compositeEffect(FilterType::COMPOSITE, in, in2, operatorType, k1, k2, k3, k4, result);
+        m_svgFilter->AddFilterEffect(compositeEffect);
+    }
+}
+
+void RNSVGFilterComponentInstance::collectSingleFeGaussianBlur(std::shared_ptr<ComponentInstance> childInstance)
+{
+    if (auto feGaussianBlurInstance = std::dynamic_pointer_cast<RNSVGFeGaussianBlurComponentInstance>(childInstance)) {
+        std::string in = feGaussianBlurInstance->getIn();
+        float stdDeviationX = feGaussianBlurInstance->getStdDeviationX();
+        float stdDeviationY = feGaussianBlurInstance->getStdDeviationY();
+        std::string edgeMode = feGaussianBlurInstance->getEdgeMode();
+        std::string result = feGaussianBlurInstance->getResult();
+        FilterEffect gaussianBlurEffect(FilterType::GAUSSIAN_BLUR, in, stdDeviationX, stdDeviationY, edgeMode, result);
+        m_svgFilter->AddFilterEffect(gaussianBlurEffect);
+    }
+}
+
+void RNSVGFilterComponentInstance::collectSingleFeBlend(std::shared_ptr<ComponentInstance> childInstance)
+{
+    if (auto feBlendInstance = std::dynamic_pointer_cast<RNSVGFeBlendComponentInstance>(childInstance)) {
+        std::string in = feBlendInstance->getIn();
+        std::string in2 = feBlendInstance->getIn2();
+        std::string mode = feBlendInstance->getMode();
+        std::string result = feBlendInstance->getResult();
+        FilterEffect blendEffect(FilterType::BLEND, in, in2, mode, result);
+        m_svgFilter->AddFilterEffect(blendEffect);
+    }
+}
+}
 }

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFilterComponentInstance.h

@@ -1,48 +1,48 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#pragma once
-
-#include "RNSVGBaseComponentInstance.h"
-#include "SvgFilter.h"
-#include "utils/FilterManager.h"
-#include <react/renderer/components/react_native_svg/ShadowNodes.h>
-
-namespace rnoh {
-namespace svg {
-
-
-class RNSVGFilterComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFilterShadowNode> {
-public:
-    RNSVGFilterComponentInstance(Context context);
-
-    void onPropsChanged(SharedConcreteProps const &props) override;
-    void UpdateElementProps() override;
-
-private:
-    std::shared_ptr<SvgFilter> m_svgFilter = std::make_shared<SvgFilter>();
-    std::string filterId_;
-    
-    void parseFilterId();
-    void collectFilterEffectsInOrder();
-    bool collectFeDropShadowInfo();
-    void collectSingleFeColorMatrix(std::shared_ptr<ComponentInstance> childInstance);
-    void collectSingleFeFlood(std::shared_ptr<ComponentInstance> childInstance);
-    void collectSingleFeOffset(std::shared_ptr<ComponentInstance> childInstance);
-    void collectSingleFeComposite(std::shared_ptr<ComponentInstance> childInstance);
-    void collectSingleFeGaussianBlur(std::shared_ptr<ComponentInstance> childInstance);
-    void collectSingleFeBlend(std::shared_ptr<ComponentInstance> childInstance);
-    std::vector<float> generateColorMatrix(const std::string& type, const std::vector<float>& values);
-    std::vector<float> convertBlendModeToValues(const std::string& mode);
-    std::vector<float> convertCompositeOperatorToValues(const std::string& operatorType, 
-                                                        const std::string& k1, 
-                                                        const std::string& k2, 
-                                                        const std::string& k3, 
-                                                        const std::string& k4);
-};
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#pragma once
+
+#include "RNSVGBaseComponentInstance.h"
+#include "SvgFilter.h"
+#include "utils/FilterManager.h"
+#include <react/renderer/components/react_native_svg/ShadowNodes.h>
+
+namespace rnoh {
+namespace svg {
+
+
+class RNSVGFilterComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFilterShadowNode> {
+public:
+    RNSVGFilterComponentInstance(Context context);
+
+    void onPropsChanged(SharedConcreteProps const &props) override;
+    void UpdateElementProps() override;
+
+private:
+    std::shared_ptr<SvgFilter> m_svgFilter = std::make_shared<SvgFilter>();
+    std::string filterId_;
+    
+    void parseFilterId();
+    void collectFilterEffectsInOrder();
+    bool collectFeDropShadowInfo();
+    void collectSingleFeColorMatrix(std::shared_ptr<ComponentInstance> childInstance);
+    void collectSingleFeFlood(std::shared_ptr<ComponentInstance> childInstance);
+    void collectSingleFeOffset(std::shared_ptr<ComponentInstance> childInstance);
+    void collectSingleFeComposite(std::shared_ptr<ComponentInstance> childInstance);
+    void collectSingleFeGaussianBlur(std::shared_ptr<ComponentInstance> childInstance);
+    void collectSingleFeBlend(std::shared_ptr<ComponentInstance> childInstance);
+    std::vector<float> generateColorMatrix(const std::string& type, const std::vector<float>& values);
+    std::vector<float> convertBlendModeToValues(const std::string& mode);
+    std::vector<float> convertCompositeOperatorToValues(const std::string& operatorType, 
+                                                        const std::string& k1, 
+                                                        const std::string& k2, 
+                                                        const std::string& k3, 
+                                                        const std::string& k4);
+};
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/componentInstances/RNSVGImageComponentInstance.cpp

@@ -77,7 +77,10 @@ std::string RNSVGImageComponentInstance::FindLocalCacheByUri(std::string const &
     }
 
     // 查找缓存目录
-    auto cacheDir = arkTsTurboModule->getImageSourceResolver()->resolveImageSources(*this, uri);
+    auto basePtr = shared_from_this();
+    auto thisPtr = std::static_pointer_cast<RNSVGImageComponentInstance>(basePtr);
+    auto cacheDir = arkTsTurboModule->getImageSourceResolver()->resolveImageSources(thisPtr, uri);
+    
     if (!cacheDir.empty()) {
         return cacheDir; // 如果找到缓存文件，返回缓存路径
     }

package/harmony/svg/src/main/cpp/downloadUtils/ImageSourceResolver.cpp

@@ -10,11 +10,11 @@
 namespace rnoh {
 namespace svg {
 
-std::string ImageSourceResolver::resolveImageSources(ImageSourceUpdateListener &listener, std::string uri) {
+std::string ImageSourceResolver::resolveImageSources(std::shared_ptr<ImageSourceUpdateListener> listener, std::string uri) {
     // 判断是否还在下载中
     if (m_pendingSet.find(uri) != m_pendingSet.end()) {
-        removeListener(&listener);
-        addListenerForURI(uri, &listener);
+        removeListener(listener);
+        addListenerForURI(uri, listener);
         return "";
     }
     // 生成图像的哈希缓存文件名
@@ -25,31 +25,45 @@ std::string ImageSourceResolver::resolveImageSources(ImageSourceUpdateListener &
         auto cacheUri = "file://" + fileCacheDir_ + hashedFileName;
         return cacheUri;
     }
-    removeListener(&listener);
-    addListenerForURI(uri, &listener);
+    removeListener(listener);
+    addListenerForURI(uri, listener);
     return "";
 }
 
-void ImageSourceResolver::addListenerForURI(const std::string &uri, ImageSourceUpdateListener *listener) {
+void ImageSourceResolver::addListenerForURI(const std::string &uri, std::shared_ptr<ImageSourceUpdateListener> listener) {
     listener->observedUri = uri;
     auto it = m_uriListenersMap.find(uri);
     if (it == m_uriListenersMap.end()) {
-        m_uriListenersMap.emplace(uri, std::initializer_list<ImageSourceUpdateListener *>{listener});
+        m_uriListenersMap.emplace(uri, std::vector<std::weak_ptr<ImageSourceUpdateListener>>{listener});
         return;
     }
-    if (std::find(it->second.begin(), it->second.end(), listener) != it->second.end()) {
+    
+    auto alreadyThere = std::find_if(it->second.begin(), it->second.end(),[&listener]  
+    (const std::weak_ptr<ImageSourceUpdateListener> &wk )
+    {   
+        auto sp = wk.lock();
+        return sp == listener;
+
+    });
+    if (alreadyThere != it->second.end())
+    {
         return;
     }
     it->second.push_back(listener);
 }
 
-void ImageSourceResolver::removeListenerForURI(const std::string &uri, ImageSourceUpdateListener *listener) {
+void ImageSourceResolver::removeListenerForURI(const std::string &uri, std::shared_ptr<ImageSourceUpdateListener> listener) {
     auto it = m_uriListenersMap.find(uri);
     if (it == m_uriListenersMap.end()) {
         return;
     }
     auto &listeners = it->second;
-    auto listenerPos = std::find(listeners.begin(), listeners.end(), listener);
+    auto listenerPos = std::find_if(listeners.begin(), listeners.end(), [&listener](const std::weak_ptr<ImageSourceUpdateListener> &wk)
+    {
+        auto sp = wk.lock();
+        return sp == listener;
+
+    });
     if (listenerPos != listeners.end()) {
         listeners.erase(listenerPos);
         if (listeners.empty()) {
@@ -58,7 +72,7 @@ void ImageSourceResolver::removeListenerForURI(const std::string &uri, ImageSour
     }
 }
 
-void ImageSourceResolver::removeListener(ImageSourceUpdateListener *listener) {
+void ImageSourceResolver::removeListener(std::shared_ptr<ImageSourceUpdateListener> listener) {
     if (!listener->observedUri.empty()) {
         removeListenerForURI(listener->observedUri, listener);
     }
@@ -80,8 +94,13 @@ void ImageSourceResolver::imageDownloadComplete(std::string uri, std::string fil
 
     auto &listeners = it->second;
     for (auto listener : listeners) {
-        listener->onImageSourceCacheUpdate(fileUri);
-        removeListenerForURI(uri, listener);
+        
+        if (auto weaklistener = listener.lock())
+        {
+            weaklistener->onImageSourceCacheUpdate(fileUri);
+            removeListenerForURI(uri, weaklistener);
+        }
+
     }
 }
 
@@ -97,8 +116,10 @@ void ImageSourceResolver::imageDownloadFail(std::string uri) {
     }
     auto &listeners = it->second;
     for (auto listener : listeners) {
-        listener->onImageSourceCacheDownloadFileFail();
-        removeListenerForURI(uri, listener);
+        
+        auto weaklistener = listener.lock();
+        weaklistener->onImageSourceCacheDownloadFileFail();
+        removeListenerForURI(uri, weaklistener);
     }
 }
 

package/harmony/svg/src/main/cpp/downloadUtils/ImageSourceResolver.h

@@ -45,11 +45,7 @@ public:
             : m_imageSourceResolver(ImageSourceResolver) {}
 
         // 注销监听器
-        ~ImageSourceUpdateListener() {
-            if (!m_imageSourceResolver) {
-                m_imageSourceResolver->removeListener(this);
-            }
-        }
+        ~ImageSourceUpdateListener() = default;
 
         // 监听图像缓存更新
         virtual void onImageSourceCacheUpdate(std::string imageUri) = 0;
@@ -62,16 +58,16 @@ public:
     };
 
     // 解析图像源的缓存路径
-    std::string resolveImageSources(ImageSourceUpdateListener &listener, std::string uri);
+    std::string resolveImageSources(std::shared_ptr<ImageSourceUpdateListener> listener, std::string uri);
 
     // 为URI添加监听器
-    void addListenerForURI(const std::string &uri, ImageSourceUpdateListener *listener);
+    void addListenerForURI(const std::string &uri, std::shared_ptr<ImageSourceUpdateListener> listener);
 
     // 从URI移除监听器
-    void removeListenerForURI(const std::string &uri, ImageSourceUpdateListener *listener);
+    void removeListenerForURI(const std::string &uri, std::shared_ptr<ImageSourceUpdateListener> listener);
 
     // 从解析器中移除监听器
-    void removeListener(ImageSourceUpdateListener *listener);
+    void removeListener(std::shared_ptr<ImageSourceUpdateListener> listener);
 
     // 下载完成后更新图像缓存
     void imageDownloadComplete(std::string uri, std::string fileUri);
@@ -87,7 +83,7 @@ public:
 
 private:
     // 存储URI与对应的监听器（支持多个监听器）
-    std::unordered_map<std::string, std::vector<ImageSourceUpdateListener *>> m_uriListenersMap;
+    std::unordered_map<std::string, std::vector<std::weak_ptr<ImageSourceUpdateListener>>> m_uriListenersMap;
 
     // 存储正在下载的图像URI集合
     std::unordered_set<std::string> m_pendingSet;