fd272：压力值计算暂时用平均值

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp
index 8db5dc2..e3f56ee 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp
@@ -227,7 +227,7 @@ namespace OHOS
         }
         
         uint16_t average = sum / count;
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "日期 %s 平均值: %u (共%d条记录)", dateStr, average, count);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "日期 %s 平均值: %u (共%d条记录)", dateStr, average, count);
         return average;
     }
 
@@ -493,20 +493,27 @@ namespace OHOS
 
         if ((test_duration_sec_ >= STRESS_TEST_DURATION_SEC) && ringBufferIndex >= MAX_VALID_STRESS_COUNT)
         {
+            #if 1
             // 计算最终结果，有效值的均值
-            // uint16_t sum = 0;
-            // uint16_t count = (ringBufferIndex < 60) ? ringBufferIndex : 60;
-            // printf("测试结果：\n");
-            // for (int i = 0; i < count; i++)
-            // {
-            //     sum += ringBuffer[i];
-            //     printf("%d ", ringBuffer[i]);
-            // }
-            // printf("\n");
-            // uint16_t finalMs = sum / count;
-            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "压力测试完成: 最终结果 %dms, 有效数据个数: %d", finalMs, count);
-            
-
+            uint16_t sum = 0;
+            uint16_t count = (ringBufferIndex < 60) ? ringBufferIndex : 60;
+            printf("测试结果：\n");
+            for (int i = 0; i < count; i++)
+            {
+                sum += ringBuffer[i];
+                printf("%d ", ringBuffer[i]);
+            }
+            printf("\n");
+            uint16_t finalMs = sum / count;
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "压力测试完成: 最终结果 %dms, 有效数据个数: %d", finalMs, count);
+            StressTestModel::GetInstance().HandleResultValue(finalMs); // 分档上报
+            // 切换到结果页面
+            if (StressTestPresenter::GetInstance())
+            {
+                StressTestPresenter::GetInstance()->ChangeViewOperation(
+                    StressTestModel::GetInstance().GetCurrentView(), STRESSTESTRESULTVIEW);
+            }
+            #else
             uint16_t finalMs = CalculateReasonableStress();
             if (finalMs == -1)
             {
@@ -529,6 +536,7 @@ namespace OHOS
                         StressTestModel::GetInstance().GetCurrentView(), STRESSTESTRESULTVIEW);
                 }
             }
+            #endif
             // 停止压力测试
             StressTest_StopTimer();
             // 震动