Merge branch 'sdk650pathc0423' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...

diff --cc code/sdk/application/wearable/ln/nativeapp/nativeui/include/uiservice/ui_service.h
index f346a47,a4026b2..a44a75d
--- 1/code/sdk/application/wearable/ln/nativeapp/nativeui/include/uiservice/ui_service.h
--- 2/code/sdk/application/wearable/ln/nativeapp/nativeui/include/uiservice/ui_service.h
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/include/uiservice/ui_service.h
@@@ -65,9 -65,9 +65,10 @@@ typedef enum 
      HAND_DOWNLOAD_SUCCESS_NOTIFY, // 下载成功通知
      HAND_DOWNLOAD_FAIL_NOTIFY, // 下载失败通知
      HAND_DOWNLOAD_PROGRESS_NOTIFY, // 下载进度通知
+     HAND_AUDIO_PLAYBACK_START_NOTIFY, // 音频播放开始通知
      HAND_AUDIO_PLAYBACK_END_NOTIFY, // 音频播放结束通知
      HAND_NPC_EMOTION_CHANGE_NOTIFY, // npc表情变化通知
 +    HAND_TIMELINE_STATUS_CHANGE_NOTIFY, // 时间线状态变化通知
      MAX_NUM_HANDLER, 
  } UiServiceMsgId;
  

diff --cc code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp
index 6454491,73d5d77..27980e2
--- 1/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp
--- 2/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp
@@@ -101,9 -101,9 +101,10 @@@ static void HandDownloadFileNotify(Requ
  static void HandDownloadSuccessNotify(Request *request);
  static void HandDownloadFailNotify(Request *request);
  static void HandDownloadProgressNotify(Request *request);
+ static void HandAudioPlaybackStartNotify(Request *request);
  static void HandAudioPlaybackEndNotify(Request *request);
  static void HandNpcEmotionChangeNotify(Request *request);
 +static void HandTimelineStatusChangeNotify(Request *request);
  // 消息处理程序项数组(每个消息类型对应一个处理函数，函数名以 Handle 开头)
  MsgHandlerEntry msgHandlers[] = {
      {HANDLE_JUMP_OTA_VIEW, HandleJumpOtaView},
@@@ -121,9 -121,9 +122,10 @@@
      {HAND_DOWNLOAD_SUCCESS_NOTIFY,HandDownloadSuccessNotify},
      {HAND_DOWNLOAD_FAIL_NOTIFY,HandDownloadFailNotify},
      {HAND_DOWNLOAD_PROGRESS_NOTIFY,HandDownloadProgressNotify},
+     {HAND_AUDIO_PLAYBACK_START_NOTIFY,HandAudioPlaybackStartNotify},
      {HAND_AUDIO_PLAYBACK_END_NOTIFY,HandAudioPlaybackEndNotify},
      {HAND_NPC_EMOTION_CHANGE_NOTIFY,HandNpcEmotionChangeNotify},
 +    {HAND_TIMELINE_STATUS_CHANGE_NOTIFY,HandTimelineStatusChangeNotify},
  };
  /* -------------------------------------------------------------------------- */
  void ScreenTurnOn(int32_t timeout)
@@@ -624,14 -632,9 +634,16 @@@ void HandNpcEmotionChangeNotify(Reques
      WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandNpcEmotionChangeNotify msg_id = %d", request->msgId);
      std::string emotion(static_cast<char*>(request->data), request->len);
      WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandNpcEmotionChangeNotify emotion = %s", emotion.c_str());
+     GraphicService::GetInstance()->PostGraphicEvent(
+         std::bind(&OHOS::ThunderBirdModel::HandleNpcEmotionChange,OHOS::ThunderBirdModel::GetInstance(),emotion.c_str()));
  }
 +// 通知时间线状态变化
 +void HandTimelineStatusChangeNotify(Request *request)
 +{
 +    WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify msg_id = %d", request->msgId);
 +    std::string payload(static_cast<char*>(request->data), request->len);
 +    WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify payload = %s", payload.c_str());
 +}
  /* -------------------------------------------------------------------------- */
  #ifdef __cplusplus
  }

diff --cc code/sdk/zhihui/leiniao/imsl_ln/ln_api.c
Simple merge

diff --cc code/sdk/zhihui/leiniao/ln_api_cpp/ln_api_interface.cpp
Simple merge

diff --cc code/sdk/zhihui/leiniao/ln_api_cpp/ln_api_interface.h
Simple merge