强制升级不能退出

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 7d8f42a..c2d19a3 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
@@ -177,11 +177,11 @@ namespace OHOS
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "普通升级界面跳转升级中");
                     OtaView::GetInstance()->ChangeView(OtaView::OTA_VIEW_NORMAL, OtaView::OTA_VIEW_NIGHT_UPDATE);
                 }
-                else if (currentView == OtaView::OTA_VIEW_UPDATE_NOW) {
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "强制升级界面跳转升级中");
-                    OtaView::GetInstance()->ChangeView(OtaView::OTA_VIEW_UPDATE_NOW, OtaView::OTA_VIEW_NIGHT_UPDATE);
-                }
-                else if (currentView == OtaView::OTA_VIEW_NIGHT_UPDATE_SUCCESS || currentView == OtaView::OTA_VIEW_NIGHT_UPDATE || currentView == OtaView::OTA_VIEW_COUNTDOWN) {
+                // else if (currentView == OtaView::OTA_VIEW_UPDATE_NOW) {
+                //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "强制升级界面跳转升级中");
+                //     OtaView::GetInstance()->ChangeView(OtaView::OTA_VIEW_UPDATE_NOW, OtaView::OTA_VIEW_NIGHT_UPDATE);
+                // }
+                else if (currentView == OtaView::OTA_VIEW_NIGHT_UPDATE || currentView == OtaView::OTA_VIEW_COUNTDOWN) {
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "夜间升级界面跳转普通升级");
                     ThunderBirdModel::GetInstance()->ResetOtaStatus();
                     //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0);

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 6e0ea54..ebf974f 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
@@ -74,31 +74,19 @@ namespace OHOS
         // 创建提示标签
         RemindLabel = new UILabelExt();
         if (RemindLabel) {
-            RemindLabel->SetPosition(80, 275, 200, 25);
+            RemindLabel->SetPosition(136, 275, 88, 25);
             RemindLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             RemindLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);
             RemindLabel->SetStyle(STYLE_TEXT_COLOR, 0xffffffff);
-            RemindLabel->SetText("按     退出    按     更新");
+            RemindLabel->SetText("按     更新");
             RemindLabel->SetVisible(true);
             group->Add(RemindLabel);
         }
-
-        // 创建提示图标
-        RemindIcon = new UIImageView();
-        if (RemindIcon) {
-            RemindIcon->SetAutoEnable(false);
-            RemindIcon->SetPosition(105, 276, 22, 22);
-            RemindIcon->SetResizeMode(UIImageView::CONTAIN);
-            RemindIcon->SetSrc("/user/res/volume_down.bin");
-            RemindIcon->SetVisible(true);
-            group->Add(RemindIcon);
-        }
-
         // 创建第二个提示图标
         RemindIcon2 = new UIImageView();
         if (RemindIcon2) {
             RemindIcon2->SetAutoEnable(false);
-            RemindIcon2->SetPosition(211, 276, 22, 22);
+            RemindIcon2->SetPosition(160, 277, 22, 22);
             RemindIcon2->SetResizeMode(UIImageView::CONTAIN);
             RemindIcon2->SetSrc("/user/res/volume_up.bin");
             RemindIcon2->SetVisible(true);
@@ -120,7 +108,6 @@ namespace OHOS
         if (LittleTextLabel) { delete LittleTextLabel; LittleTextLabel = nullptr; }
         if (TextLabel) { delete TextLabel; TextLabel = nullptr; }
         if (RemindLabel) { delete RemindLabel; RemindLabel = nullptr; }
-        if (RemindIcon) { delete RemindIcon; RemindIcon = nullptr; }
         if (RemindIcon2) { delete RemindIcon2; RemindIcon2 = nullptr; }
     }
 }

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 9864d53..151a06a 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
@@ -2010,6 +2010,16 @@
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleCharacterConfigChange: 角色配置没有变化，不进行处理");
             return;
         }
+        if(last_eyesShape_.empty() && last_hairColor_.empty() && last_eyesColor_.empty() && last_hairStyle_.empty() && !last_screenImageAsEmoji_)
+        {
+            last_eyesShape_ = eyesShape_;
+            last_hairColor_ = hairColor_;
+            last_eyesColor_ = eyesColor_;
+            last_hairStyle_ = hairStyle_;
+            last_screenImageAsEmoji_ = screenImageAsEmoji_;
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleCharacterConfigChange: 角色配置为空，不进行处理");
+            return;
+        }
         //更新上次角色配置信息
         last_eyesShape_ = eyesShape_;
         last_hairColor_ = hairColor_;

diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h b/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h
index 3695fa5..25186bf 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h
@@ -26,7 +26,7 @@ namespace OHOS {
 class DrawLabel : public HeapBase {
 public:
     static void DrawTextOneLine(BufferInfo& gfxDstBuffer, const LabelLineInfo& labelLine);
-
+    // 雷鸟项目增加，阴影Lable子组件
     static void DrawTextOneLineWithShadow(BufferInfo& gfxDstBuffer, const LabelLineInfo& labelLine, int16_t shadowOffsetX = 2, int16_t shadowOffsetY = 2);
 
     static void DrawArcText(BufferInfo& gfxDstBuffer, const Rect& mask, const char* text,