修改py升级UI

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 7c8679a..8da2908 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
@@ -156,7 +156,7 @@ namespace OHOS
 
     bool OtaModel::IsBatterySufficient() 
     {
-        if(IsBatteryCharging() == true)//充电时，不检查电量
+        if(IsBatteryCharging() == true && OtaModel::GetInstance()->GetOtaStatus() != OTA_UI_STATUS_CAT1_START)//充电时，不检查电量
         {
             return true;
         }

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 ebf974f..84afa9e 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
@@ -92,6 +92,15 @@ namespace OHOS
             RemindIcon2->SetVisible(true);
             group->Add(RemindIcon2);
         }
+        if(OtaModel::GetInstance()->GetOtaStatus() == OTA_UI_STATUS_CAT1_START)
+        {
+            TextLabel->SetPosition(0, 102, 360, 42);
+            TextLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+            TextLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 24);
+            TextLabel->SetStyle(STYLE_TEXT_COLOR, 0xffffffff);
+            TextLabel->SetText("需要更新模组");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OtaUpdateNowView::Cat1Update");
+        }
         return group;
     }
 

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdatingView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdatingView.cpp
index 8141469..4f4f217 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdatingView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaUpdatingView.cpp
@@ -58,6 +58,14 @@ namespace OHOS
             titleLabel->SetVisible(true);
             group->Add(titleLabel);
         }
+        if(OtaModel::GetInstance()->GetOtaStatus() == OTA_UI_STATUS_CAT1_START)
+        {
+            titleLabel->SetText("模组升级中\n请勿关闭设备");
+            titleLabel->SetPosition(90, 148, 180, 82);
+            return group;
+        }
+
+      
         // 创建进度条
         progressBar = new UIBoxProgress();
         if (progressBar) {
@@ -83,8 +91,8 @@ namespace OHOS
             LittleTextLabel->SetVisible(true);
             group->Add(LittleTextLabel);
         }
-
         return group;
+       
     }
        
 

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 f53e3a9..a1d7865 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
@@ -99,7 +99,7 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "选择升级");
                 ChangeView(MAX_OTA_VIEW, OTA_VIEW_NORMAL);
             }
-            else if(m_otaStatus == OTA_UI_STATUS_FORCE_START)//强制升级
+            else if(m_otaStatus == OTA_UI_STATUS_FORCE_START || m_otaStatus == OTA_UI_STATUS_CAT1_START)//强制升级
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "强制升级");
                 ChangeView(MAX_OTA_VIEW, OTA_VIEW_UPDATE_NOW);