【修改内容】修改根据物模型的文档定义上报数据

【提交人】陈伟灿

midware/midware/dm/iotx_dm.h

@@ -183,7 +183,6 @@ int iotx_dm_get_opt(int opt, void *data);
 #ifdef LOG_REPORT_TO_CLOUD
     int iotx_dm_log_post(_IN_ int devid, _IN_ char *payload, _IN_ int payload_len);
 #endif
-int iotx_dm_post_property(_IN_ int devid, _IN_ char *payload, _IN_ int payload_len);
 int iotx_dm_property_desired_get(_IN_ int devid, _IN_ char *payload, _IN_ int payload_len);
 int iotx_dm_property_desired_delete(_IN_ int devid, _IN_ char *payload, _IN_ int payload_len);
 int iotx_dm_post_event(_IN_ int devid, _IN_ char *identifier, _IN_ int identifier_len, _IN_ char *payload,

midware/midware/dm/kk_dm_api.c

@@ -33,23 +33,6 @@ static void _dm_api_unlock(void)
 }
 
 
-int iotx_dm_post_property(_IN_ int devid, _IN_ char *payload, _IN_ int payload_len)
-{
-    int res = 0;
-
-    _dm_api_lock();
-
-    res = dm_mgr_upstream_thing_property_post(devid, payload, payload_len);
-    if (res < SUCCESS_RETURN) {
-        _dm_api_unlock();
-        return FAIL_RETURN;
-    }
-
-    _dm_api_unlock();
-    return res;
-}
-
-
 int iotx_dm_subdev_create(_IN_ char product_key[PRODUCT_KEY_MAXLEN],
                           _IN_ char device_name[DEVICE_NAME_MAXLEN],
                           _IN_ char device_secret[DEVICE_SECRET_MAXLEN], _OU_ int *devid)

midware/midware/dm/kk_dm_mng.c

@@ -7,6 +7,8 @@
 #include "kk_tsl_load.h"
 #include "iot_export_linkkit.h"
 #include "kk_product.h"
+
+
 //const char DM_URI_SYS_PREFIX[]                        DM_READ_ONLY = "/sys/%s/%s/";
 const char DM_URI_EXT_SESSION_PREFIX[]                DM_READ_ONLY = "/ext/session/%s/%s/";
 const char DM_URI_EXT_NTP_PREFIX[]                    DM_READ_ONLY = "/ext/ntp/%s/%s/";
@@ -46,7 +48,6 @@ const char DM_URI_COMBINE_LOGOUT[]                    DM_READ_ONLY = "combine/lo
 const char DM_URI_COMBINE_LOGOUT_REPLY[]              DM_READ_ONLY = "combine/logout_reply";
 
 
-
 static dm_mgr_ctx g_dm_mgr = {0};
 static dm_mgr_ctx *_dm_mgr_get_ctx(void)
 {
@@ -296,26 +297,43 @@ ERROR:
     memset(ctx, 0, sizeof(dm_mgr_ctx));
     return FAIL_RETURN;
 }
+const char DM_MSG_THING_UPSTREAM_REQUEST_PARAMS[] DM_READ_ONLY =
+          "{\"value\":%s,\"timestamp\":\"%s\"}";
 static int _dm_mgr_upstream_request_assemble(_IN_ int msgid, _IN_ int devid, _IN_ const char *service_prefix,
         _IN_ const char *service_name,
         _IN_ char *params, _IN_ int params_len, _IN_ char *method, _OU_ dm_msg_request_t *request)
 {
     int res = 0;
+    char timestamp[DM_UTILS_UINT64_STRLEN] = {0};	
     dm_mgr_dev_node_t *node = NULL;
-
+	int paramLen = 0;
+	char *payload_param = NULL;
     res = dm_mgr_search_dev_by_devid(devid, &node);
     if (res != SUCCESS_RETURN) {
         return FAIL_RETURN;
     }
 
+    /* TimeStamp */
+    HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_UptimeMs());
+    /* dm_log_debug("Time Stamp: %s", timestamp); */
+    paramLen = strlen(DM_MSG_THING_UPSTREAM_REQUEST_PARAMS) +
+                    params_len + strlen(timestamp) + 1;
+    payload_param = malloc(paramLen);
+    if (payload_param == NULL) {
+      return MEMORY_NOT_ENOUGH;
+    }
+
+    memset(payload_param, 0, paramLen);
+    HAL_Snprintf(payload_param, paramLen, DM_MSG_THING_UPSTREAM_REQUEST_PARAMS, params,timestamp);
+
     request->msgid = msgid;
     request->devid = devid;
     request->service_prefix = service_prefix;
     request->service_name = service_name;
     memcpy(request->product_key, node->product_key, strlen(node->product_key));
     memcpy(request->device_name, node->device_name, strlen(node->device_name));
-    request->params = params;
-    request->params_len = params_len;
+    request->params = payload_param;
+    request->params_len = paramLen;
     request->method = method;
 
     return SUCCESS_RETURN;
@@ -348,6 +366,7 @@ int dm_mgr_upstream_thing_property_post(_IN_ int devid, _IN_ char *payload, _IN_
 
     /* Send Message To Cloud */
     res = dm_msg_request(&request);
+	free(request.params);
     return res;
 }
 int dm_mgr_upstream_thing_event_post(_IN_ int devid, _IN_ char *identifier, _IN_ int identifier_len, _IN_ char *method,
@@ -465,7 +484,7 @@ int dm_mgr_upstream_thing_sub_register(_IN_ int devid)
     int res = 0;
     dm_mgr_dev_node_t *node = NULL;
     dm_msg_request_t request;
-
+	
     if (devid < 0) {
         return INVALID_PARAMETER;
     }
@@ -764,4 +783,4 @@ int dm_mgr_subdev_create(_IN_ char product_key[PRODUCT_KEY_MAXLEN],
     }
 
     return res;
-}
\ No newline at end of file
+}

midware/midware/dm/kk_dm_msg.c

@@ -15,8 +15,7 @@ const char DM_URI_THING_SERVICE_RESPONSE[]			  DM_READ_ONLY = "thing/service/%.*
 const char DM_URI_THING_EVENT_PROPERTY_POST_METHOD[]  DM_READ_ONLY = "thing.event.property.post";
 
 
-
-const char DM_MSG_REQUEST[] DM_READ_ONLY = "{\"id\":\"%d\",\"version\":\"%s\",\"params\":%.*s,\"method\":\"%s\"}";
+const char DM_MSG_REQUEST[] DM_READ_ONLY = "{\"msgId\":\"%d\",\"version\":\"%s\",\"params\":%.*s,\"method\":\"%s\"}";
 
 void kk_sendData2app(void *uri, void *payload){
     cJSON *root=cJSON_CreateObject();
@@ -388,7 +387,7 @@ int dm_msg_request (_IN_ dm_msg_request_t *request)
 }
 
 
-const char DM_MSG_RESPONSE_WITH_DATA[] DM_READ_ONLY = "{\"id\":\"%.*s\",\"code\":%d,\"data\":%.*s}";
+const char DM_MSG_RESPONSE_WITH_DATA[] DM_READ_ONLY = "{\"msgId\":\"%.*s\",\"code\":%d,\"data\":%.*s}";
 int dm_msg_response(_IN_ kk_msg_request_payload_t *request, _IN_ kk_msg_response_t *response,
                     _IN_ char *data, _IN_ int data_len, _IN_ void *user_data)
 {

midware/midware/dm/kk_dm_msg.h

 #ifndef __KK_DM_MSG__
 #define __KK_DM_MSG__
 #include "kk_tsl_common.h"
+
 #include "../tsl_handle/lite-cjson.h"
 
 
@@ -26,53 +27,6 @@
 #define DM_MSG_SIGN_METHOD_HMACSHA256   "hmacSha256"
 
 
-/*typedef enum {
-    IOTX_DM_EVENT_CLOUD_CONNECTED  = 0,
-    IOTX_DM_EVENT_CLOUD_DISCONNECT,
-    IOTX_DM_EVENT_CLOUD_RECONNECT,
-    IOTX_DM_EVENT_LOCAL_CONNECTED,
-    IOTX_DM_EVENT_LOCAL_DISCONNECT,
-    IOTX_DM_EVENT_LOCAL_RECONNECT,
-    IOTX_DM_EVENT_FOUND_DEVICE,
-    IOTX_DM_EVENT_REMOVE_DEVICE,
-    IOTX_DM_EVENT_REGISTER_RESULT,
-    IOTX_DM_EVENT_UNREGISTER_RESULT,
-    IOTX_DM_EVENT_INITIALIZED,
-    IOTX_DM_EVENT_SEND_RESULT,
-    IOTX_DM_EVENT_ADD_SERVICE_RESULT,
-    IOTX_DM_EVENT_REMOVE_SERVICE_RESULT,
-    IOTX_DM_EVENT_NEW_DATA_RECEIVED,
-    IOTX_DM_EVENT_PROPERTY_SET,
-    IOTX_DM_EVENT_PROPERTY_GET,
-    IOTX_DM_EVENT_TOPO_ADD_NOTIFY,
-    IOTX_DM_EVENT_THING_SERVICE_REQUEST,
-    IOTX_DM_EVENT_THING_DISABLE,
-    IOTX_DM_EVENT_THING_ENABLE,
-    IOTX_DM_EVENT_THING_DELETE,
-    IOTX_DM_EVENT_MODEL_DOWN_RAW,
-    IOTX_DM_EVENT_GATEWAY_PERMIT,
-    IOTX_DM_EVENT_SUBDEV_REGISTER_REPLY,
-    IOTX_DM_EVENT_SUBDEV_UNREGISTER_REPLY,
-    IOTX_DM_EVENT_TOPO_ADD_REPLY,
-    IOTX_DM_EVENT_TOPO_DELETE_REPLY,
-    IOTX_DM_EVENT_TOPO_GET_REPLY,
-    IOTX_DM_EVENT_TOPO_ADD_NOTIFY_REPLY,
-    IOTX_DM_EVENT_EVENT_PROPERTY_POST_REPLY,
-    IOTX_DM_EVENT_EVENT_SPECIFIC_POST_REPLY,
-    IOTX_DM_EVENT_DEVICEINFO_UPDATE_REPLY,
-    IOTX_DM_EVENT_DEVICEINFO_DELETE_REPLY,
-    IOTX_DM_EVENT_DSLTEMPLATE_GET_REPLY,
-    IOTX_DM_EVENT_COMBINE_LOGIN_REPLY,
-    IOTX_DM_EVENT_COMBINE_LOGOUT_REPLY,
-    IOTX_DM_EVENT_MODEL_UP_RAW_REPLY,
-    IOTX_DM_EVENT_LEGACY_THING_CREATED,
-    IOTX_DM_EVENT_COTA_NEW_CONFIG,
-    IOTX_DM_EVENT_FOTA_NEW_FIRMWARE,
-    IOTX_DM_EVENT_NTP_RESPONSE,
-    IOTX_DM_EVENT_RRPC_REQUEST,
-    IOTX_DM_EVENT_MAX
-} iotx_dm_event_types_t;*/
-
 typedef struct {
     lite_cjson_t id;
     lite_cjson_t code;
@@ -92,6 +46,7 @@ const char DM_URI_THING_SERVICE_PROPERTY_SET_REPLY[]  DM_READ_ONLY;
 const char DM_URI_THING_EVENT_POST[]				  DM_READ_ONLY;
 const char DM_URI_THING_SERVICE_RESPONSE[]			  DM_READ_ONLY;
 const char DM_URI_THING_EVENT_PROPERTY_POST_METHOD[]  DM_READ_ONLY;
+//const char DM_URI_SYS_PREFIX[]                        DM_READ_ONLY = "/sys/%s/%s/";
 
 
 #endif