Merge branch 'yjq' into 'master'

场景存action时问题修改

See merge request chenweican/k-sdk!139

midware/midware/dm/kk_sub_db.c

@@ -656,8 +656,9 @@ int kk_subDev_set_action_by_productType(const char *productType,const char *scen
 				property = (kk_tsl_data_t *)(node->dev_shadow->properties + idx);
 				if(property == NULL){
 					continue;
-				}	
-				if(strstr(property->identifier,propertyName) != NULL){
+				}
+				char *ptr = strstr(property->identifier,propertyName);
+				if(ptr != NULL && (ptr-property->identifier==0) ){
 					if(gw_support_scene){
 						kk_scene_action_detail_t info = {0};
 						memcpy(info.deviceCode,node->deviceCode,strlen(node->deviceCode));

midware/midware/scene/kk_scene_handle.c

@@ -621,8 +621,18 @@ static int kk_scene_parse_trigger_detail(const char *type,const cJSON *item,cons
 	if(compareType == NULL) return FAIL_RETURN;
 	compareValue = cJSON_GetObjectItem(item,MSG_SCENE_COMPAREVALUE);
 	if(compareValue == NULL) return FAIL_RETURN;	
-	res = kk_scene_insert_scene_trigger(type,deviceCode->valuestring,ep,
-			propertyName->valuestring,compareType->valuestring,compareValue->valuestring,sceneId,isAnd);
+
+	
+	if(!strcmp(propertyName->valuestring,"BodySensorNoActive")){
+		if(!strcmp(compareValue->valuestring,"0")){
+			res = kk_scene_insert_scene_trigger(type,deviceCode->valuestring,ep,
+			"MotionAlarmState",compareType->valuestring,"1",sceneId,isAnd);
+		}
+	}else{
+		res = kk_scene_insert_scene_trigger(type,deviceCode->valuestring,ep,
+		propertyName->valuestring,compareType->valuestring,compareValue->valuestring,sceneId,isAnd);
+	}
+
 	if(res != SUCCESS_RETURN){
 		ERROR_PRINT("kk_scene_parse_scene_trigger fail!!!\n");
 	}
@@ -2036,8 +2046,11 @@ int kk_scene_query_trigger_info(const char *deviceCode,cJSON *param)
 			cJSON *item = cJSON_GetObjectItem(param,identifier);
 			if(item != NULL){
 				propertyValueType = kk_dm_get_property_type(deviceCode,identifier);
+
 				res = kk_scene_check_value(compareType,compareValue,item,propertyValueType);
+			
 				if(res == SUCCESS_RETURN){
+					
 					INFO_PRINT("[%d]kk_scene_check_condition enter!!!\n",__LINE__);
 					res = kk_scene_check_condition(sceneId);
 					if(res == SUCCESS_RETURN){