增加目标数据设置限制

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index 0513d5a..5cac1cf 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -1963,13 +1963,19 @@ void set_user_data(msg_user_info_t *data)
     
     //目标站立
       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标站立 %d\r\n",data->target_stand);
+    if(data->target_stand)
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES,data->target_stand);
     //目标燃脂
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标燃脂 %d\r\n",data->fat_time);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标燃脂 %d\r\n",data->fat_time);
+    if(data->fat_time)
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION,data->fat_time);
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标卡路里 %d\r\n",data->fat_time);
+
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标卡路里 %d\r\n",data->fat_time);
+    if(data->calorie)
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES,data->calorie);
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标距离 %d\r\n",data->fat_time);
+
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标距离 %d\r\n",data->fat_time);
+    if(data->distance)
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE,data->distance);
 
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SET_USER_INFO, NULL);

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 71ab135..444ffe5 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -1219,7 +1219,8 @@ void sendBindInfor(uint8_t *data)
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2);\r
                 \r
             }\r
-        }else{\r
+        }\r
+        else{\r
             uint8_t buf[2]; \r
             memset(buf,0,2);\r
             buf[0] = DEVICEBIND;\r
@@ -1719,10 +1720,13 @@ static void SetOtherTarget(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *tota
         uint8_t ring = data[5];//铃声\r
         uint8_t vibratior = data[6];//振动\r
         uint8_t notify = data[7];//通知\r
-\r
+        if(target_km)\r
         set_goal_discount(target_km);\r
+        if(target_stand)\r
         set_goal_standupcount(target_stand);\r
+        if(target_fattime)\r
         set_goal_durationcount(target_fattime);\r
+        if(target_kcal)\r
         set_goal_caloriescount(target_kcal);\r
 \r
         // set_SilentMode(ring);\r
@@ -3565,9 +3569,9 @@ void query_dial_installed(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *dat
 \r
 void SetUserInfo(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//\r
 {\r
-    \r
 \r
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"getUserInfo ");\r
+\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"getUserInfo ");\r
 \r
     if(Check_CRC(data,len,crcvalue))\r
     {\r
@@ -3577,10 +3581,10 @@ void SetUserInfo(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *data,uint16_
 \r
         msg_user_info_t msg_userinfo = {0};\r
         msg_userinfo.age = p_userinfo->age;\r
-        msg_userinfo.fat_time = p_userinfo->fat_time;\r
+       msg_userinfo.fat_time = p_userinfo->fat_time;\r
         msg_userinfo.gender = p_userinfo->gender;\r
         msg_userinfo.height = p_userinfo->height;\r
-        msg_userinfo.target_stand = p_userinfo->target_stand;\r
+                msg_userinfo.target_stand = p_userinfo->target_stand;\r
         msg_userinfo.target_step = p_userinfo->target_step;\r
         msg_userinfo.timeformat = p_userinfo->timeformat;\r
         msg_userinfo.weight = p_userinfo->weight;\r
@@ -7552,9 +7556,11 @@ void decode_file_checksum_2AE6(ble_read_data *buffer_handle)
             switch(buffer_handle->file_recv_stat.file_type)\r
             {\r
                 case 1: //ota\r
+                    ble_reply_cmd(FILE_SUCC_TRANSFER,1);\r
+\r
                     do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_STARTOTA,NULL,0);\r
 \r
-                    ble_reply_cmd(FILE_SUCC_TRANSFER,1);\r
+                   \r
 \r
                     TRANSMIT_DATA=TRANS_OTA_SUCC;\r
                     CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r