fix two bugs about publish

Author: chunhuajiang

mqtt_sdk/mqtt/mqtt.h

@@ -11,7 +11,7 @@ extern "C" {
 #include "config.h"
 #include "mqtt_buffer.h"
 
-#define MQTTSAVEDPTOPICNAME "Sdp"
+#define MQTTSAVEDPTOPICNAME "$dp"
 
 /** MQTT错误码 */
 enum MqttError {
@@ -566,4 +566,4 @@ int Mqtt_AppendFloatDP(char *data, size_t *len, int16_t dsid, float  *datapoint,
 } // extern "C"
 #endif // __cplusplus
 
-#endif // ONENET_MQTT_H
+#endif // ONENET_MQTT_H

mqtt_sdk/src/mqtt.c

@@ -2045,7 +2045,7 @@ int Mqtt_PackDataPointByString(struct MqttBuffer *buf, uint16_t pkt_id, int64_t
         char payload[payload_size];
 
         //填充payload
-        payload[0] = kTypeString & 0xFF;
+        payload[0] = type & 0xFF;
         payload[1] = (size>>8)&0xFF;
         payload[2] = size&0xFF;
         memcpy(payload+3, str, size);