From: Caisking <3449750381@qq.com> Date: Thu, 17 Oct 2024 09:54:12 +0000 (+0800) Subject: Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~24 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=fb23eaa003e8ec1e95587624814039640447fbbd;p=mirrors%2FFD230.git Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 --- fb23eaa003e8ec1e95587624814039640447fbbd diff --cc code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index add2bda8f,8e9adfc5f..da21e4f0c --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@@ -335,8 -335,22 +335,11 @@@ extern "C SetZeroAlarm(); // 重置闹钟 } - static void on_time_CallBackProc(void) - { - AlarmClockEventData unuse; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked"); - - GraphicService::GetInstance()->PostGraphicEvent( - std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse)); - - // AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse); - } - void AlarmScan(void *arg) { + + + struct tm curTime; int32_t ret = AlarmGetCurrentTimeInfo(&curTime); if (ret != ERRCODE_SUCC) diff --cc code/sdk/drivers/peripheral/utils/custom_cmd_service.c index 6c761634d,8282fde29..4ed137aaf --- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c +++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c @@@ -269,9 -267,8 +269,11 @@@ static void custom_cmd_service_check_ta case CUSTOM_CMD_MSG_DOWNLOAD_RES: repair_file_start(); break; + case CUSTOM_CMD_MSG_TIMECALL_BACK: + custom_timer_callback(); + break; + case CUSTOM_CMD_MSG_BLE_ADV_CHECK: + Check_ble_adv_status(); default: PRINT("Unknown CUSTOM_CMD_MSG cmd 0x%02X \r\n", mail.cmd); break; diff --cc code/sdk/drivers/peripheral/utils/custom_utils.h index 0b517d75b,5d2481362..a6ae29bb4 --- a/code/sdk/drivers/peripheral/utils/custom_utils.h +++ b/code/sdk/drivers/peripheral/utils/custom_utils.h @@@ -220,7 -220,8 +220,10 @@@ uint32_t uapi_calendar_store_date(void) #define CUSTOM_CMD_MSG_TYPE_TOUCH_RESUME 0x0F -#define CUSTOM_CMD_MSG_BLE_ADV_CHECK 0x10 +#define CUSTOM_CMD_MSG_TIMECALL_BACK 0x10 ++ ++#define CUSTOM_CMD_MSG_BLE_ADV_CHECK 0x11 + typedef enum { BR_HFP_CONNECT=1, BR_HFP_DISCONNECT,