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

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 e907c32,a3c54dd..af1fe85
--- 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
@@@ -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);

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