Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...

diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
Simple merge

diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index 5d66300,ccac4d3..2c24ae8
--- 1/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
--- 2/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@@ -134,20 -134,16 +134,32 @@@ void set_traning_updata_freq(uint8_t fr
  /*设置训练最高心率*/
  void set_traning_heart_max(uint8_t data);
  
 +void set_goal_caloriescount(uint32_t kcal);//设置目标卡路里
 +int get_goal_caloriescount(void);//获取目标卡路里
 +
 +void set_goal_discount(uint32_t dis);//设置目标里程
 +int get_goal_discount(void);//获取目标里程
 +
 +void set_notify_switch(uint8_t on);//设置消息通知开关
 +bool get_notify_switch(void);//获取消息通知开关
 +
 +void set_goal_durationcount(uint32_t time);//设置目标燃脂时间
 +int get_goal_durationcount(void);//获取目标燃脂时间
 +
 +void set_goal_standupcount(uint32_t time);//设置目标战立次数
 +int get_goal_standupcount(void);//获取目标站立次数
++
+ char* struct_to_json_buf_malloc_(void);
+ 
+ char * struct_to_json_buf_malloc_Alarm(void);
+ 
+ 
+ void ble_SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8_t week,uint8_t id,uint8_t enable);
+ 
+ 
+ void ble_delet_all_AlarmInfo(void);
+ 
++
  #ifdef __cplusplus
  #if __cplusplus
  }

diff --cc code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 4e6fffb,9fa98f3..6231251
--- 1/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
--- 2/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@@ -2053,12 -2046,9 +2090,12 @@@ void type2AE4Data(uint8_t *buf_cmd,uint
              getAPPaddressbook(typeID,data,datalen,totalData,crcvalue);\r
              break;\r
          case SET_ALARM_DATA_CMD:\r
-             GetAlarmDataCmd(typeID,data,datalen,totalData,crcvalue);\r
+             SetAlarmDataCmd(typeID,data,datalen,totalData,crcvalue);\r
              printf("alarm infor !!!!!!!!!!\r\n");\r
              break;\r
 +        case SET_OTHER_TARGET_CMD:\r
 +            GetOtherTarget(typeID,data,datalen,totalData,crcvalue);\r
 +            break;\r
          case DELETE_FILE_CMD:\r
              break;\r
          case SYN_BASIC_REAL_HEATR_CMD:\r