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

package/harmony/svg/src/main/cpp/properties/Dimension.h

@@ -141,6 +141,20 @@ public:
         return 0.0;
     };
 
+    double ParsePropsToPx(double relative, float pointScaleFactor){
+        if (unit_ == DimensionUnit::NONE) {
+            return value_*pointScaleFactor;
+        }
+        if (unit_ == DimensionUnit::PERCENT) {
+            return value_*relative - pointScaleFactor;
+        }
+        if (unit_ == DimensionUnit::VP) {
+            return value_*pointScaleFactor;
+        } else {
+            return value_;
+        }  
+    }
+    
     double GetNativeValue(DimensionUnit unit, double scale) const {
         if (unit_ == unit) {
             return value_;

package/harmony/svg/src/main/cpp/turboModules/RNSVGImageModule.cpp

@@ -20,6 +20,35 @@ RNSVGImageModule::RNSVGImageModule(const ArkTSTurboModule::Context ctx, const st
     // 获取缓存路径前缀
     auto cache = this->callSync("getCacheDir", {});
     m_fileCacheDir = cache.asString() + "/";
+    
+    // 确保缓存目录存在
+    try {
+        fs::path cachePath(m_fileCacheDir);
+        if (!fs::exists(cachePath)) {
+            if (auto result = fs::create_directories(cachePath)) {
+                LOG(INFO) << "[SVGImage] Created cache directory: " << m_fileCacheDir;
+            } else {
+                LOG(WARNING) << "[SVGImage] Failed to create cache directory: " << m_fileCacheDir;
+            }
+        } else if (!fs::is_directory(cachePath)) {
+            LOG(ERROR) << "[SVGImage] Cache path exists but is not a directory: " << m_fileCacheDir;
+            // 尝试创建备份目录
+            std::string backupDir = m_fileCacheDir + "_backup";
+            fs::create_directories(backupDir);
+            m_fileCacheDir = backupDir + "/";
+            LOG(INFO) << "[SVGImage] Using backup cache directory: " << m_fileCacheDir;
+        }
+    } catch (const std::exception& e) {
+        LOG(ERROR) << "[SVGImage] Error creating/validating cache directory: " << e.what();
+        // 使用临时目录作为后备方案
+        m_fileCacheDir = "/data/local/tmp/rnsvg_cache/";
+        try {
+            fs::create_directories(m_fileCacheDir);
+        } catch (...) {
+            LOG(ERROR) << "[SVGImage] Failed to create temp cache directory";
+        }
+    }
+    
     m_imageSourceResolver = std::make_shared<ImageSourceResolver>(m_fileCacheDir);
 
     fs::path directoryPath = m_fileCacheDir;
@@ -41,7 +70,7 @@ RNSVGImageModule::RNSVGImageModule(const ArkTSTurboModule::Context ctx, const st
 void RNSVGImageModule::downloadImage(const std::string &uri, const std::map<std::string, std::string> &headers) {
     HttpTaskProcessor *processor = new HttpTaskProcessor();
     processor->instance_ = m_imageSourceResolver;
-    processor->filePath_ = m_fileCacheDir + StringUtils::generateHashedFileName(uri);
+    processor->filePath_ = m_fileCacheDir + StringUtils::generateHash(uri);
 
     if (headers.empty()) {
         processor->launchHttpRequest(uri.c_str());

package/harmony/svg/src/main/cpp/utils/DynamicUtils.h

@@ -1,55 +1,55 @@
-/*
- * 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 <string>
-#include <vector>
-#include <folly/dynamic.h>
-
-namespace rnoh {
-namespace svg {
-
-namespace DynamicUtils {
-
-/**
- * Convert folly::dynamic to string
- * Handles string, int, double, bool types
- * Returns empty string for other types
- */
-inline std::string DynamicToString(const folly::dynamic& d) {
-    if (d.isNull()) {
-        return "";
-    } else if (d.isString()) {
-        return d.asString();
-    } else if (d.isInt()) {
-        return std::to_string(d.asInt());
-    } else if (d.isDouble()) {
-        return std::to_string(d.asDouble());
-    } else if (d.isBool()) {
-        return d.asBool() ? "true" : "false";
-    } else {
-        return "";
-    }
-}
-
-/**
- * Convert folly::dynamic array to vector of strings
- * Returns empty vector if not an array
- */
-inline std::vector<std::string> DynamicToStringVector(const folly::dynamic& d) {
-    std::vector<std::string> result;
-    if (d.isArray()) {
-        for (const auto& item : d) {
-            result.push_back(DynamicToString(item));
-        }
-    }
-    return result;
-}
-
-} // namespace DynamicUtils
-} // 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 <string>
+#include <vector>
+#include <folly/dynamic.h>
+
+namespace rnoh {
+namespace svg {
+
+namespace DynamicUtils {
+
+/**
+ * Convert folly::dynamic to string
+ * Handles string, int, double, bool types
+ * Returns empty string for other types
+ */
+inline std::string DynamicToString(const folly::dynamic& d) {
+    if (d.isNull()) {
+        return "";
+    } else if (d.isString()) {
+        return d.asString();
+    } else if (d.isInt()) {
+        return std::to_string(d.asInt());
+    } else if (d.isDouble()) {
+        return std::to_string(d.asDouble());
+    } else if (d.isBool()) {
+        return d.asBool() ? "true" : "false";
+    } else {
+        return "";
+    }
+}
+
+/**
+ * Convert folly::dynamic array to vector of strings
+ * Returns empty vector if not an array
+ */
+inline std::vector<std::string> DynamicToStringVector(const folly::dynamic& d) {
+    std::vector<std::string> result;
+    if (d.isArray()) {
+        for (const auto& item : d) {
+            result.push_back(DynamicToString(item));
+        }
+    }
+    return result;
+}
+
+} // namespace DynamicUtils
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/utils/FilterManager.h

@@ -1,190 +1,190 @@
-/*
- * 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 <string>
-#include <vector>
-#include <unordered_map>
-#include <memory>
-#include <glog/logging.h>
-
-namespace rnoh {
-namespace svg {
-
-// FeColorMatrix信息结构
-struct FeColorMatrixInfo {
-    std::string type = "saturate";
-    std::vector<float> values = {1.0f};
-    std::string in = "SourceGraphic";  // 默认输入源为 SourceGraphic
-    
-    FeColorMatrixInfo() = default;
-    FeColorMatrixInfo(const std::string& t, const std::vector<float>& v) : type(t), values(v) {}
-    FeColorMatrixInfo(const std::string& t, const std::vector<float>& v, const std::string& inputSource) 
-        : type(t), values(v), in(inputSource) {}
-    
-    // 获取饱和度值（当type为"saturate"时）
-    float getSaturationValue() const {
-        if (type == "saturate" && !values.empty()) {
-            return values[0];
-        }
-        return 1.0f; // 默认饱和度
-    }
-    
-    // 获取颜色矩阵（当type为"matrix"时）
-    std::vector<float> getColorMatrix() const {
-        if (type == "matrix" && values.size() >= 20) {
-            return values;
-        }
-        // 返回单位矩阵
-        return {1,0,0,0,0, 0,1,0,0,0, 0,0,1,0,0, 0,0,0,1,0};
-    }
-    
-    // 检查是否为有效的FeColorMatrix
-    bool isValid() const {
-        if (type == "saturate") {
-            return !values.empty();
-        } else if (type == "matrix") {
-            return values.size() >= 20;
-        } else if (type == "hueRotate") {
-            return !values.empty();
-        } else if (type == "luminanceToAlpha") {
-            return true; // 不需要values
-        }
-        return false;
-    }
-    
-    // 获取输入源类型
-    std::string getInputSource() const {
-        return in;
-    }
-};
-
-// FeBlend信息结构
-struct FeBlendInfo {
-    std::string in = "SourceGraphic";   // 第一个输入源
-    std::string in2 = "";               // 第二个输入源
-    std::string mode = "normal";        // 混合模式
-    
-    FeBlendInfo() = default;
-    FeBlendInfo(const std::string& input1, const std::string& input2, const std::string& blendMode) 
-        : in(input1), in2(input2), mode(blendMode) {}
-    
-    // 检查是否为有效的混合模式
-    bool isValidMode() const {
-        return mode == "normal" || mode == "multiply" || mode == "screen" || 
-               mode == "darken" || mode == "lighten";
-    }
-};
-
-// Filter管理器类
-class FilterManager {
-public:
-    // 单例模式
-    static FilterManager& getInstance() {
-        static FilterManager instance;
-        return instance;
-    }
-    
-    // 注册Filter和FeColorMatrix的映射
-    void registerFilter(const std::string& filterId, std::shared_ptr<FeColorMatrixInfo> feColorMatrixInfo) {
-        if (!filterId.empty() && feColorMatrixInfo) {
-            filterMap_[filterId] = feColorMatrixInfo;
-        }
-    }
-    
-    // 根据Filter ID获取FeColorMatrix信息
-    std::shared_ptr<FeColorMatrixInfo> getFeColorMatrixInfo(const std::string& filterId) const {
-        auto it = filterMap_.find(filterId);
-        if (it != filterMap_.end()) {
-            return it->second;
-        }
-        return nullptr;
-    }
-    
-    // 检查Filter是否存在
-    bool hasFilter(const std::string& filterId) const {
-        return filterMap_.find(filterId) != filterMap_.end();
-    }
-    
-    // 清除所有Filter映射
-    void clearAllFilters() {
-        filterMap_.clear();
-        blendFilterMap_.clear();
-    }
-    
-    // 移除指定Filter
-    void removeFilter(const std::string& filterId) {
-        filterMap_.erase(filterId);
-        blendFilterMap_.erase(filterId);
-    }
-    
-    // ========== FeBlend 相关方法 ==========
-    
-    // 注册FeBlend过滤器
-    void registerBlendFilter(const std::string& filterId, std::shared_ptr<FeBlendInfo> feBlendInfo) {
-        if (!filterId.empty() && feBlendInfo) {
-            blendFilterMap_[filterId] = feBlendInfo;
-        }
-    }
-    
-    // 获取FeBlend信息
-    std::shared_ptr<FeBlendInfo> getFeBlendInfo(const std::string& filterId) const {
-        auto it = blendFilterMap_.find(filterId);
-        if (it != blendFilterMap_.end()) {
-            return it->second;
-        }
-        return nullptr;
-    }
-    
-    // 检查FeBlend Filter是否存在
-    bool hasBlendFilter(const std::string& filterId) const {
-        return blendFilterMap_.find(filterId) != blendFilterMap_.end();
-    }
-    
-    // 获取所有Filter ID
-    std::vector<std::string> getAllFilterIds() const {
-        std::vector<std::string> ids;
-        for (const auto& pair : filterMap_) {
-            ids.push_back(pair.first);
-        }
-        return ids;
-    }
-    
-    // 解析Filter URL（例如："url(#myFilter)" -> "myFilter"）
-    static std::string parseFilterUrl(const std::string& filterUrl) {
-        if (filterUrl.empty()) return "";
-        
-        // 查找"url(#"
-        size_t start = filterUrl.find("url(#");
-        if (start != std::string::npos) {
-            start += 5; // 跳过"url(#"
-            size_t end = filterUrl.find(")", start);
-            if (end != std::string::npos) {
-                return filterUrl.substr(start, end - start);
-            }
-        }
-        
-        // 如果没有找到"url(#"格式，检查是否直接是ID
-        if (filterUrl.front() == '#') {
-            return filterUrl.substr(1);
-        }
-        
-        return filterUrl;
-    }
-
-private:
-    FilterManager() = default;
-    ~FilterManager() = default;
-    FilterManager(const FilterManager&) = delete;
-    FilterManager& operator=(const FilterManager&) = delete;
-    
-    std::unordered_map<std::string, std::shared_ptr<FeColorMatrixInfo>> filterMap_;
-    std::unordered_map<std::string, std::shared_ptr<FeBlendInfo>> blendFilterMap_;
-};
-
-} // 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 <string>
+#include <vector>
+#include <unordered_map>
+#include <memory>
+#include <glog/logging.h>
+
+namespace rnoh {
+namespace svg {
+
+// FeColorMatrix信息结构
+struct FeColorMatrixInfo {
+    std::string type = "saturate";
+    std::vector<float> values = {1.0f};
+    std::string in = "SourceGraphic";  // 默认输入源为 SourceGraphic
+    
+    FeColorMatrixInfo() = default;
+    FeColorMatrixInfo(const std::string& t, const std::vector<float>& v) : type(t), values(v) {}
+    FeColorMatrixInfo(const std::string& t, const std::vector<float>& v, const std::string& inputSource) 
+        : type(t), values(v), in(inputSource) {}
+    
+    // 获取饱和度值（当type为"saturate"时）
+    float getSaturationValue() const {
+        if (type == "saturate" && !values.empty()) {
+            return values[0];
+        }
+        return 1.0f; // 默认饱和度
+    }
+    
+    // 获取颜色矩阵（当type为"matrix"时）
+    std::vector<float> getColorMatrix() const {
+        if (type == "matrix" && values.size() >= 20) {
+            return values;
+        }
+        // 返回单位矩阵
+        return {1,0,0,0,0, 0,1,0,0,0, 0,0,1,0,0, 0,0,0,1,0};
+    }
+    
+    // 检查是否为有效的FeColorMatrix
+    bool isValid() const {
+        if (type == "saturate") {
+            return !values.empty();
+        } else if (type == "matrix") {
+            return values.size() >= 20;
+        } else if (type == "hueRotate") {
+            return !values.empty();
+        } else if (type == "luminanceToAlpha") {
+            return true; // 不需要values
+        }
+        return false;
+    }
+    
+    // 获取输入源类型
+    std::string getInputSource() const {
+        return in;
+    }
+};
+
+// FeBlend信息结构
+struct FeBlendInfo {
+    std::string in = "SourceGraphic";   // 第一个输入源
+    std::string in2 = "";               // 第二个输入源
+    std::string mode = "normal";        // 混合模式
+    
+    FeBlendInfo() = default;
+    FeBlendInfo(const std::string& input1, const std::string& input2, const std::string& blendMode) 
+        : in(input1), in2(input2), mode(blendMode) {}
+    
+    // 检查是否为有效的混合模式
+    bool isValidMode() const {
+        return mode == "normal" || mode == "multiply" || mode == "screen" || 
+               mode == "darken" || mode == "lighten";
+    }
+};
+
+// Filter管理器类
+class FilterManager {
+public:
+    // 单例模式
+    static FilterManager& getInstance() {
+        static FilterManager instance;
+        return instance;
+    }
+    
+    // 注册Filter和FeColorMatrix的映射
+    void registerFilter(const std::string& filterId, std::shared_ptr<FeColorMatrixInfo> feColorMatrixInfo) {
+        if (!filterId.empty() && feColorMatrixInfo) {
+            filterMap_[filterId] = feColorMatrixInfo;
+        }
+    }
+    
+    // 根据Filter ID获取FeColorMatrix信息
+    std::shared_ptr<FeColorMatrixInfo> getFeColorMatrixInfo(const std::string& filterId) const {
+        auto it = filterMap_.find(filterId);
+        if (it != filterMap_.end()) {
+            return it->second;
+        }
+        return nullptr;
+    }
+    
+    // 检查Filter是否存在
+    bool hasFilter(const std::string& filterId) const {
+        return filterMap_.find(filterId) != filterMap_.end();
+    }
+    
+    // 清除所有Filter映射
+    void clearAllFilters() {
+        filterMap_.clear();
+        blendFilterMap_.clear();
+    }
+    
+    // 移除指定Filter
+    void removeFilter(const std::string& filterId) {
+        filterMap_.erase(filterId);
+        blendFilterMap_.erase(filterId);
+    }
+    
+    // ========== FeBlend 相关方法 ==========
+    
+    // 注册FeBlend过滤器
+    void registerBlendFilter(const std::string& filterId, std::shared_ptr<FeBlendInfo> feBlendInfo) {
+        if (!filterId.empty() && feBlendInfo) {
+            blendFilterMap_[filterId] = feBlendInfo;
+        }
+    }
+    
+    // 获取FeBlend信息
+    std::shared_ptr<FeBlendInfo> getFeBlendInfo(const std::string& filterId) const {
+        auto it = blendFilterMap_.find(filterId);
+        if (it != blendFilterMap_.end()) {
+            return it->second;
+        }
+        return nullptr;
+    }
+    
+    // 检查FeBlend Filter是否存在
+    bool hasBlendFilter(const std::string& filterId) const {
+        return blendFilterMap_.find(filterId) != blendFilterMap_.end();
+    }
+    
+    // 获取所有Filter ID
+    std::vector<std::string> getAllFilterIds() const {
+        std::vector<std::string> ids;
+        for (const auto& pair : filterMap_) {
+            ids.push_back(pair.first);
+        }
+        return ids;
+    }
+    
+    // 解析Filter URL（例如："url(#myFilter)" -> "myFilter"）
+    static std::string parseFilterUrl(const std::string& filterUrl) {
+        if (filterUrl.empty()) return "";
+        
+        // 查找"url(#"
+        size_t start = filterUrl.find("url(#");
+        if (start != std::string::npos) {
+            start += 5; // 跳过"url(#"
+            size_t end = filterUrl.find(")", start);
+            if (end != std::string::npos) {
+                return filterUrl.substr(start, end - start);
+            }
+        }
+        
+        // 如果没有找到"url(#"格式，检查是否直接是ID
+        if (filterUrl.front() == '#') {
+            return filterUrl.substr(1);
+        }
+        
+        return filterUrl;
+    }
+
+private:
+    FilterManager() = default;
+    ~FilterManager() = default;
+    FilterManager(const FilterManager&) = delete;
+    FilterManager& operator=(const FilterManager&) = delete;
+    
+    std::unordered_map<std::string, std::shared_ptr<FeColorMatrixInfo>> filterMap_;
+    std::unordered_map<std::string, std::shared_ptr<FeBlendInfo>> blendFilterMap_;
+};
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/ets/RNSVGImageModule.ts

@@ -1,21 +1,21 @@
-/*
- * 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.
- */
-
-import { TurboModule } from "@rnoh/react-native-openharmony/ts";
-
-export class RNSVGImageModule extends TurboModule {
-  public static readonly NAME = 'RNSVGImageModule';
-
-  constructor(ctx: any) {
-    super(ctx);
-    console.log('[kuang] RNSVGImageModule')
-  }
-
-
-  getCacheDir() {
-    return this.ctx.uiAbilityContext.cacheDir;
-  }
-}
+/*
+ * 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.
+ */
+
+import { TurboModule } from "@rnoh/react-native-openharmony/ts";
+
+export class RNSVGImageModule extends TurboModule {
+  public static readonly NAME = 'RNSVGImageModule';
+
+  constructor(ctx: any) {
+    super(ctx);
+    console.log('[kuang] RNSVGImageModule')
+  }
+
+
+  getCacheDir() {
+    return this.ctx.uiAbilityContext.cacheDir;
+  }
+}

package/harmony/svg/src/main/ets/RNSVGRenderableModule.ts

@@ -1,16 +1,16 @@
-/*
- * 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.
- */
-
-import { TurboModule } from '@rnoh/react-native-openharmony/ts';
-
-export class RNSVGRenderableModule extends TurboModule {
-  public static readonly NAME = 'RNSVGRenderableModule';
-
-  constructor(ctx: any) {
-    super(ctx);
-    console.log('[kuang] RNSVGRenderableModule')
-  }
-}
+/*
+ * 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.
+ */
+
+import { TurboModule } from '@rnoh/react-native-openharmony/ts';
+
+export class RNSVGRenderableModule extends TurboModule {
+  public static readonly NAME = 'RNSVGRenderableModule';
+
+  constructor(ctx: any) {
+    super(ctx);
+    console.log('[kuang] RNSVGRenderableModule')
+  }
+}

package/harmony/svg/src/main/ets/RNSVGSvgViewModule.ts

@@ -1,18 +1,18 @@
-/*
- * 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.
- */
-
-import { TurboModule } from '@rnoh/react-native-openharmony/ts';
-
-export class RNSVGSvgViewModule extends TurboModule {
-  public static readonly NAME = 'RNSVGSvgViewModule';
-
-  constructor(ctx: any) {
-    super(ctx);
-
-
-    console.log('[kuang] RNSVGSvgViewModule')
-  }
-}
+/*
+ * 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.
+ */
+
+import { TurboModule } from '@rnoh/react-native-openharmony/ts';
+
+export class RNSVGSvgViewModule extends TurboModule {
+  public static readonly NAME = 'RNSVGSvgViewModule';
+
+  constructor(ctx: any) {
+    super(ctx);
+
+
+    console.log('[kuang] RNSVGSvgViewModule')
+  }
+}