修复死机问题

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp
index bba05ff..a45361b 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp
@@ -3,6 +3,8 @@
 #include "wearable_log.h"
 #include "common/image_cache_manager.h"
 #include "custom_utils.h"
+#include "vibrator_service.h"
+
 
 namespace OHOS
 {
@@ -187,6 +189,8 @@ namespace OHOS
         case THUNDERBIRD_ADJUSTVIEW_WARNING:
         {
             uapi_set_screen_on_api(); // 亮屏
+            //振动提醒
+            custom_VibratorFunc_int(0);
             if (TextLabel)
             {
                 TextLabel->SetPosition(112, 148, 248, 42);
@@ -195,8 +199,8 @@ namespace OHOS
             }
             if (RemindLabel)
             {
-                RemindLabel->SetPosition(80, 275, 200, 25);
-                RemindLabel->SetText("按     退出    按     重试");
+                RemindLabel->SetPosition(132, 284, 96, 28);
+                RemindLabel->SetText("按      退出");
                 RemindLabel->SetVisible(true);
             }
             if (RemindIcon)

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
index 3ab811e..2ac2db9 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
@@ -1930,12 +1930,18 @@
         if(screenImageAsEmoji == 0)
         {
             //关闭屏保模式
+            if(ThunderBirdMainView::GetInstance())
+            {
             ThunderBirdMainView::GetInstance()->CloseScreenImageModel();
+            }
         }
         else
         {
             //打开屏保模式
-            ThunderBirdMainView::GetInstance()->OpenScreenImageModel();
+            if(ThunderBirdMainView::GetInstance())
+            {
+                ThunderBirdMainView::GetInstance()->OpenScreenImageModel();
+            }
         }
 
         // SaveCharacterConfig(characterId, characterName, eyesShape, hairColor, eyesColor, hairStyle, screenImageAsEmoji);
@@ -2198,12 +2204,16 @@
         if(ThunderBirdMainView::GetInstance())
         {
         int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView();
-        ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_WARNING);
+        int currentSubView = ThunderBirdMainView::GetInstance()->GetCurrentSubView();
+        if(currentSubView != ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_WARNING && currentSubView != ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_NETWORK_CONNECTING)
+        {
+            ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_WARNING);
             if (ThunderBirdAdjustView::GetInstance()) {
                 ThunderBirdAdjustView::GetInstance()->UpdateTaskReminderText(message);
             }
         }
     }
+  }
 
     void ThunderBirdModel::HandleDownloadFile(int type)
     {

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
index 1cb6ac1..2ad5e74 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
@@ -2549,6 +2549,7 @@ static bool check_playback_completion_by_duration(void)
         
         // 触发单句语音播放完成事件
         if (g_ws_message_callback != NULL) {
+            push_audio_playback_start_notification();
             g_ws_message_callback(NULL, WS_CMD_SENTENCE_PLAYBACK_COMPLETE);
         }