【修改内容】修改NX5编译不通过的BUG

【提交人】陈伟灿

application/klansdk/kk_oldccu_msg.h

@@ -27,7 +27,7 @@ int kk_lan_device_delete_notify(cJSON *payload);
 
 cJSON *_kk_sync_devicestatus_arg_build(kk_map_dev_node_t *node,int ch);
 int kk_send_indoorAir_status(cJSON *info,const char *deviceCode);
-
+void kk_record_motorPosition(int value);
 
 
 

midware/midware/dm/kk_motor_bind_db.c

@@ -390,7 +390,7 @@ int kk_motor_bind_db_find_dummyId(const char* panelDCode,int panelEpNum,const ch
 }
 
 
-
+extern int kk_service_delete_bind_2gw(char *deviceCode,int type);//type 0:panel;1:motor
 int kk_motor_bind_db_delete_by_deviceCode(const char* deviceCode)
 {
 	const char *deleteCmd = "delete from PanelBindMotor where motorDCode = '%s' ;";
@@ -399,7 +399,7 @@ int kk_motor_bind_db_delete_by_deviceCode(const char* deviceCode)
 	char *zErrMsg = 0;
 	kk_motor_bind_ctx_t *ctx = _kk_motor_bind_get_ctx();
 	//printf("---------------------------->[%s][%d]\n",__FUNCTION__,__LINE__);
-	kk_service_delete_bind_2gw(deviceCode,1);
+	kk_service_delete_bind_2gw((char*)deviceCode,1);
 	_kk_motor_bind_lock();
 	sqlCmd = sqlite3_mprintf(deleteCmd,deviceCode);
 
@@ -414,7 +414,7 @@ int kk_motor_bind_db_delete_by_deviceCode(const char* deviceCode)
 	sqlite3_free(sqlCmd);
 	_kk_motor_bind_unlock();
 	//printf("---------------------------->[%s][%d]\n",__FUNCTION__,__LINE__);
-	kk_service_delete_bind_2gw(deviceCode,0);
+	kk_service_delete_bind_2gw((char*)deviceCode,0);
 	kk_motor_bind_db_delete_ex(deviceCode);
 	
 	return SUCCESS_RETURN;

midware/midware/dm/kk_motor_bind_db.h

 #ifndef __KK_MOTOR_BIND_DB_H__
 #define __KK_MOTOR_BIND_DB_H__
 #include "cJSON.h"
-enum{
+enum{
 	MOTOR_BIND_DB_PANEL_DEVICECODE = 0,
 	MOTOR_BIND_DB_PANEL_EP,
 	MOTOR_BIND_DB_MOTOR_DEVICECODE,
@@ -23,6 +23,6 @@ int kk_motor_bind_db_find(const char* panelDCode,int panelEpNum,struct kk_motor_
 int kk_motor_bind_db_find_ex(int dummyId,struct kk_motor_bind_info* info,int max);
 int kk_motor_bind_db_find_dummyId(const char* panelDCode,int panelEpNum,const char* motorDCode,int motorEpNum);
 int kk_motor_bind_db_delete_by_deviceCode(const char* deviceCode);
-
-
+int kk_motor_bind_db_find_byDeviceCode(const char* panelDCode,struct kk_motor_bind_info* info,int max);
+int kk_motor_bind_db_find_byMotorDeviceCode(const char* motorCode,struct kk_motor_bind_info* info,int max);
 #endif

midware/midware/dm/kk_sub_db.c

@@ -777,7 +777,7 @@ int kk_subDev_set_action_by_productType(const char *productType,const char *room
 		   }
 		    if(strcmp(typeArray[k],KK_DM_AIR_GATEWAY_TYPE) == 0){
 				devIsExsit = 1;
-			    _kk_indoor_air_handle(pDeviceCode,(char*)sceneId,(char*)propertyName,(char*)propertyValue,(char*)type,delay,node->fatherDeviceCode,roomId);
+			    _kk_indoor_air_handle(pDeviceCode,(char*)sceneId,(char*)propertyName,(char*)propertyValue,(char*)type,delay,node->fatherDeviceCode,(char*)roomId);
 			    continue;
 		    }else if(strcmp(typeArray[k],KK_DM_AIR_SWITCH_GATEWAY_TYPE) == 0){
 			    _kk_air_switch_handle(pDeviceCode,(char*)sceneId,(char*)propertyName,(char*)propertyValue,(char*)type,delay,node->fatherDeviceCode);