From b2199e70d3fef46f95dd16b13f2e235f210b6578 Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Tue, 9 Jul 2024 17:03:47 +0800 Subject: [PATCH] =?utf8?q?CustomEventPublish=20=E7=BB=9F=E4=B8=80=E8=BF=81?= =?utf8?q?=E7=A7=BB=E5=88=B0custom=5Futilscpp.cpp=E4=B8=AD=E5=AE=9E?= =?utf8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../peripheral/ppg/service/ppg_service.cpp | 46 -------------- .../peripheral/ppg/service/ppg_service.h | 6 +- .../slip/cat1Service/cat1_server.cpp | 22 ++++--- .../slip/cat1Service/cat1_server_hal.cpp | 52 +--------------- .../peripheral/utilscpp/custom_utilscpp.cpp | 62 ++++++++++++++++++- .../peripheral/utilscpp/custom_utilscpp.h | 1 + 6 files changed, 79 insertions(+), 110 deletions(-) diff --git a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp index c9ad9231e..c198c3bd8 100644 --- a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp +++ b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp @@ -75,53 +75,7 @@ void set_keep_in_wear_det_mode(uint8_t mod) { keep_in_wear_det_mod = mod; } -void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size) -{ - int32 ret; - - Request *request = NULL; - BroadcastApi *broadcastApi = NULL; - IUnknown *api = NULL; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u!!", topic); - - /* alloc request */ - request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, BROADCAST_SVR_ID, size); - if (request == NULL) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SAMGR_AllocRequestMsg failed"); - return; - } - request->msgId = topic; - if (size > 0) - { - ret = memcpy_s(request->data, size, (const void *)data, size); - if (ret != EOK) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s rateDataTmp fail! ret = %d", ret); - return; - } - } - - request->len = size; - request->msgValue = 0; - - /* public request */ - api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); - if (api == NULL) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed"); - SAMGR_FreeRequestMsg(request); - return; - } - ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (ret != 0 || broadcastApi == NULL) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "QueryInterface failed"); - SAMGR_FreeRequestMsg(request); - return; - } - broadcastApi->PublishTopic((IUnknown *)broadcastApi, request); - broadcastApi->Release((IUnknown *)broadcastApi); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish end!!"); - return; -} //漏光测试 errcode_t update_leaklight_event_notify(uint8_t *data) { diff --git a/code/sdk/drivers/peripheral/ppg/service/ppg_service.h b/code/sdk/drivers/peripheral/ppg/service/ppg_service.h index bf0e0a19c..ff1a26cfa 100644 --- a/code/sdk/drivers/peripheral/ppg/service/ppg_service.h +++ b/code/sdk/drivers/peripheral/ppg/service/ppg_service.h @@ -1,8 +1,8 @@ /* * @Author: penglei 1624952103@qq.com * @Date: 2024-03-27 09:07:00 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-06-17 17:46:26 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-07-09 16:49:38 * @FilePath: /FD230/code/sdk/drivers/peripheral/ppg/service/ppg_service.h * @Description: * @@ -82,7 +82,7 @@ typedef struct { uint64_t timestamp; //上报数据时间戳， 单位ms }ppg_data_t; -void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size); + //设置佩戴检测模式 void set_keep_in_wear_det_mode(uint8_t mod); diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp index 91e1374cb..916fd37e3 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp @@ -90,7 +90,8 @@ enum UDP_COMMAND_HEAD { UDP_MSG_SEND_DMP_CM_ADDRESS = 0x18,//用于BLE发送移动入库地址 to CAT1 接收 }; -static uint8_t g_msg_format_type = 0;// 0: old format , 1: new format +/** 0: old format 1字节cmd, 1: new format 2字节cmd */ +static uint8_t g_msg_format_type = 0; static char ble_buffer[20] = {0}; @@ -1196,7 +1197,16 @@ static int udp_packet_parse(char *rx_buffer, int len) cat1_handle_version_msg(msg_buffer); restart_time_sync(); cat1_getsignal(); - if(g_msg_format_type == 0) break; + + // if(sntp_enabled()==0) + // { + // sntp_init(); + // }else{ + // sntp_stop(); + // sntp_init(); + // } + + if(g_msg_format_type == 0) break; //下面指令只有新格式才支持，因此返回 int stateOld = get_dmp_change_mode_old(); int stateNew = get_dmp_change_mode_toCat1();//0 stateOld = 0 0-1 if (stateNew == 0){//关闭入库功能 把恢复出厂标识清0 @@ -1220,13 +1230,7 @@ static int udp_packet_parse(char *rx_buffer, int len) send_dmp_factory_flag(); } } - if(sntp_enabled()==0) - { - sntp_init(); - }else{ - sntp_stop(); - sntp_init(); - } + } break; case UDP_MSG_GET_TELECON_DMP_TIMESEC://暂时不用 diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server_hal.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server_hal.cpp index 697a3d9a2..49c4a7ea2 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server_hal.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server_hal.cpp @@ -30,57 +30,7 @@ extern "C" { #include "errno.h" #include "cat1_server_hal.h" - - -static void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size) -{ - int32 ret; - - Request *request = NULL; - BroadcastApi *broadcastApi = NULL; - IUnknown *api = NULL; - - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u %d %s!!", topic,size,data); - - /* alloc request */ - request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, BROADCAST_SVR_ID, size); - if (request == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SAMGR_AllocRequestMsg failed"); - return; - } - request->msgId = topic; - ret = memcpy_s(request->data, size, (const void *)data, size); - - if (ret != EOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s rateDataTmp fail! ret = %d ", ret); - return; - } - request->len = size; - request->msgValue = 0; - - - /* public request */ - - api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); - if (api == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed"); - SAMGR_FreeRequestMsg(request); - return; - } - ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (ret != 0 || broadcastApi == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed"); - SAMGR_FreeRequestMsg(request); - return; - } - broadcastApi->PublishTopic((IUnknown *)broadcastApi, request); - broadcastApi->Release((IUnknown *)broadcastApi); - - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish end!!"); - - - return; -} +#include "custom_utils.h" static errcode_t calldial_event_notify(char* callno) { diff --git a/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp b/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp index c3922b9c0..4f33322b2 100644 --- a/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp +++ b/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp @@ -9,6 +9,16 @@ #include "gfx_utils/mem_check.h" + + +#include "securec.h" +#include "broadcast_service.h" +#include "broadcast_feature.h" +#include "service_id_define.h" +#include "samgr_lite.h" +// #include "thread_adapter.h" +#include "graphic_service.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -40,12 +50,13 @@ extern "C" { #include "custom_utils.h" #include "cywee_service.h" +#include "wearable_log.h" + #include "upg_lzmadec.h" #include "stdio.h" #include "dfx_file_operation.h" #include "sys/stat.h" #define CUSTOM_DIAL_PATH "/user/dial/custom_dial.bin" - /***************************************************************************************************************/ #include "7zFile.h" @@ -237,6 +248,55 @@ void uapi_dump_meminfo(void) OHOS::MemCheck::GetInstance()->DumpMemInfo(); } + +void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size) +{ + int32_t ret; + + Request *request = NULL; + BroadcastApi *broadcastApi = NULL; + IUnknown *api = NULL; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u!!", topic); + + /* alloc request */ + request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, BROADCAST_SVR_ID, size); + if (request == NULL) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SAMGR_AllocRequestMsg failed"); + return; + } + request->msgId = topic; + if (size > 0) + { + ret = memcpy_s(request->data, size, (const void *)data, size); + if (ret != EOK) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s rateDataTmp fail! ret = %d", ret); + return; + } + } + + request->len = size; + request->msgValue = 0; + + /* public request */ + api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); + if (api == NULL) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed"); + SAMGR_FreeRequestMsg(request); + return; + } + ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); + if (ret != 0 || broadcastApi == NULL) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "QueryInterface failed"); + SAMGR_FreeRequestMsg(request); + return; + } + broadcastApi->PublishTopic((IUnknown *)broadcastApi, request); + broadcastApi->Release((IUnknown *)broadcastApi); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish end!!"); + + return; +} + #ifdef __cplusplus } #endif /* __cplusplus */ \ No newline at end of file diff --git a/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.h b/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.h index 718a62bbc..410b68803 100644 --- a/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.h +++ b/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.h @@ -17,6 +17,7 @@ extern "C" { errcode_t uapi_dial_pkg_decompress(const char* dial_pkg_path,char* dial_bin_path); void uapi_dump_meminfo(void); +void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size); #ifdef __cplusplus } #endif /* __cplusplus */ -- 2.17.1