Merge branch 'yjq' into 'master'

Yjq

See merge request chenweican/k-sdk!148

midware/midware/dm/kk_sub_db.h

@@ -19,7 +19,7 @@ int kk_subDev_send_property_get_from_db(void);
 int kk_subDev_send_property_get(const char *fatherDeviceCode);
 
 int kk_subDev_check_scene_support(const char *deviceCode);
-int kk_subDev_set_action_by_productType(char *productType,char *sceneId,char *propertyName,char *propertyValue,char *type,int delay);
+int kk_subDev_set_action_by_productType(const char *productType,const char *roomId,const char *sceneId,const char *propertyName,const char *propertyValue,const char *type,int delay);
 int kk_subDev_update_offline(int isOffline,const char *deviceCode);
 int kk_subDev_getSensors_reply(SensorType_t*list);
 int kk_load_subDevice(void);

midware/midware/midware.c

@@ -1431,7 +1431,7 @@ int main(const int argc, const char **argv)
 		return -1;
 	}
 
-	bodySensor_load();
+	
 
 	//int ct = 0;
 	for (;;) {

midware/midware/scene/kk_scene_handle.c

@@ -312,6 +312,7 @@ int kk_scene_init(void)
 	}
 
 	kk_scene_timer_load();
+	bodySensor_load();
 	res = pthread_create((pthread_t *)&ctx->s_scene_thread, NULL, kk_scene_yield, NULL);
 	if (res < 0) {
 		ERROR_PRINT("HAL_ThreadCreate mid Failed\n");
@@ -597,6 +598,32 @@ typedef struct BodySensorNoActive{
 
 static BodySensorNoActive* pBodySensor = NULL;
 
+int bodySensor_delete(int scene_id)
+{
+	BodySensorNoActive *ptr = NULL,*pre = NULL;
+
+	ptr = pBodySensor;
+
+	while(ptr){
+
+		if(ptr->scene_id==scene_id){
+
+			if(pre!=NULL){
+				pre->next = ptr->next;
+			}else{
+				pBodySensor = NULL;
+			}
+			free(ptr);
+			return 1;
+		}
+		pre = ptr;
+		ptr = ptr->next;
+	}
+
+	return 0;
+
+}
+
 int bodySensor_insert(const char *deviceCode,int ep,int noActive_time,int scene_id)
 {
 	BodySensorNoActive *ptr = NULL,*pre = NULL;
@@ -1417,6 +1444,7 @@ int kk_scene_parse_deletescene(char *sceneId)
 		ERROR_PRINT("[%d]kk_scene_parse_deletescene fail!!!\n",__LINE__);
 		return INVALID_PARAMETER;
 	}
+	bodySensor_delete(atoi(sceneId));
 	kk_scene_delete(sceneId,1);	
 	return SUCCESS_RETURN;
 }