修复对话退出

diff --git a/code/sdk/application/brandy/brandy_recovery/recovery_display.c b/code/sdk/application/brandy/brandy_recovery/recovery_display.c
index f49f1d8..1ea9c3e 100644 (file)
--- a/code/sdk/application/brandy/brandy_recovery/recovery_display.c
+++ b/code/sdk/application/brandy/brandy_recovery/recovery_display.c
@@ -111,17 +111,19 @@ static errcode_t recovery_dispay_layer_and_surface_init(ext_dpu_surface *surface
 
 void recovery_display_sample(void)
  {
-    
-     errcode_t ret;
+    PRINT("recovery_display_sample\n");
+    errcode_t ret;
      td_handle dpu_handle;
      ext_dpu_surface surface = {0};
      ext_dpu_layer_info layer_info = {0};
-#ifdef LEINIAO
+     #ifdef BOARD_LEINIAO
      ext_rect update_rect = {0, 0, 360, 360}; // 定义一个局部区域
- #else
-     ext_rect update_rect = {0, 0, 450, 450}; // 定义一个局部区域
+      #else
+     ext_rect update_rect = {0, 0, 466, 466}; // 定义一个局部区域
+     #endif
+
      // ext_rect update_rect = {223, 223, 20, 20}; // 定义一个局部区域
- #endif
+ 
      recovery_dispay_layer_and_surface_init(&surface, &layer_info, &update_rect);
      // 设置layer全白色, 也可以使用接口 recovery_dispay_read_image_and_savein_surface 实现从文件系统读图片
      /* image_tool 图片压缩参数如下：
@@ -132,9 +134,11 @@ void recovery_display_sample(void)
      */
      // memset_s((void *)surface.phy_addr, surface.size, 0xFF, surface.size);
  #ifdef SINGLE_USER_PARTITION
-     recovery_dispay_read_image_and_savein_surface("/user/system/OTAUpdataRecover.bin",&surface);
- #elif defined LEINIAO
+     #ifdef BOARD_LEINIAO
      recovery_dispay_read_image_and_savein_surface("/user/system/SystemUpdateing.bin",&surface);
+    #else
+     recovery_dispay_read_image_and_savein_surface("/user/system/OTAUpdataRecover.bin",&surface);
+    #endif
  #else
      recovery_dispay_read_image_and_savein_surface("/system/OTAUpdataRecover.bin",&surface);
  #endif

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
index da0abc9..ae8b361 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
@@ -663,8 +663,8 @@ namespace OHOS
             {
               
                 // 停止实际的音频播放
-                ai_media_play_stop();
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdDialogueView::AudioPlaybackEnd: Stopped audio playback");
+                // ai_media_play_stop();
+                // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdDialogueView::AudioPlaybackEnd: Stopped audio playback");
                 ln_ws_end_audio_chat();//结束对话
                 // 退出对话模式时恢复表情
                 AI_ForceInterrupt();