并

diff --cc code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
Simple merge

diff --cc code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
Simple merge

diff --cc code/sdk/application/wearable/service/msg_center/CMakeLists.txt
index 8d1e0e9,c128b54..e096888
--- 1/code/sdk/application/wearable/service/msg_center/CMakeLists.txt
--- 2/code/sdk/application/wearable/service/msg_center/CMakeLists.txt
+++ b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt
@@@ -223,7 -223,9 +223,10 @@@ set(SOURCE
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/message_notification.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/sleep_notification.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/motion_recognition_notification.cpp
 +    ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/goal_notification.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/debug_output_notification/debug_output_notification_adapter.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/debug_output_notification/debug_output_notification_itemview.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/debug_output_notification/debug_output_notification.cpp
  )
  else()
  set(SOURCES
@@@ -240,8 -242,10 +243,11 @@@
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/transmitting.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/message_notification.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/sleep_notification.cpp
 +    ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/goal_notification.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/motion_recognition_notification.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/debug_output_notification/debug_output_notification_adapter.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/debug_output_notification/debug_output_notification_itemview.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/notify/debug_output_notification/debug_output_notification.cpp
  )
  endif()
  

diff --cc code/sdk/application/wearable/service/msg_center/include/notify/notification_manager.h
Simple merge

diff --cc code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 3926883,574f089..3c38cc2
--- 1/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
--- 2/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@@ -204,14 -201,9 +205,15 @@@ void MsgCenterSubscribe(
      MsgCenterSubscribeTopic(TOPIC_EVENT_DRINKREMINDER);
      MsgCenterSubscribeTopic(TOPIC_EVENT_MESSAGENOTE);
      MsgCenterSubscribeTopic(TOPIC_EVENT_SLEEPNOTE);
+     MsgCenterSubscribeTopic(TOPIC_EVENT_DEBUGOUTPUT);
  }
  
 +static OHOS::UIViewGroup* ShowGoalNotify(void)
 +{
 +    return OHOS::GoalviewShow();
 +}
 +
 +
  static OHOS::UIViewGroup* ShowAlarmNotify(void)
  {
      return OHOS::CreateAlarmView();