Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index add2bda,8e9adfc..da21e4f
--- 1/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
--- 2/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(); // 重置闹钟\r
      }\r
  \r
 -    static void on_time_CallBackProc(void)\r
 -    {\r
 -        AlarmClockEventData unuse;\r
 -        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked");\r
 -\r
 -        GraphicService::GetInstance()->PostGraphicEvent(\r
 -            std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse));\r
 -\r
 -        // AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse);\r
 -    }\r
 -\r
      void AlarmScan(void *arg)\r
      {\r
+ \r
+         \r
+ \r
          struct tm curTime;\r
          int32_t ret = AlarmGetCurrentTimeInfo(&curTime);\r
          if (ret != ERRCODE_SUCC)\r

diff --cc code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 6c76163,8282fde..4ed137a
--- 1/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
--- 2/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 0b517d7,5d24813..a6ae29b
--- 1/code/sdk/drivers/peripheral/utils/custom_utils.h
--- 2/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,