【修改内容】增加set property by mac的接口

【提交人】陈伟灿

midware/tsl/tsl_handle/kk_tsl_api.c

@@ -1234,26 +1234,85 @@ int kk_msg_uri_parse_pkdn(_IN_ char *uri, _IN_ int uri_len, _IN_ int start_deli,
 
     return SUCCESS_RETURN;
 }
+int kk_tsl_response_ok(const char *topic, const char *payload, unsigned int payload_len)
+{   
+	int res = 0;
+    char product_key[PRODUCT_KEY_MAXLEN] = {0};
+    char device_name[DEVICE_NAME_MAXLEN] = {0};
+	kk_msg_response_t response;
+    kk_msg_request_payload_t request;
+	
+    memset(&request, 0, sizeof(kk_msg_request_payload_t));	
+	memset(&response, 0, sizeof(kk_msg_response_t));
+    res =kk_msg_uri_parse_pkdn((char *)topic, strlen(topic), 2 + KK_URI_OFFSET, 4 + KK_URI_OFFSET, product_key,
+                                device_name);
+    res = _kk_msg_request_parse((char *)payload, payload_len, &request);
+    if (res < SUCCESS_RETURN) {
+        return res ;
+    }	
+    response.service_prefix = DM_URI_SYS_PREFIX;
+    response.service_name = DM_URI_THING_SERVICE_PROPERTY_SET_REPLY;
+    memcpy(response.product_key, product_key, strlen(product_key));
+    memcpy(response.device_name, device_name, strlen(device_name));
+    response.code = (res == SUCCESS_RETURN) ? (IOTX_DM_ERR_CODE_SUCCESS) : (IOTX_DM_ERR_CODE_REQUEST_ERROR);
+	dm_msg_response(&request, &response, "{}", strlen("{}"), NULL);
+	return SUCCESS_RETURN;
+
+}
+
+int kk_tsl_property_set_byMac(const char mac[DEVICE_MAC_MAXLEN], const char *payload, unsigned int payload_len)
+{
+    kk_msg_request_payload_t request;
+    int res = 0, devid = 0;
+
+    memset(&request, 0, sizeof(kk_msg_request_payload_t));
+
+    res = dm_mgr_get_devId_by_mac(mac, &devid);
+	if(res != SUCCESS_RETURN){
+		return FAIL_RETURN;
+	}
+    res = _kk_msg_request_parse((char *)payload, payload_len, &request);
+    if (res < SUCCESS_RETURN) {
+        return res ;
+    }
+
+    /* Operation */
+    res = _kk_msg_property_set(devid, &request);
+
+    /* Response */
+	kk_tsl_post_property(devid,NULL);
+
+#if 0
+#define EVENT_ERROR_IDENTIFIER "Error"
+#define EVENT_ERROR_OUTPUT_INFO_IDENTIFIER "ErrorCode"
+
+	//kk_tsl_post_property(devid,NULL);
+    char event_output_identifier[64];
+    snprintf(event_output_identifier, sizeof(event_output_identifier), "%s.%s",
+             EVENT_ERROR_IDENTIFIER, EVENT_ERROR_OUTPUT_INFO_IDENTIFIER);
+
+    int errorCode = 0;
+	printf("[%s][%d]\n",__FUNCTION__,__LINE__);
+    kk_tsl_set_value(kk_tsl_set_event_output_value, devid,
+                      event_output_identifier, &errorCode, NULL);
+	kk_tsl_post_event(devid,EVENT_ERROR_IDENTIFIER);
+#endif
+    return SUCCESS_RETURN;
+}
 
 int kk_tsl_service_property_set(const char *topic, const char *payload, unsigned int payload_len,
         void *context)
 {
-    kk_msg_source_t source;
     kk_msg_request_payload_t request;
-    kk_msg_response_t response;
+
 
     int res = 0, devid = 0;
     char product_key[PRODUCT_KEY_MAXLEN] = {0};
     char device_name[DEVICE_NAME_MAXLEN] = {0};
 
-    memset(&source, 0, sizeof(kk_msg_source_t));
     memset(&request, 0, sizeof(kk_msg_request_payload_t));
-    memset(&response, 0, sizeof(kk_msg_response_t));
 
-    source.uri = topic;
-    source.payload = (unsigned char *)payload;
-    source.payload_len = payload_len;
-    source.context = NULL;	
+
 
 	/**************to do*******************/	
 
@@ -1278,13 +1337,6 @@ int kk_tsl_service_property_set(const char *topic, const char *payload, unsigned
     res = _kk_msg_property_set(devid, &request);
 
     /* Response */
-    response.service_prefix = DM_URI_SYS_PREFIX;
-    response.service_name = DM_URI_THING_SERVICE_PROPERTY_SET_REPLY;
-    memcpy(response.product_key, product_key, strlen(product_key));
-    memcpy(response.device_name, device_name, strlen(device_name));
-    response.code = (res == SUCCESS_RETURN) ? (IOTX_DM_ERR_CODE_SUCCESS) : (IOTX_DM_ERR_CODE_REQUEST_ERROR);
-	dm_msg_response(&request, &response, "{}", strlen("{}"), NULL);
-
 	kk_tsl_post_property(devid,NULL);
 
 #if 0

midware/tsl/tsl_handle/kk_tsl_common.h

@@ -16,6 +16,7 @@
 #define DEVICE_NAME_MAXLEN          (32 + 1)
 #define DEVICE_SECRET_MAXLEN        (64 + 1)
 #define DEVICE_MAC_MAXLEN           (16 + 1)
+#define DEVICE_SN_MAXLEN            (32 + 1)
 
 #define TSL_PATH_MAXLEN             (64 + 1)