From d3f71277577ccbcf9b4fc5feee8e47f15a7cf435 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Wed, 19 Jul 2017 17:03:45 +0800
Subject: [PATCH] add img support

---
 .../core/parser/RichText.js                   | 24 ++++++++++++++++---
 .../reader/RichtextStringVisitor.cpp          | 17 +++++++++----
 .../reader/RichtextStringVisitor.h            |  3 ++-
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/RichText.js b/creator_project/packages/creator-luacpp-support/core/parser/RichText.js
index 48573076..66a43433 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/RichText.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/RichText.js
@@ -1,6 +1,6 @@
 const Node = require('./Node');
 const Label = require('./Label');
-const get_font_path_by_uuid = require('./Utils').get_font_path_by_uuid;
+const Utils = require('./Utils');
 
 class RichText extends Node {
     constructor(data) {
@@ -19,7 +19,6 @@ class RichText extends Node {
         // <outline xxx=yyy ...> -> <outline xxx='yyy' ...>
         var text = component._N$string;
         let regex = /(<outline color|width)=(\w*) (color|width)=(\w*)/;
-        var match = text.match(regex);
         text = text.replace(regex, "$1='$2' $3='$4'");
 
         // <br/> -> \n
@@ -29,6 +28,25 @@ class RichText extends Node {
         if (text[0] !== '<')
             text = '<font>' + text + '</font>';
 
+        // add sprite frames if there is img component
+        if (component._N$imageAtlas) {
+            // find sprite frame name
+            regex = /<img src=\'(\w+)\'/;
+            let resource = text.match(regex)[1];
+
+            // add sprite frames
+            let json_uuid = component._N$imageAtlas.__uuid__;
+            let json_content = Utils.get_sprite_frame_json_by_uuid(json_uuid);
+            let resource_uuid = json_content._spriteFrames[resource].__uuid__;
+            Utils.get_sprite_frame_name_by_uuid(resource_uuid);
+
+            // <img src='xx'/> -> <img scr='xxx' width='yyy' height='zzz'/>
+            let resource_json_content = Utils.get_sprite_frame_json_by_uuid(resource_uuid);
+            let resource_size = {width: resource_json_content.content.originalSize[0],
+                                 height: resource_json_content.content.originalSize[1]};
+            text = text.replace(/(<img\s+src=\'\w+\')/, "$1 width='" + resource_size.width + "' height='" + resource_size.height + "'");
+        }
+
         this._properties.text = text;
 
         this._properties.horizontalAlignment = Label.H_ALIGNMENTS[component._N$horizontalAlign];
@@ -37,7 +55,7 @@ class RichText extends Node {
         this._properties.lineHeight = component._N$lineHeight;
         let f = component._N$font;
         if (f)
-            this._properties.fontFilename = get_font_path_by_uuid(f.__uuid__);
+            this._properties.fontFilename = Utils.get_font_path_by_uuid(f.__uuid__);
     }
 }
 RichText.H_ALIGNMENTS = ['Left', 'Center', 'Right'];
diff --git a/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.cpp b/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.cpp
index fd6602a7..5b7bdcd9 100644
--- a/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.cpp
+++ b/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.cpp
@@ -3,6 +3,7 @@
 
 const std::string RichtextStringVisitor::COLOR_FLAG = "color=";
 const std::string RichtextStringVisitor::SIZE_FLAG = "size=";
+const std::string RichtextStringVisitor::IMG_FLAG = "img";
 
 const std::map<std::string, std::string> RichtextStringVisitor::COLOR_MAP = {
     {"white", "#ffffff"},
@@ -64,10 +65,15 @@ void RichtextStringVisitor::startElement(void *ctx, const char *name, const char
             _outputXML.append("=");
             
             _outputXML.append("\"");
-            std::string attributeValue = convertAttributeValue(attributeName, *atts++);
+            std::string attributeValue = convertAttributeValue(name, attributeName, *atts++);
             _outputXML.append(attributeValue);
             _outputXML.append("\"");
         }
+        // the resource type is a sprite frame name
+        // creator only supports sprite frame for img tag
+        if (name == RichtextStringVisitor::IMG_FLAG)
+            _outputXML.append(" type='1' ");
+        
         _outputXML.append(">");
         
         _addFontEndFlags.push(false);
@@ -126,10 +132,13 @@ std::string RichtextStringVisitor::convertAttributeName(const std::string& tagNa
         return attributeName;
 }
 
-std::string RichtextStringVisitor::convertAttributeValue(const std::string& attributeName, const std::string& attributeValue) const
+std::string RichtextStringVisitor::convertAttributeValue(const std::string& tagName, const std::string& attributeName, const std::string& attributeValue) const
 {
     if (attributeName == "color")
         return convertColorString2Hex(attributeValue);
-    else
-        return attributeValue;
+    
+    if (tagName == RichtextStringVisitor::IMG_FLAG && attributeName == "src")
+        return attributeValue + ".png";
+    
+    return attributeValue;
 }
diff --git a/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.h b/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.h
index a8eedb32..82e8a1b8 100644
--- a/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.h
+++ b/creator_project/packages/creator-luacpp-support/reader/RichtextStringVisitor.h
@@ -19,10 +19,11 @@ class RichtextStringVisitor : public cocos2d::SAXDelegator
     
     std::string convertColorString2Hex(const std::string& colorString) const;
     std::string convertAttributeName(const std::string& tagName, const std::string& attributeName) const;
-    std::string convertAttributeValue(const std::string& attributeName, const std::string& attributeValue) const;
+    std::string convertAttributeValue(const std::string& tagName, const std::string& attributeName, const std::string& attributeValue) const;
     
     const static std::string COLOR_FLAG;
     const static std::string SIZE_FLAG;
+    const static std::string IMG_FLAG;
     const static std::map<std::string, std::string> COLOR_MAP;
     
     std::string _outputXML;