取消下载界面定时器

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 c2d19a3..9f1916e 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
@@ -25,6 +25,9 @@
 #include "ota/include/OtaUpdateNowView.h"
 #include "ota/include/OtaNightUpdateView.h"
 #include "ota/include/OtaNightUpdateSuccessView.h"
+#ifdef SUPPORT_CAT1_SERVICE
+#include "cat1_server.h"
+#endif
 
 namespace OHOS
 {
@@ -152,6 +155,9 @@ namespace OHOS
                         
                         ThunderBirdModel::GetInstance()->ResetOtaStatus();
                        // do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0);
+                       #ifdef SUPPORT_CAT1_SERVICE
+                       cat_sync_timer_control(1);
+                       #endif
                         NativeAbility::GetInstance().SwitchSlice(VIEW_THUNDER_BIRD);
                     }
                     //倒计时界面确认，开始升级，定时器停止，进入升级中界面
@@ -185,12 +191,18 @@ namespace OHOS
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "夜间升级界面跳转普通升级");
                     ThunderBirdModel::GetInstance()->ResetOtaStatus();
                     //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0);
+                    #ifdef SUPPORT_CAT1_SERVICE
+                    cat_sync_timer_control(1);
+                    #endif
                     NativeAbility::GetInstance().SwitchSlice(VIEW_THUNDER_BIRD);
                 }
                 else if (currentView == OtaView::OTA_VIEW_NETWORK_ERROR || currentView == OtaView::OTA_VIEW_LOW_BATTERY || currentView == OtaView::OTA_VIEW_MEMORY_ERROR ||currentView == OtaView::OTA_VIEW_UPDATE_FAILED) {
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "网络异常、电量不足、内存不足界面跳转普通升级");
                     ThunderBirdModel::GetInstance()->ResetOtaStatus();
                     //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0);
+                    #ifdef SUPPORT_CAT1_SERVICE
+                    cat_sync_timer_control(1);
+                    #endif
                     NativeAbility::GetInstance().SwitchSlice(VIEW_THUNDER_BIRD);
                 }
                        

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp
index ec14335..b9a38b6 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp
@@ -24,7 +24,9 @@
 #include "thunderbird/include/ThunderBirdModel.h"
 #include "thunderbird/include/ThunderBirdMainView.h"
 #include "ln_api_interface.h"
-
+#ifdef SUPPORT_CAT1_SERVICE
+#include "cat1_server.h"
+#endif
 namespace OHOS
 {
     static OtaView *g_pOtaView{nullptr};
@@ -35,6 +37,9 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OtaView::OtaView");
         ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
+        #ifdef SUPPORT_CAT1_SERVICE
+        cat_sync_timer_control(0);
+        #endif
         g_pOtaView = this;
     }