Cat1_29升级判断

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 cdbc4ac..27ab990 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
@@ -35,6 +35,7 @@
 #include "battery_hal.h"
 #endif
  #include "ln_api.h"
+ #include "ln_audio_simple.h"
  #include "kv_store.h"
  #include "power_display_service.h"
 #include "AppViewIDs.h"
@@ -1593,8 +1594,8 @@ extern "C" {
 
     bool ThunderBirdModel::is_Cat1_OtaUpgrade()
     {
-        std::string cat1_pyver = uapi_dev_runtime_get_cat1_pyver();
-        if(cat1_pyver == "PY_SRV_V27")
+        cat1_pyver = uapi_dev_runtime_get_cat1_pyver();
+        if(cat1_pyver == "PY_SRV_V27" || cat1_pyver == "PY_SRV_V28")
         {
             return true;
         }
@@ -1811,6 +1812,10 @@ extern "C" {
                         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "任务提醒界面超时，返回原任务");
                         ThunderBirdModel::GetInstance()->HighFrequence();
                         ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
+                        //关闭语音初始化
+                        // AI_ForceInterrupt();
+                        // ln_ws_send_voice_chat_interrupt("日程提醒");
+                        // do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AUDIO_DEINIT, NULL, 0);
                     }
                 }
             } else {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp
index 879afc0..6f45149 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp
@@ -333,7 +333,7 @@ namespace OHOS
                 RemindIcon->SetPosition(133, 169, 94, 94);
                 RemindIcon->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);
                 RemindIcon->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-                //RemindIcon->SetSrc("/user/res/volume_up.bin");
+                RemindIcon->SetSrc(LN_CHAT_STAMINA_QRCODE_FILE);
                 RemindIcon->SetVisible(true);
             }
             if(RemindLabel)