From: luozheng <1732036298@qq.com> Date: Sat, 15 Jun 2024 10:06:46 +0000 (+0800) Subject: Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~995 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F295%2F1;p=mirrors%2FFD230.git Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 --- fb57de618fc421b2a514ed6e956a60096daf0f88 diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.h index e907c32c7,a3c54dd9b..af1fe85c3 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h @@@ -108,8 -108,7 +108,8 @@@ struct message_infor_t *get_message_inf 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_one_data(int tempMin, int iconDay,int fxDate, int tempMax, char *textDay,int count); ++void set_weather_one_data(int tempMin, int iconDay,int fxDate, int tempMax, char *textDay,int count) ; +void ble_UpdateMainWeatherData(void); uint8_t ble_is_ready(void); void set_ble_falg(bool falg);