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

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)
                     {
                                             //异步上报耳机状态