Merge #3050 into ln from refs/changes/3050/head

Code review from aliyun3243248791

* refs/changes/3050/head: (2 commits squashed)

  - 修复哄睡过程中提醒没有声音的bug

  - 修复型号格无网络不变化的问题

Signed-off-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3050

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp
index f2d6ebd..e01f916 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp
@@ -716,10 +716,7 @@ namespace OHOS
         }
         case THUNDERBIRD_BULEVIEW_EXIT_OR_RETRY:
         {
-            if (BackGround)
-            {
-                BackGround->SetVisible(true);
-            }
+            ThunderBirdMainView::GetInstance()->InvalidateGroup1(true);
             if (TextLabel)
             {
                 TextLabel->SetPosition(15, 148, 330, 42);

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
index 8b1e971..6ca9dbf 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
@@ -1816,7 +1816,11 @@ namespace OHOS
         // 从Model获取网络状态信息  
         // int sim = ThunderBirdModel::GetInstance()->GetSimStatus();  // SIM卡状态: 1=有SIM卡, 0=无SIM卡
         int cat1_powerOn = ThunderBirdModel::GetInstance()->GetCat1PowerStatus();  // CAT1电源状态: 1=开机, 0=关机
-        int signal = ThunderBirdModel::GetInstance()->GetSignalStrength();  
+        int signal = ThunderBirdModel::GetInstance()->GetSignalStrength();
+        if(signal == 99)
+        {
+            signal = 0;
+        }
         int network_on = ThunderBirdModel::GetInstance()->GetNetworkStatus();  // 网络连接状态: 1=在线, 0=断网
         // int cat1_network_type = ThunderBirdModel::GetInstance()->GetNetworkType();  // 网络类型: 0=无网络, 1=GSM, 2=3G, 4=4G/LTE
         

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 343fcca..ee7f735 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
@@ -1737,6 +1737,7 @@ extern "C" {
                     //如果有配对设备则上报状态否则不上报
                     unsigned int connedDevicesNum = 0;
                     bool ret = gap_get_paired_devices_num(&connedDevicesNum);
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "connedDevicesNum=%d", connedDevicesNum);
                     if(ret == true && connedDevicesNum > 0)
                     {
                                             //异步上报耳机状态

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_schedule.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_schedule.c
index 9bca13d..d1e86c8 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_schedule.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_schedule.c
@@ -222,11 +222,18 @@ void ln_parse_schedule_reminder(const char *json_buf, int json_len)
     // 延迟一段时间，确保界面切换完成
     LOS_Msleep(300);
     
-    int status  = uapi_ln_get_audio_play_status();
-    if(status)
-    {
-        g_schedule_reminder.enableVoice = 0;
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[JSON_PARSE] audio playback：音频播放中，不执行语音提醒\n");
+    // int status  = uapi_ln_get_audio_play_status();
+    // if(status)
+    // {
+    //     g_schedule_reminder.enableVoice = 0;
+    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[JSON_PARSE] audio playback：音频播放中，不执行语音提醒\n");
+    // }
+    //如果是故事模式，则不执行语音提醒
+    if (uapi_get_sleep_mode_active()) {
+        // 先确保没有其他下载占用（如故事模式），再进行提醒音频下载
+        http_file_download_deinit();
+        LOS_Msleep(400);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[JSON_PARSE] story mode：故事模式，不执行语音提醒\n");
     }
     //是否启用语音
     if (g_schedule_reminder.enableVoice)