From: luozheng <1732036298@qq.com>
Date: Mon, 15 Apr 2024 08:18:44 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1189^2~3
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=87b57746071e5f9f00b6aaa7bc10e29e98c1dca9;p=mirrors%2FFD230.git

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

87b57746071e5f9f00b6aaa7bc10e29e98c1dca9
diff --cc code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 48e3bfaa3,78a0973ae..939bc9889
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@@ -1385,7 -1541,7 +1541,7 @@@ void GetDrinkSetParamCmd(uint16_t cmd,u
      
  }
  
- void jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据
 -static uint8_t jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据
++uint8_t jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据
  {
      uint8_t *json;
      json = buf;