优化运动数据消息发送

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index edb5b81..eecb294 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -1029,7 +1029,7 @@ void gsensor_get_n_data(uint8_t cnt,gsenson_t t[])
 
 //static int flag=32;
 void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
-    cywee_msg_callback_t cywee_func;
+    // cywee_msg_callback_t cywee_func;
     cywee_activity_result_t c_activity_result_t;
     cywee_inactivity_result_t c_inactivity_result_t;
     cywee_inactivity_accumulate_time_t c_inactivity_accumulate_time_t;
@@ -1171,7 +1171,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 break;
             }
 
-            cywee_func = cywee_get_send_msg_callback_func();
+            // cywee_func = cywee_get_send_msg_callback_func();
             // CWM_OS_dbgPrintf("IDX_ALGO_INACTIVITY_OUTPUT\n");
             if((int)sensorEVT->fData[0] == 20)
             {
@@ -1192,13 +1192,15 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                     if(sedentary_interval_count == sedentary_interval)
                     {
                         sedentary_interval_count = 0;
-                        cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inactivity_result_t,sizeof(cywee_inactivity_result_t));
+                        // cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inactivity_result_t,sizeof(cywee_inactivity_result_t));
+                        CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_inactivity_result_t, sizeof(cywee_inactivity_result_t));
                     }
                 }
                 else if(c_inactivity_result_t.status != 3)
                 {
                     sedentary_interval_count = 0;    
-                    cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inactivity_result_t,sizeof(cywee_inactivity_result_t)); 
+                    // cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inactivity_result_t,sizeof(cywee_inactivity_result_t)); 
+                    CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_inactivity_result_t, sizeof(cywee_inactivity_result_t));
                 }
 
             }else if((int)sensorEVT->fData[0] == 21){
@@ -1304,7 +1306,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
             break;
         case IDX_ALGO_ACTIVITY_OUTPUT:
             is_static_state = 0;
-            cywee_func = cywee_get_send_msg_callback_func();
+            // cywee_func = cywee_get_send_msg_callback_func();
             if((int)sensorEVT->fData[0] == 100)
             {
                 memset(&c_activity_result_extre_info_t,0,sizeof(cywee_activity_result_extre_info_t));
@@ -1320,7 +1322,8 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_activity_result_extre_info_t.MHR_zone = (int)sensorEVT->fData[13];
                 c_activity_result_extre_info_t.distance_motion = (int)sensorEVT->fData[14];
 
-                cywee_func(CYWEE_MSG_TYPE_ACTIVITY_EXTRA_INFO_UPDATE,&c_activity_result_extre_info_t,sizeof(cywee_activity_result_extre_info_t));
+                // cywee_func(CYWEE_MSG_TYPE_ACTIVITY_EXTRA_INFO_UPDATE,&c_activity_result_extre_info_t,sizeof(cywee_activity_result_extre_info_t));
+                CustomEventPublish(TOPIC_EVENT_ACTIVITY_EXTRA_INFO_UPDATE, &c_activity_result_extre_info_t, sizeof(cywee_activity_result_extre_info_t));
 
             }else if((int)sensorEVT->fData[0] == 5001)
             {
@@ -1332,7 +1335,8 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_activity_result_t.MHR_zone = (int)sensorEVT->fData[6];
                 // c_activity_result_t.hrs = hrs;
                 // hrs = 0; //每次上报完 清除心率值
-                cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
+                // cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
+                CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
 
             }else if((int)sensorEVT->fData[0] == 102)
             {
@@ -1353,7 +1357,8 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_activity_result_t.pace = (int)(sensorEVT->fData[7] * 60);
                 // c_activity_result_t.hrs = hrs;
                 // hrs = 0; //每次上报完 清除心率值
-                cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
+                // cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
+                CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
                 CustomEventPublish(TOPIC_EVENT_STEPDATA_UPDATE,&stepcount,sizeof(int)); 
             }
             break;