修复4G升级

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp
index 37ea43a..604a23f 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp
@@ -255,14 +255,18 @@ namespace OHOS
             
             // 跳转到升级中界面
             if (OtaView::GetInstance()) {
-                if(!ThunderBirdModel::GetInstance()->is_Cat1_OtaUpgrade())
+                // 使用保存的OTA状态来判断是否是CAT1升级，而不是调用is_Cat1_OtaUpgrade()
+                // 因为is_Cat1_OtaUpgrade()已经改为异步处理，总是返回false
+                int otaStatus = GetOtaStatus();
+                if(otaStatus != OTA_UI_STATUS_CAT1_START)
                 {
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "普通ota下载");
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "普通ota下载，状态=%d", otaStatus);
                     do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_OTA_DOWNLOAD, NULL, 0);
                 }
                 OtaView::GetInstance()->ChangeView(OtaView::OTA_VIEW_COUNTDOWN, OtaView::OTA_VIEW_UPDATING);
-                if(ThunderBirdModel::GetInstance()->is_Cat1_OtaUpgrade())
+                if(otaStatus == OTA_UI_STATUS_CAT1_START)
                 {
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CAT1模组升级，状态=%d", otaStatus);
                     GraphicService::GetInstance()->PostGraphicEvent(
                         std::bind(&OHOS::ThunderBirdModel::Cat1OtaUpgrade,OHOS::ThunderBirdModel::GetInstance()));
                 }

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp
index 3dbe40b..581a534 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp
@@ -164,16 +164,19 @@ namespace OHOS
                     }
                     //倒计时界面确认，开始升级，定时器停止，进入升级中界面
                     else if (currentView == OtaView::OTA_VIEW_COUNTDOWN) {
-                        // do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_OTA_DOWNLOAD, NULL, 0);
-                        if(!ThunderBirdModel::GetInstance()->is_Cat1_OtaUpgrade())
+                        // 使用保存的OTA状态来判断是否是CAT1升级，而不是调用is_Cat1_OtaUpgrade()
+                        // 因为is_Cat1_OtaUpgrade()已经改为异步处理，总是返回false
+                        int otaStatus = OtaModel::GetInstance()->GetOtaStatus();
+                        if(otaStatus != OTA_UI_STATUS_CAT1_START)
                         {
-                            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "普通ota下载");
+                            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "普通ota下载，状态=%d", otaStatus);
                             do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_OTA_DOWNLOAD, NULL, 0);
                         }
                         OtaModel::GetInstance()->StopCountdownTimer();
                         OtaView::GetInstance()->ChangeView(OtaView::OTA_VIEW_COUNTDOWN, OtaView::OTA_VIEW_UPDATING);
-                        if(ThunderBirdModel::GetInstance()->is_Cat1_OtaUpgrade())
+                        if(otaStatus == OTA_UI_STATUS_CAT1_START)
                         {
+                            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CAT1模组升级，状态=%d", otaStatus);
                             GraphicService::GetInstance()->PostGraphicEvent(
                                 std::bind(&OHOS::ThunderBirdModel::Cat1OtaUpgrade,OHOS::ThunderBirdModel::GetInstance()));
                         }

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdateNowView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdateNowView.cpp
index cbc3567..a718e22 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdateNowView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdateNowView.cpp
@@ -95,7 +95,7 @@ namespace OHOS
         }
         if(OtaModel::GetInstance()->GetOtaStatus() == OTA_UI_STATUS_CAT1_START)
         {
-            TextLabel->SetPosition(0, 182, 360, 42);
+            TextLabel->SetPosition(0, 170, 360, 42);
             TextLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             TextLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 24);
             TextLabel->SetStyle(STYLE_TEXT_COLOR, 0xffffffff);