From bc672478fa7d31f77fdc7883c433f28457db41ae Mon Sep 17 00:00:00 2001 From: coffee Date: Sun, 8 Dec 2024 18:10:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AE=8F=202.=20=E5=A2=9E=E5=8A=A0=E6=96=87=E6=9C=AC=E7=9A=84?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E9=BB=98=E8=AE=A4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDK/Data/HProgramInfo.h | 2 +- SDK/HXml.h | 95 ----------------------------------------- 2 files changed, 1 insertion(+), 96 deletions(-) diff --git a/SDK/Data/HProgramInfo.h b/SDK/Data/HProgramInfo.h index caf763d..f43b72c 100644 --- a/SDK/Data/HProgramInfo.h +++ b/SDK/Data/HProgramInfo.h @@ -75,7 +75,7 @@ struct TextInfo : public IProgramNode EffectInfo effect; ///< 特效 cat::HCatBuffer text; ///< 文本 - TextInfo() : guid("textGuid"), singleLine(false) {} + TextInfo() : guid("textGuid"), background("#000000"), singleLine(false) {} virtual void ToXml(HXml &xml) override { xml.NewChild(GetType()).ToXml(*this); } virtual bool FromXml(const HXml &xml) override { return xml.get_to(*this); } diff --git a/SDK/HXml.h b/SDK/HXml.h index 69f7448..a97f4e0 100644 --- a/SDK/HXml.h +++ b/SDK/HXml.h @@ -357,99 +357,4 @@ private: }; -#define CREATE_TAG_P(_doc, _parent, _node, _tagName) \ - _node = (_doc)->NewElement(_tagName); \ - if (_node == nullptr) { \ - code = cat::HErrorCode::kMemoryFailed; \ - break; \ - } else { \ - (_parent)->InsertEndChild(_node); \ - } - - -#define CREATE_TAG_ATTR(_doc, _node, _tagName, _attrName, _attrValue) \ - _node = (_doc)->NewElement(_tagName); \ - if (_node == nullptr) { \ - code = cat::HErrorCode::kMemoryFailed; \ - break; \ - } else { \ - _node->SetAttribute(_attrName, _attrValue); \ - } - - -#define CREATE_TAG_ATTR_P(_doc, _parent, _node, _tagName, _attrName, _attrValue)\ - _node = (_doc)->NewElement(_tagName); \ - if (_node == nullptr) { \ - code = cat::HErrorCode::kMemoryFailed; \ - break; \ - } else { \ - _node->SetAttribute(_attrName, _attrValue); \ - (_parent)->InsertEndChild(_node); \ - } - -#define PARSE_TAG_ATTR_P(_parent, _node, _tagName, _attrName, _attrValue) \ - _node = (_parent)->FirstChildElement(_tagName); \ - if (_node == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else if (_node->FindAttribute(_attrName) == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else { \ - _attrValue = _node->Attribute(_attrName); \ - } - -#define PARSE_TAG_ATTR_P_TYPE(_parent, _node, _tagName, _attrName, _attrValue, _type) \ - _node = (_parent)->FirstChildElement(_tagName); \ - if (_node == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else if (_node->FindAttribute(_attrName) == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else { \ - _attrValue = DataToType<_type>(_node->Attribute(_attrName)); \ - } - - -#define PARSE_TAG_ATTR_P_NULL(_parent, _node, _tagName, _attrName, _attrValue) \ - _node = (_parent)->FirstChildElement(_tagName); \ - if (_node == nullptr) { \ - _attrValue = _type(); \ - } else if (_node->FindAttribute(_attrName) == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else { \ - _attrValue = _node->Attribute(_attrName); \ - } - - -#define PARSE_TAG_ATTR_P_NULL_TYPE(_parent, _node, _tagName, _attrName, _attrValue, _type) \ - _node = (_parent)->FirstChildElement(_tagName); \ - if (_node == nullptr) { \ - _attrValue = _type(); \ - } else if (_node->FindAttribute(_attrName) == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else { \ - _attrValue = DataToType<_type>(_node->Attribute(_attrName)); \ - } - - -#define PARSE_TAG_ATTR(_node, _tagName, _attrName, _attrValue) \ - if (_node->FindAttribute(_attrName) == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else { \ - _attrValue = _node->Attribute(_attrName); \ - } - -#define PARSE_TAG_ATTR_TYPE(_node, _tagName, _attrName, _attrValue, _type) \ - if (_node->FindAttribute(_attrName) == nullptr) { \ - code = cat::HErrorCode::kParseXmlFailed; \ - break; \ - } else { \ - _attrValue = DataToType<_type>(_node->Attribute(_attrName)); \ - } - #endif // HXML_H