优化debug电池信息ui显示

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
index 1e1837c..0bf26fa 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
@@ -495,8 +495,6 @@ namespace OHOS
 
         if(get_battery_percent_flag == 1)
         {
-            nextorprepageLabelButton->SetText("第二页");
-            get_battery_percent_flag = 2;
             if(len >= 120)
             {
                 index = 60;
@@ -509,8 +507,6 @@ namespace OHOS
         }
         else if(get_battery_percent_flag == 2)
         {
-            nextorprepageLabelButton->SetText("第三页");
-            get_battery_percent_flag = 3;
             if(len >= 120)
                 index = 120;
             else
@@ -518,10 +514,8 @@ namespace OHOS
         }
         else
         {
-            nextorprepageLabelButton->SetText("第一页");
-            get_battery_percent_flag = 1;
             if(len >= 60)
-                len = 90;
+                len = 60;
         }
         for(int i = index; i < len; i++)
         {
@@ -555,6 +549,7 @@ namespace OHOS
             <<", ["<<timestr<< "] ,"
             << data[i].voltage << "V , "
             << static_cast<int>(data[i].percent) << "%\n";
+            // << static_cast<int>(i) << "%\n";
 
             result += oss.str();
             // result += std::to_string(i*10) + " min  , " + std::to_string(data[i].voltage) + "V , "+ std::to_string(data[i].percent) + "%" + "\n";
@@ -821,6 +816,22 @@ namespace OHOS
             // std::string str;
             viewIndex = GetCurViewIndex();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"111111 viewIndex : %d",viewIndex);
+
+            if(get_battery_percent_flag == 1)
+            {
+                nextorprepageLabelButton->SetText("第三页");
+                get_battery_percent_flag = 2;
+            }
+            else if(get_battery_percent_flag == 2)
+            {
+                nextorprepageLabelButton->SetText("第一页");
+                get_battery_percent_flag = 3;
+            }
+            else
+            {
+                nextorprepageLabelButton->SetText("第二页");
+                get_battery_percent_flag = 1;
+            }
             // if(nextorprepageLabelButton)
             // {
             //     if(get_battery_percent_flag == 0)
@@ -1060,6 +1071,7 @@ namespace OHOS
 
                 delete nextorprepageLabelButton;
                 nextorprepageLabelButton = nullptr;
+                get_battery_percent_flag = 0;
 
                 delete toggleButtonOffline;
                 toggleButtonOffline = nullptr;
@@ -1145,7 +1157,7 @@ namespace OHOS
         nextorprepageLabelButton->Resize(100, 100);
         nextorprepageLabelButton->SetViewId(NEXTORPREPAGELABELBUTTON);
         nextorprepageLabelButton->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
-        nextorprepageLabelButton->SetText("下一页");
+        nextorprepageLabelButton->SetText("第一页");
         nextorprepageLabelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         nextorprepageLabelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffff0000, UIButton::PRESSED);
         nextorprepageLabelButton->SetVisible(false);