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 e203bcd,fe9dbe3..72ea3a2
--- 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
@@@ -72,75 -63,55 +63,76 @@@ extern "C
  #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 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];
 +};
  
 -    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 read_message_data(void);//读内存信息数据开机读一次
 +struct message_infor_t *get_message_info(void);
 +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);
- 
- void set_traning_heart_max(uint8_t data);
- 
 -    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);
 +void set_brigthness(uint8_t data); //设置屏幕亮度
  
 -    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);
 +int get_brigthness(void); //获取屏幕亮度
  
 -    void set_user_data(msg_user_info_t data);
 +void set_ScreenDuration(int data); //设置亮屏时长
  
 -    int get_goal_stepcount(void);
 +int get_ScreenDuration(void); //获取亮屏时长
  
 -    int get_vibrationremiander(void);
 +void Set_RaiseToWake(bool value); //抬婉亮屏开关 
  
 -    int get_SilentMode(void);
 +int Get_RaiseToWake(void); //获取抬婉亮屏开关 
  
 -    void set_goal_stepcount(uint32_t step);
 +void Set_SystemVolume(int value); //设置系统音量
 +int Get_SystemVolume(void); //获取系统音量
  
 -    void set_vibrationremiander(uint8_t falg);
 +void Set_CallVolume(int value); //设置铃声和媒体音量
 +int Get_CallVolume(void); //获取铃声和媒体音量
  
 -    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_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);
  
  #ifdef __cplusplus
  #if __cplusplus

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