Merge branch 'yjq' into 'master'

20210803 add.h

See merge request chenweican/k-sdk!98

application/klansdk/kk_data_mng.c

@@ -52,7 +52,8 @@ void kk_map_dev_deinit(void)
 	kk_map_dev_node_t *n = NULL;
 
 	printf("[%s][%d]\n",__FUNCTION__,__LINE__);
-	
+
+	printf("[lock]_kk_map_dev_mutex_lock\n");
 	_kk_map_dev_mutex_lock();
 	list_for_each_entry_safe(node,n,&ctx->dev_list, linked_list, kk_map_dev_node_t) {
 
@@ -73,6 +74,7 @@ void kk_map_dev_deinit(void)
 			
 		}
 	}
+	printf("[unlock]_kk_map_dev_mutex_lock\n");
 	_kk_map_dev_mutex_unlock();
 }
 

application/klansdk/kk_lan_main.c

@@ -54,15 +54,9 @@ static void kk_lan_ccuid_init(void)
         _setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
     }
 }
-static void sig_handler(int sig)
-{
-	printf("Received signal: %d\n", sig);
-	abort();
-}
 
 
-extern void ttttt_test();
-extern void kk_scene_build_test(void);
+
 
 int main(int argc, char* argv[])
 {
@@ -71,31 +65,18 @@ int main(int argc, char* argv[])
 	open("kk_lan",LOG_PID,LOG_USER);
 
 
-	kk_scene_build_test();
 	/*set the callback to get the device date to cloud*/
 	kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromMid,NULL,NULL);
 	kk_findccu_handle_init();
 	kk_map_dev_init();
 	kk_login_init();
-	struct sigaction sig = {0};
-	sig.sa_handler = sig_handler;
-	sig.sa_flags = 0;
-	for(int i=0;i<31;i++){
-		//sigaction(i, &sig, NULL);
-	}
-	
 
 	//lan_queue_init();
 	kk_lan_db_node_init();
-	kk_handle_sync_info();
+	//kk_handle_sync_info();
 
 
 	while(1){
-		
-		//count++;
-		//if(count == 10){
-			//kk_ipc_send(IPC_APP2MID, "wooooooooooooooooooooooooooooooooooollllll!", strlen("wooooooooooooooooooooooooooooooooooollllll!")+1);
-		//}
 		sleep(1);
 	}
 	return rc;

application/klansdk/kk_lan_sync.h

+#ifndef __KK_LAN_SYNC_H
+#define __KK_LAN_SYNC_H
+
+#include "cJSON.h"
+
+
+typedef struct{
+	char *floor_id;
+	char *room_id;
+	char *room_icon;
+	char *room_name;
+	cJSON *room_status;
+}SYN_ROOM_ITEM;
+
+
+typedef struct {
+	char *ui_area;
+	char *ui_name;
+	char *delay;
+	int nodeid;
+	char *operate_type;
+	char *operation;
+	char *ui_room_id;
+}SYN_SCENE_ACTION;
+
+typedef struct{
+	char *scene_id;
+	char *name;
+	char *pannel_id;
+	char *room_id;
+	char *time;
+	char *week;
+	SYN_SCENE_ACTION *act;
+	int act_num;
+}SYN_SCENE_ITEM;
+
+
+cJSON *kk_get_raw_sync_data(cJSON *payload);
+
+
+
+
+cJSON *kk_sync_rooms_to_sdk(cJSON *root,cJSON *payload);
+cJSON *kk_sync_scence_to_sdk(cJSON *root,cJSON *data);
+int kk_sync_devices_to_sdk(cJSON *root);
+int kk_sync_devices_status_to_sdk(cJSON *root);
+
+int kk_create_syncinfo_to_sdk(cJSON *payload);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif
+

common/hal/HAL_OS_linux.c

@@ -282,6 +282,12 @@ int HAL_GetProduct_Code(_OU_ char *product_code)
 	return strlen(KK_CCU_PRODUCTID);
 }
 
+int HAL_GetDevice_Code(_OU_ char *dev_code)
+{
+	strncpy(dev_code, KK_CCU_ID, strlen(KK_CCU_ID));
+	dev_code[strlen(KK_CCU_ID)] = '\0';
+	return strlen(KK_CCU_ID);
+}
 
 
 int HAL_GetVersion(_OU_ char *version)