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

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 92b5385,5eef800..fe9dbe3
--- 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
@@@ -27,83 -27,98 +27,92 @@@ extern "C
  #include "errcode.h"
  #include "bleEvent.h"
  
-     struct ancs_data_info_t
-     {
-         int uid;         // uid 消息唯一编号
-         int appid;       // 消息类型：1：微信 2：QQ 3：短信 4：其他
-         char title[256]; // 消息发送者
-         char msg[300];   // 消息内容
-         char time[20];   // 时间戳"20240417T102400" 用T分隔日期和时间，显示需要注意
-         int hasCode;     // 消息hash code
-     };
 -
 -
 -enum PAIRING
 -{
 -    DEVICEBIND = 0,//
 -    DEVICEUNBIND,//设备解绑通知
 -    DeviceUnBindingRequest,//设备解绑请求(与新设备连接)通知
 -    REBOOT,
 -    SHUTDOWN
 -};
 -//  enum class ExerciseState
 -//     {
 -//         Start = 0,
 -//         End,
 -//         Pause,
 -//         Continue,
 -//         General,
 -//     };
 -
 -/*
 -0：结束
 -1：开始
 -2：暂停
 -3：恢复
 -*/
 -enum TRANING
 -{
 -    END=0,
 -    START,
 -    STOP,
 -    RECOVER,
 -    SETGOAL,
 -    SENDDATA,
 -};
--
 -typedef struct
 -{
 -    uint8_t sportType;    //训练项目
 -    uint8_t sportTagType; //训练目标类型
 -    uint32_t sportTag;     //训练目标
 -    uint8_t controlmd;    //训练控制md
 -} training_ble;
 +    enum PAIRING
 +    {
 +        DEVICEBIND = 0,
 +        DEVICEUNBIND,           // 设备解绑通知
 +        DeviceUnBindingRequest, // 设备解绑请求(与新设备连接)通知
 +        REBOOT,
 +        SHUTDOWN
 +    };
 +
 +    /*
 +    0：结束
 +    1：开始
 +    2：暂停
 +    3：恢复
 +    */
 +    enum TRANING
 +    {
 +        END = 0,  // 结束训练
 +        START,    // 开始训练
 +        STOP,     // 暂停训练
 +        RECOVER,  // 恢复训练
 +        SETGOAL,  // 设置训练目标
 +        SENDDATA, // 获取实时训练数据
 +    };
 +
 +    typedef struct
 +    {
 +        uint8_t sportType;    // 训练项目
 +        uint8_t sportTagType; // 训练目标类型
 +        uint32_t sportTag;    // 训练目标
 +        uint8_t controlmd;    // 训练控制md
 +    } training_ble;
++    
+ #define MAX_MESSAGE_NUM 10
+ #define TITLE_BUF_LEN 256
+ #define MSG_BUF_LEN 301
 -struct ancs_data_info_t
 -{
 -    uint32_t time;//时间戳 
 -    int uid;//uid 消息唯一编号
 -    int appid;//消息类型：1：微信 2：QQ 3：短信 4：其他
 -    char title[TITLE_BUF_LEN];//消息发送者
 -    char msg[MSG_BUF_LEN];//消息内容
 -    int hasCode;//消息hash code
 -    int read;//是否已读 0 未读 1 已读
 -};
 -
 -struct message_infor_t
 -{
 -    uint8_t num;
 -    struct ancs_data_info_t message_t[MAX_MESSAGE_NUM];
 -};
 -void set_weather_now_data(int humidity, char* windScale, char* textNight,int uvIndex,int temp,int iconNight);
 -
 -void set_weather_address_data(int lat, char* atm, char* city,char* subLocality,int lon);
 -void set_weather_one_data(int tempMin, int iconDay,int fxDate, int tempMax, char *textDay,int x);
 -
 -uint8_t ble_is_ready(void);
 -void set_ble_falg(bool falg);
 -uint8_t ble_is_connect_ready(void);
 -char *addressbook(void);
 -void addressbookToRead(char*);
 -void  addressbookTowrite(void);
 -const char *get_health_data_path(void);
 -void add_addressbookToRead(char *data);
 -
 -void set_user_data(msg_user_info_t data);
 -
 -int get_goal_stepcount(void);
 -
 -int get_vibrationremiander(void);
 -
 -int get_SilentMode(void);
 -
 -void set_goal_stepcount(uint32_t step);
 -
 -void set_vibrationremiander(uint8_t falg);
 -
 -void set_SilentMode(uint8_t falg);
 -
 -void set_traning_updata_freq(uint8_t freq);
++    struct ancs_data_info_t
++    {
++        uint32_t time;             // 时间戳
++        int uid;                   // uid 消息唯一编号
++        int appid;                 // 消息类型：1：微信 2：QQ 3：短信 4：其他
++        char title[TITLE_BUF_LEN]; // 消息发送者
++        char msg[MSG_BUF_LEN];     // 消息内容
++        int hasCode;               // 消息hash code
++        int read;                  // 是否已读 0 未读 1 已读
++    };
 +
++    struct message_infor_t
++    {
++        uint8_t num;
++        struct ancs_data_info_t message_t[MAX_MESSAGE_NUM];
++    };
 +    void set_weather_now_data(int humidity, char *windScale, char *textNight, int uvIndex, int temp, int iconNight);
 +
 +    void set_weather_address_data(int lat, char *atm, char *city, char *subLocality, int lon);
 +    void set_weather_one_data(int tempMin, int iconDay, int fxDate, int tempMax, char *textDay, int x);
 +
 +    uint8_t ble_is_ready(void);
 +    void set_ble_falg(bool falg);
 +    uint8_t ble_is_connect_ready(void);
 +    char *addressbook(void);
 +    void addressbookToRead(char *);
 +    void addressbookTowrite(void);
 +    const char *get_health_data_path(void);
 +    void add_addressbookToRead(char *data);
 +
 +    void set_user_data(msg_user_info_t data);
 +
 +    int get_goal_stepcount(void);
 +
 +    int get_vibrationremiander(void);
 +
 +    int get_SilentMode(void);
 +
 +    void set_goal_stepcount(uint32_t step);
 +
 +    void set_vibrationremiander(uint8_t falg);
 +
 +    void set_SilentMode(uint8_t falg);
 +    /*设置自动获取实时数据开关*/
 +    void set_traning_updata_auto(uint8_t traingauto);
 +    /*设置获取实时训练数据频率*/
 +    void set_traning_updata_freq(uint8_t freq);
 +    /*设置训练最高心率*/
 +    void set_traning_heart_max(uint8_t data);
  
 -void set_traning_heart_max(uint8_t data);
  #ifdef __cplusplus
  #if __cplusplus
  }

diff --cc code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
Simple merge