From: SnickerSun <snickersun@163.com>
Date: Tue, 26 Mar 2024 17:14:45 +0000 (+0800)
Subject: 添加StepCount功能，专用页面已经可以正常更新
X-Git-Tag: release_V1.2.70_20241020_135402~1257^2
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=bc19288c764301849851f0e62183c4faab763a41;p=mirrors%2FFD230.git

添加StepCount功能，专用页面已经可以正常更新
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
index 300688111..4278eed07 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
@@ -119,8 +119,9 @@ static void Notify(void *args, const Topic topic, Request* request)
             return;
         }
         // 计步数据累加
-        uint32 counter = OHOS::ActivityModel::GetInstance()->GetStepCounter();
-        counter += *(uint32_t *)request->data;
+        // uint32 counter = OHOS::ActivityModel::GetInstance()->GetStepCounter();
+        // counter += *(uint32_t *)request->data;
+        uint32 counter = *(uint32_t *)request->data;
         OHOS::ActivityModel::GetInstance()->ReviseStepCounter(counter);
 
         GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityModel::SetStepData,
@@ -140,7 +141,7 @@ static void Notify(void *args, const Topic topic, Request* request)
 #endif
 
 namespace OHOS {
-StepAllData g_stepData1 = {10050, 13421, 12312, 4252, 8993, 12314, 3423};
+StepAllData g_stepData1 = {0, 0, 0, 0, 0, 0, 0};
 
 static constexpr const char *STEP_DATA_PATH = "/user/userdata/step_";
 static constexpr uint32_t SECONDS_ONEDAY = 86400;
diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 634d277b4..3804615eb 100644
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -6,6 +6,8 @@
 #include <cwm_lib_dml.h>
 #include "cywee_hal.h"
 #include "power_display_service.h"
+#include "ppg_service.h"
+#include "broadcast_feature.h"
 #define AP_ENABLE_DML_SDO_LISTEN
 
 
@@ -119,6 +121,8 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[7],
                                 (int)sensorEVT->fData[8],
                                 (int)sensorEVT->fData[14]);
+                int stepcount = (int)sensorEVT->fData[1];
+                CustomEventPublish(TOPIC_EVENT_STEPDATA_UPDATE,&stepcount,sizeof(int)); 
             }
            
 // [0] = activity_mode  (1001~1xxx)