feat(ohos): fix alt image setting

sohotz · Aug 16, 2024 · f45e59d · f45e59d
1 parent 0adabe7
commit f45e59d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/framework/ohos/src/main/cpp/impl/renderer/native/include/renderer/components/image_view.h b/framework/ohos/src/main/cpp/impl/renderer/native/include/renderer/components/image_view.h
@@ -43,6 +43,7 @@ class ImageView : public BaseView, public ImageNodeDelegate {
   std::string GetSrc();
 
 protected:
+  virtual void FetchAltImage(const std::string &imageUrl);
   virtual void FetchImage(const std::string &imageUrl);
 
 private:

diff --git a/...src/main/cpp/impl/renderer/native/include/renderer/components/rich_text_image_span_view.h b/...src/main/cpp/impl/renderer/native/include/renderer/components/rich_text_image_span_view.h
@@ -39,6 +39,7 @@ class RichTextImageSpanView : public BaseView {
   void UpdateRenderViewFrame(const HRRect &frame, const HRPadding &padding) override;
 
 private:
+  void FetchAltImage(const std::string &imageUrl);
   void fetchImage(const std::string &imageUrl);
 
   ImageSpanNode imageSpanNode_;

diff --git a/framework/ohos/src/main/cpp/impl/renderer/native/src/components/image_view.cc b/framework/ohos/src/main/cpp/impl/renderer/native/src/components/image_view.cc
@@ -76,8 +76,7 @@ bool ImageView::SetProp(const std::string &propKey, const HippyValue &propValue)
   } else if (propKey == "defaultSource") {
     auto value = HRValueUtils::GetString(propValue);
     if (!value.empty()) {
-      auto sourceUrl = HRUrlUtils::convertAssetImageUrl(value);
-      GetLocalRootArkUINode().SetAlt(sourceUrl);
+      FetchAltImage(value);
       return true;
     }
     return false;
@@ -114,6 +113,25 @@ void ImageView::UpdateRenderViewFrame(const HRRect &frame, const HRPadding &padd
   BaseView::UpdateRenderViewFrame(frame, padding);
 }
 
+void ImageView::FetchAltImage(const std::string &imageUrl) {
+  if (imageUrl.size() > 0) {
+    if (imageUrl.find(BASE64_IMAGE_PREFIX) == 0) {
+      GetLocalRootArkUINode().SetAlt(imageUrl);
+      return;
+    } else if (imageUrl.find(RAW_IMAGE_PREFIX) == 0) {
+      std::string convertUrl = ConvertToLocalPathIfNeeded(imageUrl);
+      GetLocalRootArkUINode().SetAlt(convertUrl);
+      return;
+    } else if (HRUrlUtils::isWebUrl(imageUrl)) {
+      GetLocalRootArkUINode().SetAlt(imageUrl);
+      return;
+    } else if (imageUrl.find(ASSET_PREFIX) == 0) {
+      std::string resourceStr = HRUrlUtils::convertAssetImageUrl(imageUrl);
+      GetLocalRootArkUINode().SetAlt(resourceStr);
+    }
+  }
+}
+
 void ImageView::FetchImage(const std::string &imageUrl) {
   if (imageUrl.size() > 0) {
     if (imageUrl.find(BASE64_IMAGE_PREFIX) == 0) {

diff --git a/framework/ohos/src/main/cpp/impl/renderer/native/src/components/rich_text_image_span_view.cc b/framework/ohos/src/main/cpp/impl/renderer/native/src/components/rich_text_image_span_view.cc
@@ -77,8 +77,7 @@ bool RichTextImageSpanView::SetProp(const std::string &propKey, const HippyValue
   } else if (propKey == "defaultSource") {
     auto value = HRValueUtils::GetString(propValue);
     if (!value.empty()) {
-      auto sourceUrl = HRUrlUtils::convertAssetImageUrl(value);
-      GetLocalRootArkUINode().SetAlt(sourceUrl);
+      FetchAltImage(value);
       return true;
     }
     return false;
@@ -97,6 +96,25 @@ void RichTextImageSpanView::UpdateRenderViewFrame(const HRRect &frame, const HRP
   }
 }
 
+void RichTextImageSpanView::FetchAltImage(const std::string &imageUrl) {
+  if (imageUrl.size() > 0) {
+    if (imageUrl.find(BASE64_IMAGE_PREFIX) == 0) {
+      GetLocalRootArkUINode().SetAlt(imageUrl);
+      return;
+    } else if (imageUrl.find(RAW_IMAGE_PREFIX) == 0) {
+      std::string convertUrl = ConvertToLocalPathIfNeeded(imageUrl);
+      GetLocalRootArkUINode().SetAlt(convertUrl);
+      return;
+    } else if (HRUrlUtils::isWebUrl(imageUrl)) {
+      GetLocalRootArkUINode().SetAlt(imageUrl);
+      return;
+    } else if (imageUrl.find(ASSET_PREFIX) == 0) {
+      std::string resourceStr = HRUrlUtils::convertAssetImageUrl(imageUrl);
+      GetLocalRootArkUINode().SetAlt(resourceStr);
+    }
+  }
+}
+
 void RichTextImageSpanView::fetchImage(const std::string &imageUrl) {
   if (imageUrl.size() > 0) {
     if (imageUrl.find(BASE64_IMAGE_PREFIX) == 0) {