From c97e627c20fe32d1a3fba38e063f5d11ddbd4cce Mon Sep 17 00:00:00 2001 From: anqi Date: Fri, 12 May 2023 17:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BF=BB=E8=AF=91=E4=B8=93?= =?UTF-8?q?=E5=AE=B6=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9api=E5=90=8D=20Sig?= =?UTF-8?q?ned-off-by:=20anqi=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OAT.xml | 69 +++++++++++++++++++ framework/common/tlv_util.h | 6 +- framework/common/udmf_types_util.cpp | 4 +- framework/innerkitsimpl/data/link.cpp | 2 +- .../test/unittest/udmf_client_test.cpp | 2 +- framework/jskitsimpl/data/link_napi.cpp | 2 +- framework/jskitsimpl/data/udmf_napi.cpp | 2 +- .../jskitsimpl/data/unified_data_napi.cpp | 2 +- interfaces/innerkits/common/unified_meta.h | 6 +- interfaces/jskits/module/udmf_napi_module.cpp | 4 +- 10 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 OAT.xml diff --git a/OAT.xml b/OAT.xml new file mode 100644 index 0000000..be058fd --- /dev/null +++ b/OAT.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + diff --git a/framework/common/tlv_util.h b/framework/common/tlv_util.h index a49aec9..cc50a8b 100644 --- a/framework/common/tlv_util.h +++ b/framework/common/tlv_util.h @@ -88,7 +88,7 @@ bool CountBufferSize(const std::shared_ptr &input, TLVObject &dat data.Count(text->GetDetails()); break; } - case UDType::HYPER_LINK: { + case UDType::HYPERLINK: { auto link = static_cast(input.get()); if (link == nullptr) { return false; @@ -836,7 +836,7 @@ bool Writing(const std::shared_ptr &input, TLVObject &data) } return Writing(*text, data); } - case UDType::HYPER_LINK: { + case UDType::HYPERLINK: { auto link = static_cast(input.get()); if (link == nullptr) { return false; @@ -997,7 +997,7 @@ bool Reading(std::shared_ptr &output, TLVObject &data) output = html; break; } - case UDType::HYPER_LINK: { + case UDType::HYPERLINK: { std::shared_ptr link = std::make_shared(); if (!Reading(*link, data)) { return false; diff --git a/framework/common/udmf_types_util.cpp b/framework/common/udmf_types_util.cpp index c0f25ab..c3fb2e7 100644 --- a/framework/common/udmf_types_util.cpp +++ b/framework/common/udmf_types_util.cpp @@ -50,7 +50,7 @@ template<> bool Marshalling(const std::shared_ptr &input, Message } return ITypesUtil::Marshal(parcel, *html); } - case HYPER_LINK: { + case HYPERLINK: { auto link = static_cast(input.get()); if (link == nullptr) { return false; @@ -158,7 +158,7 @@ template<> bool Unmarshalling(std::shared_ptr &output, MessagePar output = html; break; } - case HYPER_LINK: { + case HYPERLINK: { std::shared_ptr link = std::make_shared(); if (!ITypesUtil::Unmarshal(parcel, *link)) { return false; diff --git a/framework/innerkitsimpl/data/link.cpp b/framework/innerkitsimpl/data/link.cpp index c05359b..6ab4f99 100644 --- a/framework/innerkitsimpl/data/link.cpp +++ b/framework/innerkitsimpl/data/link.cpp @@ -30,7 +30,7 @@ Link::Link(const std::string &url, const std::string &description) if (url.length() >= MAX_TEXT_LEN || description.length() >= MAX_TEXT_LEN) { return; } - this->dataType_ = HYPER_LINK; + this->dataType_ = HYPERLINK; this->url_ = url; this->description_ = description; } diff --git a/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp b/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp index 44f9a09..56cc91d 100644 --- a/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp +++ b/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp @@ -394,7 +394,7 @@ HWTEST_F(UdmfClientTest, SetData005, TestSize.Level1) std::shared_ptr record2 = data2.GetRecordAt(0); ASSERT_NE(record2, nullptr); auto type = record2->GetType(); - ASSERT_EQ(type, UDType::HYPER_LINK); + ASSERT_EQ(type, UDType::HYPERLINK); auto text2 = static_cast(record2.get()); ASSERT_NE(text2, nullptr); diff --git a/framework/jskitsimpl/data/link_napi.cpp b/framework/jskitsimpl/data/link_napi.cpp index c591ef5..90abd4f 100644 --- a/framework/jskitsimpl/data/link_napi.cpp +++ b/framework/jskitsimpl/data/link_napi.cpp @@ -37,7 +37,7 @@ napi_value LinkNapi::Constructor(napi_env env) DECLARE_NAPI_GETTER_SETTER("description", GetDescription, SetDescription), }; size_t count = sizeof(properties) / sizeof(properties[0]); - return NapiDataUtils::DefineClass(env, "HyperLink", properties, count, LinkNapi::New); + return NapiDataUtils::DefineClass(env, "Hyperlink", properties, count, LinkNapi::New); } napi_value LinkNapi::New(napi_env env, napi_callback_info info) diff --git a/framework/jskitsimpl/data/udmf_napi.cpp b/framework/jskitsimpl/data/udmf_napi.cpp index 0617ab2..a1463e8 100644 --- a/framework/jskitsimpl/data/udmf_napi.cpp +++ b/framework/jskitsimpl/data/udmf_napi.cpp @@ -41,7 +41,7 @@ napi_value UDMFNapi::CreateUnifiedDataType(napi_env env, napi_callback_info info SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(TEXT), UD_TYPE_MAP.at(TEXT)); SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(PLAIN_TEXT), UD_TYPE_MAP.at(PLAIN_TEXT)); SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(HTML), UD_TYPE_MAP.at(HTML)); - SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(HYPER_LINK), UD_TYPE_MAP.at(HYPER_LINK)); + SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(HYPERLINK), UD_TYPE_MAP.at(HYPERLINK)); SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(FILE), UD_TYPE_MAP.at(FILE)); SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(IMAGE), UD_TYPE_MAP.at(IMAGE)); SetNamedProperty(env, unifiedDataType, JS_UD_TYPE_NAME_MAP.at(VIDEO), UD_TYPE_MAP.at(VIDEO)); diff --git a/framework/jskitsimpl/data/unified_data_napi.cpp b/framework/jskitsimpl/data/unified_data_napi.cpp index e29cc7d..01f5eab 100644 --- a/framework/jskitsimpl/data/unified_data_napi.cpp +++ b/framework/jskitsimpl/data/unified_data_napi.cpp @@ -160,7 +160,7 @@ void UnifiedDataNapi::GetRecord(napi_env env, std::shared_ptr in, HtmlNapi::NewInstance(env, in, out); break; } - case HYPER_LINK: { + case HYPERLINK: { LinkNapi::NewInstance(env, in, out); break; } diff --git a/interfaces/innerkits/common/unified_meta.h b/interfaces/innerkits/common/unified_meta.h index b50b35c..d718e3f 100644 --- a/interfaces/innerkits/common/unified_meta.h +++ b/interfaces/innerkits/common/unified_meta.h @@ -33,7 +33,7 @@ enum UDType : int32_t { TEXT = 0, PLAIN_TEXT, STYLED_TEXT, - HYPER_LINK, + HYPERLINK, HTML, FILE, FOLDER, @@ -57,7 +57,7 @@ static const std::unordered_map UD_TYPE_MAP { { TEXT, "Text" }, { PLAIN_TEXT, "Text.PlainText" }, { STYLED_TEXT, "Text.StyledText" }, - { HYPER_LINK, "Text.HyperLink" }, + { HYPERLINK, "Text.Hyperlink" }, { HTML, "Text.HTML" }, { FILE, "File" }, { FOLDER, "File.Folder" }, @@ -80,7 +80,7 @@ static const std::unordered_map UD_TYPE_MAP { static const std::unordered_map JS_UD_TYPE_NAME_MAP { { TEXT, "TEXT" }, { PLAIN_TEXT, "PLAIN_TEXT" }, - { HYPER_LINK, "HYPER_LINK" }, + { HYPERLINK, "HYPERLINK" }, { HTML, "HTML" }, { FILE, "FILE" }, { IMAGE, "IMAGE" }, diff --git a/interfaces/jskits/module/udmf_napi_module.cpp b/interfaces/jskits/module/udmf_napi_module.cpp index 98948da..e4a7737 100644 --- a/interfaces/jskits/module/udmf_napi_module.cpp +++ b/interfaces/jskits/module/udmf_napi_module.cpp @@ -49,8 +49,8 @@ static napi_value Init(napi_env env, napi_value exports) LOG_INFO(UDMF_KITS_NAPI, "init Text %{public}d", status); status = napi_set_named_property(env, exports, "PlainText", OHOS::UDMF::PlainTextNapi::Constructor(env)); LOG_INFO(UDMF_KITS_NAPI, "init PlainText %{public}d", status); - status = napi_set_named_property(env, exports, "HyperLink", OHOS::UDMF::LinkNapi::Constructor(env)); - LOG_INFO(UDMF_KITS_NAPI, "init HyperLink %{public}d", status); + status = napi_set_named_property(env, exports, "Hyperlink", OHOS::UDMF::LinkNapi::Constructor(env)); + LOG_INFO(UDMF_KITS_NAPI, "init Hyperlink %{public}d", status); status = napi_set_named_property(env, exports, "HTML", OHOS::UDMF::HtmlNapi::Constructor(env)); LOG_INFO(UDMF_KITS_NAPI, "init HTML %{public}d", status); status = napi_set_named_property(env, exports, "File", OHOS::UDMF::FileNapi::Constructor(env)); -- Gitee