From: 袁清梦 <3449750381@qq.com> Date: Tue, 17 Dec 2024 08:30:18 +0000 (+0000) Subject: 修复ancs弹窗重启问题 X-Git-Tag: v1.3.113-repair_tp~143^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=87b0063a9642d4f9c7ea1a4f9cecba1a240d5e83;p=mirrors%2FFD230.git 修复ancs弹窗重启问题 - 系统:增加ancs的测试AT - 系统:优化CustomEventPublish存在的内存问题 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h index 013d64cc0..7d4ea375a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h @@ -2,68 +2,63 @@ #ifndef MESSAGE_MODEL_H #define MESSAGE_MODEL_H +#include "bletest.h" +#include "message/include/MessagePresenter.h" #include #include -#include "AppViewIDs.h" -#include "components/ui_label_ext.h" -#include "ui_resource_string.h" -#include "UiConfig.h" -#include "MessagePresenter.h" -#include "message/include/MessageAdapter.h" -#include "bletest.h" #include -namespace OHOS -{ - // 消息数据结构体 - struct MessageData - { - bool isRead; // 消息是否已读 - std::string labelTitle; // 消息标题 - std::string labelDetails; // 消息详情 - std::string labelTime; // 消息时间 - uint32 timestamp; // 消息时间戳 - }; +namespace OHOS { +// 消息数据结构体 +struct MessageData { + bool isRead; // 消息是否已读 + std::string labelTitle; // 消息标题 + std::string labelDetails; // 消息详情 + std::string labelTime; // 消息时间 + uint32_t timestamp; // 消息时间戳 +}; + +// 消息模型类 +class MessageModel { +public: + MessageModel(); + ~MessageModel(); + void Init(); - // 消息模型类 - class MessageModel - { - public: - MessageModel(); - ~MessageModel(); - void Init(); + static MessageModel &GetInstance(); + void InitMessageListItems(); // 初始化消息列表项 + const MessageListItem *GetMessageListItems() const; // 获取消息列表项 + uint8_t GetMessageCount() const; // 获取消息数量 + void AddMessageData(ancs_data_info_t *messageInfo); // 增加消息项 + bool LoadMessagesFromStorage(); // 初始化信息数组 {开机调用一次} + bool SaveMessagesToStorage(); // 保存信息数组 {关机时候调用} + bool SetMessageAsRead(); // 设置当前项已读 + void SetCurrentIndex(uint8_t index); // 设置当前下标 + uint8_t GetCurrentIndex(); // 获取当前下标 + MessageData *GetCurrentMessageData(); // 获取当前项 + bool DeleteCurrentMessage(); // 删除当前项 + bool ClearAllMessages(); // 删除所有数据 + MessageData *GetNewMessage(); // 获取最新信息 + void SetPopupViewState(bool state); // 设置弹出视图状态 + bool GetPopupViewState(); // 获取弹出视图状态 + bool HasDataVector(); // 判断数组是否存在数据 + void UpdateMessageView(); - static MessageModel &GetInstance(); - void InitMessageListItems(); // 初始化消息列表项 - const MessageListItem *GetMessageListItems() const; // 获取消息列表项 - uint8_t GetMessageCount() const; // 获取消息数量 - void AddMessageData(ancs_data_info_t *messageInfo); // 增加消息项 - bool LoadMessagesFromStorage(); // 初始化信息数组 {开机调用一次} - bool SaveMessagesToStorage(); // 保存信息数组 {关机时候调用} - bool SetMessageAsRead(); // 设置当前项已读 - void SetCurrentIndex(uint8_t index); // 设置当前下标 - uint8_t GetCurrentIndex(); // 获取当前下标 - MessageData *GetCurrentMessageData(); // 获取当前项 - bool DeleteCurrentMessage(); // 删除当前项 - bool ClearAllMessages(); // 删除所有数据 - MessageData *GetNewMessage(); // 获取最新信息 - void SetPopupViewState(bool state); // 设置弹出视图状态 - bool GetPopupViewState(); // 获取弹出视图状态 - bool HasDataVector(); // 判断数组是否存在数据 - void UpdateMessageView(); + void at_message_test(); - private: - MessageModel &operator=(const MessageModel &); +private: + MessageModel &operator=(const MessageModel &); - uint16_t numberOfItems; // 项数 - static const uint16_t MaxMessageListCount = 10; // 消息列表最大数量 - MessageListItem Messages[MaxMessageListCount] = {0, false, nullptr, nullptr, nullptr}; // 消息列表 - uint8_t currentIndex_; // 选择的项 - std::vector MessageVector; + uint16_t numberOfItems; // 项数 + static const uint16_t MaxMessageListCount = 10; // 消息列表最大数量 + MessageListItem Messages[MaxMessageListCount] = {0, false, nullptr, nullptr, + nullptr}; // 消息列表 + uint8_t currentIndex_; // 选择的项 + std::vector MessageVector; - bool popupViewState_{false}; // 弹出视图状态 - }; -} + bool popupViewState_{false}; // 弹出视图状态 +}; +} // namespace OHOS #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h index 9ccf55063..187229ac6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h @@ -6,7 +6,7 @@ #include "Presenter.h" #include "MessageView.h" #include "message/include/MessageModel.h" -#include "components/ui_list.h" +// #include "components/ui_list.h" // #include "KeyInputListener.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageShowView.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageShowView.h index e566094a3..5ca804e06 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageShowView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageShowView.h @@ -3,7 +3,7 @@ #ifndef MessageShow_VIEW_H #define MessageShow_VIEW_H -#include "BaseView.h" +// #include "BaseView.h" #include "View.h" #include "components/ui_view_group.h" #include "components/ui_scroll_view.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp index aae7a45a4..bd3b8a771 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp @@ -50,9 +50,9 @@ #define MESSAGE_JSON_DIR "user/userdata/message/" #define PRINTFDATA 0 -#include "notification_manager.h" -#include "msg_center.h" #include "message_notification.h" +#include "msg_center.h" +#include "notification_manager.h" extern "C" errcode_t uapi_get_TIME_STR(uint32_t time, char *p_time, char date_separator, char time_separator, @@ -60,11 +60,11 @@ extern "C" errcode_t uapi_get_TIME_STR(uint32_t time, char *p_time, // #include "msg_center_customerC.h" - void show_notify_messgae() { - printf("show_notify_messgae\n"); - OHOS::NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_THREE); - OHOS::NotificationManager::GetInstance()->ShowNotify(OHOS::CreateMessageView, TOPIC_EVENT_MESSAGENOTE, true); + printf("show_notify_messgae\n"); + OHOS::NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_THREE); + OHOS::NotificationManager::GetInstance()->ShowNotify( + OHOS::CreateMessageView, TOPIC_EVENT_MESSAGENOTE, true); } #ifdef __cplusplus @@ -126,92 +126,106 @@ void MessageUnsubscribeTopic(Topic topic) { broadcastApi->Release((IUnknown *)broadcastApi); } -// 存储消息更新的定时器 -static uint32_t messageTimestamp = 0; - -static void Notify(void *args, const Topic topic, Request *request) { - UNUSED(args); - UNUSED(topic); - - if (request == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received NULL request"); - return; - } - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received request %d", request->msgId); - - if (request->msgId == TOPIC_EVENT_MESSAGE_UPDATA) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Processing TOPIC_EVENT_MESSAGE_UPDATA"); - - if (request->data == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received NULL data"); - return; - } - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received request %d", request->msgId); - ancs_data_info_t *messageInfo = (ancs_data_info_t *)request->data; - ancs_data_info_t messageInfo_; - - messageInfo_.title = (char*)malloc(messageInfo->titlelen + 1); - if (messageInfo_.title == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to allocate memory for title"); - return; - } - memcpy(messageInfo_.title, messageInfo->title, messageInfo->titlelen); - messageInfo_.title[messageInfo->titlelen] = '\0'; - - - messageInfo_.msg = (char*)malloc(messageInfo->msglen + 1); - if (messageInfo_.msg == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to allocate memory for message"); - free(messageInfo_.title); // Free previously allocated title - return; - } - memcpy(messageInfo_.msg, messageInfo->msg, messageInfo->msglen); - messageInfo_.msg[messageInfo->msglen] = '\0'; - - - messageInfo_.appid = messageInfo->appid; - messageInfo_.uid = messageInfo->uid; - messageInfo_.time = messageInfo->time; - messageInfo_.read = 0; - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "message_data %p %p\r\n", messageInfo_.title, messageInfo_.msg); - - - MessageModel::GetInstance().AddMessageData(&messageInfo_); - - - uint32_t currentTimestamp = OHOS::TraingModel::GetInstance()->get_current_time(); - if (currentTimestamp - messageTimestamp <= 1) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageTimestamp too short"); - free(messageInfo_.title); - free(messageInfo_.msg); - return; - } - messageTimestamp = currentTimestamp; - - - if (uapi_dev_runtime_get_train_status() || - uapi_dev_runtime_get_saveele_status() || - uapi_dev_runtime_get_respiratory_training_status()) { - - free(messageInfo_.title); - free(messageInfo_.msg); - return; - } +// 存储消息更新的定时器 +static uint32_t messageTimestamp = 0; + +static void Notify(void *args, const Topic topic, Request *request) { + UNUSED(args); + UNUSED(topic); + + if (request == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received NULL request"); + return; + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received request %d", request->msgId); + + if (request->msgId == TOPIC_EVENT_MESSAGE_UPDATA) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Processing TOPIC_EVENT_MESSAGE_UPDATA"); + + if (request->data == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received NULL data"); + return; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Received request %d", + request->msgId); + ancs_data_info_t *messageInfo = (ancs_data_info_t *)request->data; + ancs_data_info_t messageInfo_; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo"); - CustomEventPublish(TOPIC_EVENT_MESSAGENOTE, NULL, 0); + messageInfo_.title = (char *)malloc(messageInfo->titlelen + 1); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo.title"); + if (messageInfo_.title == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Failed to allocate memory for title"); + return; + } - // show_notify_messgae(); + memcpy(messageInfo_.title, messageInfo->title, messageInfo->titlelen); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy"); + messageInfo_.title[messageInfo->titlelen] = '\0'; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "messageInfo.title[messageInfo->titlelen]"); + messageInfo_.msg = (char *)malloc(messageInfo->msglen + 1); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo_.msg"); + if (messageInfo_.msg == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Failed to allocate memory for message"); + free(messageInfo_.title); // Free previously allocated title + return; + } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message popup sent"); + memcpy(messageInfo_.msg, messageInfo->msg, messageInfo->msglen); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "messageInfo.msg[messageInfo->msglen]"); + messageInfo_.msg[messageInfo->msglen] = '\0'; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "messageInfo_.msg[messageInfo->msglen end"); + + messageInfo_.appid = messageInfo->appid; + messageInfo_.uid = messageInfo->uid; + messageInfo_.time = messageInfo->time; + messageInfo_.read = 0; + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "message_data %p %p\r\n", + messageInfo_.title, messageInfo_.msg); + + MessageModel::GetInstance().AddMessageData(&messageInfo_); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddMessageData"); + + uint32_t currentTimestamp = + OHOS::TraingModel::GetInstance()->get_current_time(); + if (currentTimestamp - messageTimestamp <= 1) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageTimestamp too short"); + free(messageInfo_.title); + free(messageInfo_.msg); + return; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get_current_time end"); + messageTimestamp = currentTimestamp; - free(messageInfo_.title); - free(messageInfo_.msg); - } + if (uapi_dev_runtime_get_train_status() || + uapi_dev_runtime_get_saveele_status() || + uapi_dev_runtime_get_respiratory_training_status()) { + + free(messageInfo_.title); + free(messageInfo_.msg); + return; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "status end"); + + CustomEventPublish(TOPIC_EVENT_MESSAGENOTE, NULL, 0); + + // show_notify_messgae(); + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message popup sent"); + + free(messageInfo_.title); + free(messageInfo_.msg); + } } void saveancsdata() { // printf("saveancs\r\n"); @@ -236,6 +250,55 @@ MessageModel &MessageModel::GetInstance() { static MessageModel instance; return instance; } + +void MessageModel::at_message_test() { + // Initialize timestamp + uint32_t timestamp = 0; + if (uapi_get_timestampe_ss(×tamp) != ERRCODE_SUCC) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get timestamp"); + return; + } + + ancs_data_info_t data; + const char *title = "title"; // Assuming title and msg are defined elsewhere + const char *msg = "message"; + + data.title = (char *)malloc(strlen(title) + 1); + data.msg = (char *)malloc(strlen(msg) + 1); + + if (data.title == NULL || data.msg == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Memory allocation failed"); + free(data.title); // Free previously allocated memory + free(data.msg); + return; + } + + strcpy(data.title, title); + strcpy(data.msg, msg); + + data.appid = 0; + data.uid = 0; + data.time = timestamp; + data.read = 0; + data.hasCode = 1; + + data.msglen = strlen(msg); + data.titlelen = strlen(title); + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "message_data %s %s\r\n", data.title, + data.msg); + + CustomEventPublish(TOPIC_EVENT_MESSAGE_UPDATA, (uint8_t *)&data, + sizeof(ancs_data_info_t)); + + // free(data.title); + // free(data.msg); + + // Simulate message push notification (if needed) + // OHOS::NotificationManager::GetInstance()->ShowNotify( + // OHOS::CreateMessageView, TOPIC_EVENT_MESSAGENOTE, true); +} + void MessageModel ::Init() { MessageSubscribeTopic(TOPIC_EVENT_MESSAGE_UPDATA); // 进行消息订阅 } @@ -429,44 +492,49 @@ void MessageModel::SetCurrentIndex(uint8_t index) { uint8_t MessageModel::GetCurrentIndex() { return currentIndex_; } // 增加消息项[添加数组项] -void MessageModel::AddMessageData(ancs_data_info_t *messageInfo) { - if (messageInfo == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo is null"); - return; - } - - // 创建并填充 MessageData - MessageData data; - data.isRead = messageInfo->read; - data.labelDetails = messageInfo->msg ? messageInfo->msg : ""; - data.labelTitle = messageInfo->title ? messageInfo->title : ""; - data.timestamp = messageInfo->time; - - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, - "AddMessageData data.isRead is %d, data.labelDetails is %s, " - "data.labelTitle is %s, data.timestamp is %u", - data.isRead, data.labelDetails.c_str(), data.labelTitle.c_str(), - data.timestamp); - - // 处理时间字符串 - char labelTime[20]; - if (uapi_get_TIME_STR(data.timestamp, labelTime, '.', ':', DATE_Y_M_D_H_M) != ERRCODE_SUCC) { - data.labelTime = "--"; // 默认值 - } else { - data.labelTime = labelTime; // 直接使用 labelTime - } - - // 添加数据到消息向量 - MessageVector.push_back(data); - - // 删除多余的数据 - if (MessageVector.size() > MaxMessageListCount) { - MessageVector.erase(MessageVector.begin(), - MessageVector.begin() + (MessageVector.size() - MaxMessageListCount)); - } - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo add is ok"); +void MessageModel::AddMessageData(ancs_data_info_t *messageInfo) { + if (messageInfo == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo is null"); + return; + } + + // 创建并填充 MessageData + MessageData data; + data.isRead = messageInfo->read; + data.labelDetails = messageInfo->msg ? messageInfo->msg : ""; + data.labelTitle = messageInfo->title ? messageInfo->title : ""; + data.timestamp = messageInfo->time; + + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, + "AddMessageData data.isRead is %d, data.labelDetails is %s, " + "data.labelTitle is %s, data.timestamp is %u", + data.isRead, data.labelDetails.c_str(), data.labelTitle.c_str(), + data.timestamp); + + // 处理时间字符串 + char labelTime[20]; + if (uapi_get_TIME_STR(data.timestamp, labelTime, '.', ':', DATE_Y_M_D_H_M) != + ERRCODE_SUCC) { + data.labelTime = "--"; // 默认值 + } else { + data.labelTime = labelTime; // 直接使用 labelTime + } + + // 添加数据到消息向量 + MessageVector.push_back(data); + + // 删除多余的数据 + if (MessageVector.size() > MaxMessageListCount) { + MessageVector.erase(MessageVector.begin(), + MessageVector.begin() + + (MessageVector.size() - MaxMessageListCount)); + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageInfo add is ok"); } + + + // 获取目前的项 MessageData *MessageModel::GetCurrentMessageData() { if (currentIndex_ < MessageVector.size()) { diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h index de2fb6ad2..6265f3dd6 100644 --- a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h +++ b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h @@ -118,6 +118,8 @@ void set_config_heart_min(int heartRateMin); //設置血氧最低值 void set_config_spo2_min(int spo2Min); /* -------------------------------------------------------------------------- */ +//模拟ancs +void mmi_ancs_simulate(void); // sleep mode switch void mmi_sleep_mode_switch_read(void); diff --git a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp index 46d350db0..736b7bed3 100644 --- a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp +++ b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp @@ -6,6 +6,7 @@ #include "kv_store.h" #include "kvstore_env.h" #include "player/include/PlayersModelC.h" +#include "message/include/MessageModel.h" #if DEBUG_CONFIGMODEL #define CONFIG_DEBUG(fmt, arg...) printf("ConfigModel|" fmt, ##arg) #else @@ -1500,7 +1501,11 @@ void set_config_heart_min(int heartRateMin) { //设置最小血氧 void set_config_spo2_min(int spo2Min) { OHOS::ConfigModel::GetInstance()->set_condigData_Int( - OHOS::ConfigModel::CONFIGMODEL_ITEM_OXYGEN_THRESHOLD_VALUE, spo2Min); + OHOS::ConfigModel::CONFIGMODEL_ITEM_OXYGEN_THRESHOLD_VALUE, spo2Min); +} + +void mmi_ancs_simulate(void) { + OHOS::MessageModel::GetInstance().at_message_test(); } //获取久坐提醒开关 int get_sedentary_switch_from_config_model(void) diff --git a/code/sdk/drivers/peripheral/utils/CMakeLists.txt b/code/sdk/drivers/peripheral/utils/CMakeLists.txt index da240fa01..f2f953ea1 100644 --- a/code/sdk/drivers/peripheral/utils/CMakeLists.txt +++ b/code/sdk/drivers/peripheral/utils/CMakeLists.txt @@ -23,6 +23,23 @@ set(PUBLIC_HEADER ${ROOT_DIR}/application/audio ${ROOT_DIR}/drivers/drivers/driver/audio/source/include ${ROOT_DIR}/drivers/drivers/driver/audio/source/core/common/include/ + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits/window/ + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits/gfx_utils/ + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/innerkits/ + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include/ + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include/components/ + ${ROOT_DIR}/middleware/services/gui/uikit/surface/ + ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/ + ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits/ + ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include/ + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits/ + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits/dock/ + ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks/ + ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks/dock/ + ) diff --git a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c index d36154488..2dc6907b1 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c @@ -9,6 +9,10 @@ #include "custom_runtime.h" #include "ConfigModelC.h" #include "cat1_tcpServer.h" +// #include "message_notification.h" +// #include "MessageModel.h" +#include "system/include/SystemLogModelC.h" +// #include "msg_center_customerC.h" #ifdef SUPPORT_A5133_SERVICE #include "service/a5133_service.h" #endif @@ -405,6 +409,15 @@ static uint32_t custom_flash_erase(uint8_t *para, uint32_t paraLen, char *strCom return ERRCODE_SUCC; } +static uint32_t custom_at_message_test(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + + UNUSED(strCommonCmd); + + mmi_ancs_simulate(); + + return ERRCODE_SUCC; +} #include "cywee_hal.h" #include "hx3695_hrs_agc.h" static uint32_t custom_gsensor_getdata(uint8_t *para, uint32_t paraLen, char *strCommonCmd) @@ -1523,6 +1536,7 @@ static const at_cmd_table_t g_custom_utils_cmd[] = { {(char *)"AT^RESTORE", custom_restore_factory_settings, (char *)" "}, {(char *)"AT^SETHEALTH", custom_set_health, (char *)" "}, + {(char *)"AT^MESSAGE_TEST",custom_at_message_test, (char *)" "}, {(char *)"AT^LSFD", custom_lsfd, (char *)" "}, diff --git a/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp b/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp index 60ef7b4a4..122c3280f 100644 --- a/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp +++ b/code/sdk/drivers/peripheral/utilscpp/custom_utilscpp.cpp @@ -301,8 +301,8 @@ void CustomEventPublish(uint16_t topic, uint8_t *data, uint32_t size) { broadcastApi->Release((IUnknown *)broadcastApi); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish end!!"); - // 释放内存 - free(publishData); + // // 释放内存 + // free(publishData); return; }