Merge branch 'cwc' into 'master'

【修改内容】修改网关topo add在连上云后上报

See merge request chenweican/k-sdk!130

midware/midware/dm/kk_dm_mng.c

@@ -990,7 +990,7 @@ int dm_mgr_upstream_thing_sub_register(_IN_ int devid)
 	//request.callback = dm_client_thing_sub_register_reply;
 
 	/* Send Message To Cloud */
-	res = dm_msg_request(&request,0);
+	res = dm_msg_request(&request,1);
 
 	free(request.params);
 
@@ -1111,7 +1111,7 @@ int dm_mgr_upstream_thing_topo_add(_IN_ int devid)
 
 
     /* Send Message To Cloud */
-    res = dm_msg_request(&request,0);
+    res = dm_msg_request(&request,1);
 
     free(request.params);
 
@@ -1390,7 +1390,11 @@ int dm_mgr_upstream_status_online(_IN_ int devid)
 
 
 	/* Send Message To Cloud */
-	res = dm_msg_request(&request,0);
+	if(node->dev_type == KK_DM_DEVICE_GATEWAY){
+		res = dm_msg_request(&request,1);
+	}else{
+		res = dm_msg_request(&request,0);
+	}
 
 	free(request.params);
 

midware/midware/dm/kk_linkkit.c

@@ -1935,7 +1935,7 @@ int kk_mid_subdev_add(int devType, char productCode[PRODUCT_CODE_MAXLEN], char d
 			s_gateway_add_flag = 1;
 		}else{
 			ERROR_PRINT("Cloud is not connected!!!!!!!!\n");
-			return FAIL_RETURN;
+			//return FAIL_RETURN;
 		}
 	}
 	_iotx_linkkit_mutex_lock();

midware/midware/dm/kk_sub_db.c

@@ -408,7 +408,7 @@ int kk_subDev_check_auth(int devType)
 		printf("------------------------------------------------------->222\n");
 	    char *pDeviceCode = (char*)sqlite3_column_text(stmt, DB_SUB_DEVICECODE);
 	   	char *pProductCode = (char*)sqlite3_column_text(stmt, DB_SUB_PRODUCTCODE);
-		kk_msg_cloud_status_notify(pProductCode,pDeviceCode);
+		kk_msg_cloud_status_notify(pDeviceCode,pProductCode);
 		//kk_subDev_update_auth(1,pDeviceCode);
     }
 	sqlite3_finalize(stmt);