优化对话文本显示

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 448071c..7d6c9f8 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
@@ -1401,17 +1401,17 @@
             }
         }
         
-        #if JUHEPINGTAI
-        if(is_all_services_ready == false)
-        {
-            if (are_all_services_ready())//如果返回的是true就可以开始对话了
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Network disconnected");
-                init_all_callback();
-                is_all_services_ready = true;
-            }   
-        }
-        #endif
+        // #if JUHEPINGTAI
+        // if(is_all_services_ready == false)
+        // {
+        //     if (are_all_services_ready())//如果返回的是true就可以开始对话了
+        //     {
+        //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Network disconnected");
+        //         init_all_callback();
+        //         is_all_services_ready = true;
+        //     }   
+        // }
+        // #endif
         
         // 更新设备状态
         UpdateDeviceStatus();

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 e296159..66f5a58 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
@@ -190,14 +190,6 @@ namespace OHOS
                         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateDialogueText:%s\n",dialogueText.c_str());
                         ThunderBirdDialogueView::GetInstance()->UpdateDialogueText(dialogueText.c_str());
                     }
-                    else{
-                        //如果不是对话需要判断是否服务准备好
-                        if(ThunderBirdModel::GetInstance()->Get_is_all_services_ready() == false)
-                        ThunderBirdDialogueView::GetInstance()->UpdateDialogueText("等待网络连接");
-                        else
-                        ThunderBirdDialogueView::GetInstance()->UpdateDialogueText("网络连接成功");
-                    }
-                    
                 }
             }
             //如果是哄睡界面 需要更新哄睡文本