rebootdevice 文件夹更新

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
index 5c14f77..915652f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
@@ -16,7 +16,7 @@ enum RebootModelView : uint8_t {
     SHUTDOWNDEVICE,
 };
 
-using namespace std;
+
 class RebootModel {
 public:
     ~RebootModel();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
index cad3c66..9777580 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
@@ -95,7 +95,7 @@ UIViewGroup *RebootDeviceView::InitShowUpView(void)
         group->SetHeight(VERTICAL_RESOLUTION);
     }
     ret = ShowUpRebootDeviceView();
-    if (ret == false) {
+    if (!ret) {
         return nullptr;
     }
     group->Add(rebootDeviceLabel);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
index 8e5c9c9..f323289 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
@@ -251,13 +251,13 @@ namespace OHOS
         UNUSED(hideView);
         if (container[thisView] == nullptr)
         {
-            UIViewGroup *group = InitShowUpView();
-            if (group == nullptr)
+            UIViewGroup *viewGroup = InitShowUpView();
+            if (viewGroup == nullptr)
             {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group nullptr fail");
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "viewGroup nullptr fail");
                 return false;
             }
-            container[thisView] = group;
+            container[thisView] = viewGroup;
             RootView::GetInstance()->Add(container[thisView]);
         }
         return true;
@@ -279,13 +279,12 @@ namespace OHOS
                 return false;
             }
             // init view
-            UIViewGroup *group = rebootDeviceView->InitShowUpView();
-            if (group == nullptr)
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group nullptr fail");
+            UIViewGroup *viewGroup = rebootDeviceView->InitShowUpView();
+           if (viewGroup == nullptr) {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "viewGroup nullptr fail");
                 return false;
             }
-            container[thisView] = group;
+            container[thisView] = viewGroup;
             RootView::GetInstance()->Add(container[thisView]);
         }
         return true;
@@ -307,13 +306,13 @@ namespace OHOS
                 return false;
             }
             // init view
-            UIViewGroup *group = shutdownDeviceView->InitShowUpView();
-            if (group == nullptr)
+            UIViewGroup *viewGroup = shutdownDeviceView->InitShowUpView();
+            if (viewGroup == nullptr)
             {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group nullptr fail");
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "viewGroup nullptr fail");
                 return false;
             }
-            container[thisView] = group;
+            container[thisView] = viewGroup;
             RootView::GetInstance()->Add(container[thisView]);
         }
         return true;
@@ -373,7 +372,7 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RebootView::ChangeView %d, %d", hideView, showView);
 
-        if (CheckViewParam(hideView, showView) == false)
+        if (!CheckViewParam(hideView, showView))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootView::CheckViewParam failed.");
             return;
@@ -381,7 +380,7 @@ namespace OHOS
 
         PreprosssChangeView tmpPreProcessView = preProcessView[showView];
 
-        if ((this->*tmpPreProcessView)(hideView, showView) == false)
+        if (!(this->*tmpPreProcessView)(hideView, showView))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootView::ChangeView %d %dfailed", showView, hideView);
             return;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
index a56f9fd..775d5ec 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
@@ -97,7 +97,7 @@ UIViewGroup *ShutdownDeviceView::InitShowUpView(void)
     }
 
     ret = ShowUpShutdownDeviceView();
-    if (ret == false) {
+    if (!ret) {
         return nullptr;
     }
     group->Add(shutdownDeviceLabel);