From: Caisking <3449750381@qq.com>
Date: Fri, 19 Apr 2024 01:31:22 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1171^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7f1a9f50a3807fed31fac9a29d216bc0c43d8643;p=mirrors%2FFD230.git

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

7f1a9f50a3807fed31fac9a29d216bc0c43d8643
diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index c3068366a,085f0bb91..27241aecf
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@@ -25,41 -18,45 +25,51 @@@ extern "C
  
  #include "stdint.h"
  #include "errcode.h"
-     enum PAIRING
-     {
-         DEVICEBIND = 0,         //
-         DEVICEUNBIND,           // 设备解绑通知
-         DeviceUnBindingRequest, // 设备解绑请求(与新设备连接)通知
-         REBOOT,
-         SHUTDOWN
-     };
+ 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 TRANING
-     {
-         START = 0,
-         STOP,
-         RECOVER,
-         END
-     };
+ enum PAIRING
+ {
+     DEVICEBIND = 0,//
+     DEVICEUNBIND,//设备解绑通知
+     DeviceUnBindingRequest,//设备解绑请求(与新设备连接)通知
+     REBOOT,
+     SHUTDOWN
+ };
  
-     typedef struct
-     {
-         int sportType;
-         int controlmd;
-     } training_ble;
+ enum TRANING
+ {
+     START=0,
+     STOP,
+     RECOVER,
+     END
+ };
+ 
++typedef struct
++{
++    int sportType;
++    int controlmd;
++} training_ble;
 +
-     void set_weather_now_data(int humidity, char *windScale, char *textNight, int uvIndex, int temp, int iconNight);
+ 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);
+ 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(uint8_t falg);
-     uint8_t ble_is_connect_ready(void);
-     char *addressbook(void);
-     void addressbookToRead(void);
-     const char *get_health_data_path(void);
-     void add_addressbookToRead(char *data);
+ uint8_t ble_is_ready(void);
+ void set_ble_falg(uint8_t falg);
+ uint8_t ble_is_connect_ready(void);
+ char *addressbook(void);
+ void addressbookToRead(void);
+ const char *get_health_data_path(void);
+ void add_addressbookToRead(char *data);
  #ifdef __cplusplus
  #if __cplusplus
  }