diff --git a/interfaces/kits/js/@ohos.notification.d.ts b/interfaces/kits/js/@ohos.notification.d.ts index aed59524ffafaa4c54e61bcaad1827cd9737ea7d..557c41e743ce7d73fc0eb042f7a4ad235c340792 100644 --- a/interfaces/kits/js/@ohos.notification.d.ts +++ b/interfaces/kits/js/@ohos.notification.d.ts @@ -206,11 +206,6 @@ declare namespace notification { */ NOTIFICATION_CONTENT_PICTURE, - /** - * Conversation notification. - */ - NOTIFICATION_CONTENT_CONVERSATION, - /** * Multi-line text notification. */ diff --git a/interfaces/kits/napi/ans/include/common.h b/interfaces/kits/napi/ans/include/common.h index 94f053a3e5607345c648da912fcc155c467a22b2..2d4222537659d4cb117ae317c37083d470723982 100644 --- a/interfaces/kits/napi/ans/include/common.h +++ b/interfaces/kits/napi/ans/include/common.h @@ -33,7 +33,6 @@ enum class ContentType { NOTIFICATION_CONTENT_BASIC_TEXT, NOTIFICATION_CONTENT_LONG_TEXT, NOTIFICATION_CONTENT_PICTURE, - NOTIFICATION_CONTENT_CONVERSATION, NOTIFICATION_CONTENT_MULTILINE }; diff --git a/interfaces/kits/napi/ans/src/common.cpp b/interfaces/kits/napi/ans/src/common.cpp index 3e67eac60b6fafeeffa7abf9111fa1eabf69f6fc..83861a011f78a05ad5783e35f9c81740af197b9e 100644 --- a/interfaces/kits/napi/ans/src/common.cpp +++ b/interfaces/kits/napi/ans/src/common.cpp @@ -718,12 +718,6 @@ napi_value Common::SetNotificationContentDetailed(const napi_env &env, const Con if (ret) { napi_set_named_property(env, result, "picture", contentResult); } - } else if (type == ContentType::NOTIFICATION_CONTENT_CONVERSATION) { - // conversation?: NotificationConversationalContent - ret = SetNotificationConversationalContent(env, basicContent.get(), contentResult); - if (ret) { - napi_set_named_property(env, result, "conversation", contentResult); - } } else if (type == ContentType::NOTIFICATION_CONTENT_MULTILINE) { // multiLine?: NotificationMultiLineContent ret = SetNotificationMultiLineContent(env, basicContent.get(), contentResult); @@ -3473,9 +3467,6 @@ bool Common::ContentTypeJSToC(const ContentType &inType, NotificationContent::Ty case ContentType::NOTIFICATION_CONTENT_PICTURE: outType = NotificationContent::Type::PICTURE; break; - case ContentType::NOTIFICATION_CONTENT_CONVERSATION: - outType = NotificationContent::Type::CONVERSATION; - break; default: ANS_LOGE("ContentType %{public}d is an invalid value", inType); return false; @@ -3498,9 +3489,6 @@ bool Common::ContentTypeCToJS(const NotificationContent::Type &inType, ContentTy case NotificationContent::Type::PICTURE: outType = ContentType::NOTIFICATION_CONTENT_PICTURE; break; - case NotificationContent::Type::CONVERSATION: - outType = ContentType::NOTIFICATION_CONTENT_CONVERSATION; - break; default: ANS_LOGE("ContentType %{public}d is an invalid value", inType); return false; diff --git a/interfaces/kits/napi/ans/src/constant.cpp b/interfaces/kits/napi/ans/src/constant.cpp index 96e3e4219c91e44422b9dafd44cc1354fb038404..26eb76d279f468d2357cb99a2b3e5b6e6081b096 100644 --- a/interfaces/kits/napi/ans/src/constant.cpp +++ b/interfaces/kits/napi/ans/src/constant.cpp @@ -208,8 +208,6 @@ napi_value ContentTypeInit(napi_env env, napi_value exports) env, obj, (int32_t)ContentType::NOTIFICATION_CONTENT_LONG_TEXT, "NOTIFICATION_CONTENT_LONG_TEXT"); SetNamedPropertyByInteger( env, obj, (int32_t)ContentType::NOTIFICATION_CONTENT_PICTURE, "NOTIFICATION_CONTENT_PICTURE"); - SetNamedPropertyByInteger( - env, obj, (int32_t)ContentType::NOTIFICATION_CONTENT_CONVERSATION, "NOTIFICATION_CONTENT_CONVERSATION"); SetNamedPropertyByInteger( env, obj, (int32_t)ContentType::NOTIFICATION_CONTENT_MULTILINE, "NOTIFICATION_CONTENT_MULTILINE");