Merge branch 'hzl' into 'master'

1.提交8197 curl库

See merge request chenweican/k-sdk!163

application/klansdk/kk_data_handle.c

@@ -132,7 +132,7 @@ void kk_handle_get_history_info(void)
 	if(send_data == NULL){
 		return;
 	}
-	printf("kk_ipc_send........%s	\n",send_data);
+	INFO_PRINT("kk_ipc_send........%s	\n",send_data);
 	kk_ipc_send(IPC_APP2MID, send_data, strlen(send_data)+1);
 	free(send_data);
 }
@@ -761,18 +761,18 @@ static int kk_lan_scene_handle(cJSON *payload,int isAdd)
 	cJSON *sceneId = NULL;
 
 	if(payload == NULL){
-		debug_log(LOG_DEBUG_LEVEL,"[err] payload.\n");
+		DEBUG_PRINT("[err] payload.\n");
 		return -1;
 	}
 
 	if((params = cJSON_GetObjectItem(payload, MSG_PARAMS_STR))==NULL||
 		params->type!=cJSON_Object){
-		debug_log(LOG_DEBUG_LEVEL,"[err] params err.\n");
+		DEBUG_PRINT("[err] params err.\n");
 		return -1;
 	}
 	if((sceneId = cJSON_GetObjectItem(params, MSG_SCENE_SCENEID))==NULL ||
 		sceneId->type!=cJSON_String){
-		debug_log(LOG_DEBUG_LEVEL,"[err] sceneId err.\n");
+		DEBUG_PRINT("[err] sceneId err.\n");
 		return -1;
 	}
 
@@ -863,13 +863,21 @@ static int  kk_client_info_push_handle(cJSON *payload)
 	free(pData);
 	return 0;
 }
-void KK_Data_FromMid(void* str,int len)
+void KK_Data_FromMid(void* str,int len, char* chalMark)
 {
 	cJSON *json = NULL;
 	cJSON *info = NULL,*payload = NULL;
 	cJSON *msgtype = NULL,*deviceCode = NULL,*productCode = NULL;
 
-	debug_log(LOG_CRIT_LEVEL,"[midware->lan] len=%d,data=%s\n",len,(char *)str);
+	if (str == NULL || len == 0){
+		INFO_PRINT("[midware->lan][%s] str or len is error \n",__FUNCTION__);
+		return;
+	}
+
+
+
+	INFO_PRINT("[midware->lan] len=%d,data=%s\n",len,(char *)str);
+
 
 	if((json= cJSON_Parse(str)) == NULL) {
 		return;

application/klansdk/kk_data_handle.h

@@ -6,7 +6,7 @@
 #include "kk_product.h"
 int kk_data_handle(cJSON *json,int sockfd);
 void kk_handle_sync_info(void);
-void KK_Data_FromMid(void* str,int len);
+void KK_Data_FromMid(void* str,int len, char* chalMark);
 
 
 int kk_lan_property_syn_deal(const char *deviceCode,cJSON *properties);

application/klansdk/kk_lan_debug.h

@@ -92,9 +92,9 @@ static const int g_syslog		 = 1;
 			time_t curTime = time(NULL); \
 			struct tm *ptm = localtime(&curTime);\
 			snprintf(dateTime,sizeof(dateTime),"%d-%d-%d %d:%d:%d",(ptm->tm_year+1900),(ptm->tm_mon+1),ptm->tm_mday,ptm->tm_hour,ptm->tm_min,ptm->tm_sec);\
-			printf("%s%s %s(%d):%s::"format"\033[m", LOG_LEVEL_(level),dateTime,basename(__FILE__),__LINE__,__func__,##__VA_ARGS__); \
+			printf("%s%s %s(%d):%s::"format"\033[m", LOG_LEVEL_(level),dateTime,(__FILE__),__LINE__,__func__,##__VA_ARGS__); \
 			if (g_syslog!=0){ \
-				syslog(SYSLOG_LEVEL_(level),"%s %s %s(%d):%s::"format,LOG_STRING(level),dateTime,basename(__FILE__),__LINE__,__func__,##__VA_ARGS__); \
+				syslog(SYSLOG_LEVEL_(level),"%s %s %s(%d):%s::"format,LOG_STRING(level),dateTime,(__FILE__),__LINE__,__func__,##__VA_ARGS__); \
 			} \
 		} \
 	}while(0)
@@ -104,7 +104,7 @@ static const int g_syslog		 = 1;
 
 
 
-//#define VOICE_SUPPORT 
+//#define VOICE_SUPPORT
 
 
 

application/klansdk/kk_lan_main.c

@@ -211,9 +211,10 @@ int main(int argc, char* argv[])
 	
 	/* setup alarm signal handler */
 	//#ifdef CONFIG_NX5_PLATFORM
-	for(int i=1;i<32;i++){
-		signal(i, handler);
-	}
+	//for(int i=1;i<32;i++){
+	//	printf("allan i=%d \n", i);
+	//	signal(i, handler);
+	//}
 	//#endif
 
 	//signal(SIGPIPE, SIG_IGN);
@@ -254,19 +255,19 @@ int main(int argc, char* argv[])
 			char *send_data = NULL;
 
 			if(g_sync_flag&SYNC_INFO_FLAG){
-				debug_log(LOG_INFO_LEVEL,"[SYNC INFO].\n");
+				DEBUG_PRINT("[SYNC INFO].\n");
 				
 				send_data = _kk_data_create(SYNC_MSG_TYPE,"*","*","*");
 				g_sync_flag&=~SYNC_INFO_FLAG;
 			}else if(g_sync_flag&SYNC_INFO_PUSH_FLAG){
-				debug_log(LOG_INFO_LEVEL,"[SYNC INFO PUSH].\n");
-				
+				DEBUG_PRINT("[SYNC INFO PUSH].\n");
+
 				send_data  = _kk_data_create(SYNCPUSH_MSG_TYPE,"*","*","*");
 				kk_handle_sync_push_info();
 				g_sync_flag&=~SYNC_INFO_PUSH_FLAG;
 			}else{
 				g_sync_flag = 0;
-				debug_log(LOG_ALERT_LEVEL,"err\n");
+				DEBUG_PRINT("err\n");
 			}
 
 			if(send_data != NULL){

midware/midware/midware.c

@@ -156,7 +156,7 @@ static int HAL_Ccuid_init(void)
     printf("GET_CCUID_CMD:%s\n",ccuid);
     if(ccuid_len > 0 && ccuid_len <= DEVICE_CODE_LEN){
 		sprintf(ccuidTmp,"CCU_%s",ccuid);
-        _setDevice_Code(ccuidTmp,strlen(ccuidTmp)+1);
+        _setDevice_Code(ccuidTmp,strlen(ccuidTmp)-1);
     }else{
         //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
 		return -1;

script/onboot_8197.sh

@@ -7,8 +7,8 @@ eval `flash get CUSTOMER_HW_KK_OPTION0`	#|cut -d '=' -f 2`;
 curr_hostname=`cat /etc/hostname`;
 
 if [ "$CUSTOMER_HW_KK_OPTION0" != "$curr_hostname" ]; then
-   	echo "$CUSTOMER_HW_KK_OPTION2" > /etc/hostname
-   	hostname $CUSTOMER_HW_KK_OPTION2
+   	#echo "$CUSTOMER_HW_KK_OPTION0" > /etc/hostname
+   	hostname $CUSTOMER_HW_KK_OPTION0
 	/etc/init.d/S01syslogd restart
 fi
 

tools/board/config.linux.8197

@@ -27,9 +27,9 @@ CONFIG_ENV_CFLAGS   += -Wno-unused -std=c99
 CONFIG_ENV_LDFLAGS  += -lpthread -lrt
 #CONFIG_ENV_LDFLAGS  += -rpath-link /home/kk/share/rtl8197f/buildroot-2021.02/output/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib -lpthread -lrt
 
-OVERRIDE_CC = mipsel-buildroot-linux-uclibc-gcc
-OVERRIDE_AR = mipsel-buildroot-linux-uclibc-ar
-OVERRIDE_LD = mipsel-buildroot-linux-uclibc-ld
-CROSS_PREFIX = mipsel-buildroot-linux-uclibc-
+OVERRIDE_CC = mipsel-linux-gcc
+OVERRIDE_AR = mipsel-linux-ar
+OVERRIDE_LD = mipsel-linux-ld
+CROSS_PREFIX = mipsel-linux-
 
-OVERRIDE_STRIP      := mipsel-buildroot-linux-uclibc-strip
+OVERRIDE_STRIP      := mipsel-linux-strip