From: luozheng <1732036298@qq.com>
Date: Thu, 29 Aug 2024 06:57:57 +0000 (+0800)
Subject: 解决设置中点击关机按钮死机问题
X-Git-Tag: release_V1.2.70_20241020_135402~563^2~4
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=e5c7e4579683dca54c315fa8f8a2f9b2d53a054d;p=mirrors%2FFD230.git

解决设置中点击关机按钮死机问题
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
index f148d9822..5e5356b58 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -209,7 +209,7 @@ namespace OHOS
         }
         else if (strcmp(view.GetViewId(), SHUTDOWN_CHECKON) == 0) // 关机确认
         {
-            p_SystemView->ChangeView(RESTARTVIEW, SHUTDOWNANIMATIONVIEW);
+            p_SystemView->ChangeView(SHUTDOWNVIEW, SHUTDOWNANIMATIONVIEW);
             start_shutdown_or_reboot();
             shutdown_reboot_prejobs();
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
index 75a0326cb..182c659a2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
@@ -399,7 +399,7 @@ namespace OHOS
     {
         if (SystemScrollView[thisView] == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemRestartView");
             p_SystemRestart = new SystemRestart();
             if (p_SystemRestart == nullptr)
             {
@@ -417,7 +417,7 @@ namespace OHOS
     {
         if (SystemScrollView[thisView] == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemShutdownView");
             p_SystemShutdown = new SystemShutdown();
             if (p_SystemShutdown == nullptr)
             {
@@ -435,7 +435,7 @@ namespace OHOS
     {
         if (SystemScrollView[thisView] == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemShutdownAnimatorView");
             p_ShutDownImageAnimatorView = new ShutDownImageAnimatorView();
             if (p_ShutDownImageAnimatorView == nullptr)
             {