Changeset 399 for azure_iot_hub/trunk/app_iothub_client/src/client.c

Timestamp:

Jun 5, 2019, 2:23:55 PM (5 years ago)

Author:

coas-nagasima

Message:

更新

File:

• azure_iot_hub/trunk/app_iothub_client/src/client.c (modified) (4 diffs)

azure_iot_hub/trunk/app_iothub_client/src/client.c

@@ -218 +218 @@
                                 printf("failure to set option \"MinimumPollingTime\"\r\n");
                         }
+
+                        bool traceOn = 1;
+                        if (IoTHubClient_LL_SetOption(iotHubClientHandle, OPTION_LOG_TRACE, &traceOn) != IOTHUB_CLIENT_OK)
+                        {
+                                printf("failure to set option \"log trace on\"\r\n");
+                        }
 #endif
 #ifdef SET_TRUSTED_CERT_IN_SAMPLES
@@ -241 +247 @@
                                 do
                                 {
-                                        //(void)printf("iterator: [%d], callbackCounter: [%d]. \r\n", iterator, callbackCounter);
-
-                                        if (iterator < MESSAGE_COUNT && (iterator <= callbackCounter))
+                                        if ((iterator < MESSAGE_COUNT) && (iterator <= callbackCounter))
                                         {
                                                 temperature = minTemperature + (rand() % 10);
@@ -265 +269 @@
                                                         }
 
-                                                        (void)IoTHubMessage_SetContentTypeSystemProperty(messages[iterator].messageHandle, "application/json");
-                                                        (void)IoTHubMessage_SetContentEncodingSystemProperty(messages[iterator].messageHandle, "utf-8");
+                                                        if (proto == 0) {
+                                                                (void)IoTHubMessage_SetContentTypeSystemProperty(messages[iterator].messageHandle, "application/json");
+                                                                (void)IoTHubMessage_SetContentEncodingSystemProperty(messages[iterator].messageHandle, "utf-8");
+                                                        }
 
                                                         if (IoTHubClient_LL_SendEventAsync(iotHubClientHandle, messages[iterator].messageHandle, SendConfirmationCallback, &messages[iterator]) != IOTHUB_CLIENT_OK)
@@ -277 +283 @@
                                                         }
                                                 }
+                                                iterator++;
                                         }
 
                                         IoTHubClient_LL_DoWork(iotHubClientHandle);
                                         ThreadAPI_Sleep(1);
-
-                                        iterator++;
 
                                         if (callbackCounter >= MESSAGE_COUNT)