From: DXY <1731678236@qq.com>
Date: Mon, 6 May 2024 07:49:34 +0000 (+0800)
Subject: Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 
X-Git-Tag: release_V1.2.70_20241020_135402~1108^2~19
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=eec77ab2cc96c4766fdf966f6b92cb35cdb07f9a;p=mirrors%2FFD230.git

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

eec77ab2cc96c4766fdf966f6b92cb35cdb07f9a
diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index 5d663009d,ccac4d349..2c24ae849
--- a/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 4e6fffb47,9fa98f363..62312513c
--- a/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);
              break;
          case SET_ALARM_DATA_CMD:
-             GetAlarmDataCmd(typeID,data,datalen,totalData,crcvalue);
+             SetAlarmDataCmd(typeID,data,datalen,totalData,crcvalue);
              printf("alarm infor !!!!!!!!!!\r\n");
              break;
 +        case SET_OTHER_TARGET_CMD:
 +            GetOtherTarget(typeID,data,datalen,totalData,crcvalue);
 +            break;
          case DELETE_FILE_CMD:
              break;
          case SYN_BASIC_REAL_HEATR_CMD: