Merge branch 'cwc' into 'master'

Cwc

See merge request chenweican/k-sdk!197

application/kcloud/kcloud_main.c

@@ -27,6 +27,7 @@
 #include "com_api.h"
 #include "kk_product.h"
 #include "kk_hal.h"
+#include "ccu_ver.h"
 //#include "kcloud_log.h"
 static char s_ccuid[DEVICE_CODE_LEN] = {0};
 int KK_Get_ccuid(char *device_code)
@@ -266,8 +267,33 @@ static int setStoragePath(char* path){
 	kk_set_storage_dir(path);
 	return 0;
 }
+#if CONFIG_NX5_PLATFORM
+static char s_Version[VERSION_MAXLEN] = {0};
+static void kk_cloud_ccuid_version(void)
+{
+	FILE *fp;
 
-
+	if(!(fp =  fopen(KK_VERSION_FILE_PATH,"r")))
+	{
+		ERROR_PRINT("can't open the file tslPath:%s\n",KK_VERSION_FILE_PATH);
+		strncpy(s_Version, KK_CCU_VERSION, strlen(KK_CCU_VERSION));
+		return ;
+	}
+	fread(s_Version, 1, VERSION_MAXLEN, fp);
+	if(strlen(s_Version) == 0){
+		strncpy(s_Version, KK_CCU_VERSION, strlen(KK_CCU_VERSION));
+	}
+	INFO_PRINT("HAL_Ccuid_version version:%s!!!\n",s_Version);
+	fclose(fp);
+	return;
+}
+int kk_GetVersion(_OU_ char *version)
+{
+	strncpy(version, s_Version, strlen(s_Version));
+	version[strlen(s_Version)] = '\0';
+	return strlen(s_Version);
+}
+#endif
 #ifdef CONFIG_NDK
 int app_main(char* path)
 #else
@@ -287,6 +313,10 @@ int main(int argc, char* argv[])
 	}
 	kk_cloud_pid_init();
 	kk_cloud_key_init();
+#if CONFIG_NX5_PLATFORM
+	kk_cloud_ccuid_version();
+	kk_info_report_start();
+#endif	
 	kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromDev,NULL,NULL);
 #if 1
 	kk_dl_config();

application/kcloud/kk_info_report.c

@@ -34,7 +34,7 @@ static int kk_info_nanomsg_init(void)
 	}
 	return socketfd;
 }
-
+int kk_GetVersion(_OU_ char *version);
 static int kk_info_get(char *str)
 {
 	int ret = 0;
@@ -42,6 +42,8 @@ static int kk_info_get(char *str)
 	char *str_tmp = NULL;
 	char ccuid[32] = {0};
 	char pid[32] = {0};
+	char key[128] = {0};
+	
 	if(str == NULL){
 		return -1;
 	}
@@ -49,6 +51,8 @@ static int kk_info_get(char *str)
 
 	KK_Get_ccuid(ccuid);
 	kk_cloud_get_pid(pid);
+	kk_cloud_get_key(key);
+	kk_GetVersion(version);
 	cJSON *root = cJSON_CreateObject();
 	if (root)
 	{
@@ -64,22 +68,20 @@ static int kk_info_get(char *str)
 
                 cJSON_AddItemToObject(args, "ccu", ccu);
                 cJSON_AddStringToObject(ccu, "id", &ccuid[4]);
-                cJSON_AddStringToObject(ccu, "version", "1.1.1");
+                cJSON_AddStringToObject(ccu, "version", version);
                 cJSON_AddStringToObject(ccu, "name", "kk_new_ccu");
                 //INFO_PRINT("---222kk_get_cloud_status():%d\n",kk_get_cloud_status());
-                //if(kk_get_gw_status() == DEVICE_OFFLINE){
-                    //memcpy(status,"2",strlen("2"));
-                //}
-                if(kk_get_cloud_status() == DEVICE_OFFLINE)
-                {
+                if(kk_get_cloud_status() == DEVICE_OFFLINE){
                     //cJSON_AddStringToObject(ccu, "status", "1");
                     //INFO_PRINT("_-----------------------------------------------------------11\n");
                     memcpy(status,"1",strlen("1"));
+                }else if(kk_get_gw_status() == DEVICE_OFFLINE){
+					memcpy(status,"2",strlen("2"));
 				}else{
                     //INFO_PRINT("_-----------------------------------------------------------22\n");
                     memcpy(status,"0",strlen("0"));
                 }
-                //INFO_PRINT("------------------------------------->status :%s\n",status);
+                INFO_PRINT("kk_info_get------------------------------------->status :%s\n",status);
 
 				cJSON_AddStringToObject(ccu, "status", status);
 			}
@@ -102,7 +104,7 @@ static int kk_info_get(char *str)
 			if (qr_code)
 			{
 				char qrcodeStr[256] = {0};
-				sprintf(qrcodeStr,"KONKE-CCU:%s:%s:BBE3C5A5FC1FDB6CA1A386AB321D02AB",pid,&ccuid[4]);
+				sprintf(qrcodeStr,"KONKE-CCU:%s:%s:%s",pid,&ccuid[4],key);
 				cJSON_AddItemToObject(args, "qr_code", qr_code);
 				cJSON_AddStringToObject(qr_code, "string", qrcodeStr);
 				cJSON_AddBoolToObject(qr_code, "show", 1);

application/klansdk/kk_oldccu_msg.c

@@ -369,7 +369,7 @@ static int kk_lan_property_convert(const char *deviceCode,kk_map_dev_node_t *dev
 			continue;
 		}
 	
-		kk_lan_replace_val_to_obj(n_item,valObj,"value");
+		kk_lan_replace_val_to_obj(n_item,valObj,"value");//更新value
 
 		if((args = ccu_value_convert(n_dataType,n_valueRange,o_dataType,o_valueRange,valObj))!=NULL){
 			//printf("[%s][%d]\n",__FUNCTION__,__LINE__);

makefile

@@ -13,7 +13,7 @@ COMP_LIB_COMPONENTS := \
 #SUBDIRS                 += application/kcloud
 $(call Append_Conditional, SUBDIRS, application/kcloud, KCLOUD_PLATFORM_SUPPORT)
 $(call Append_Conditional, SUBDIRS, application/kk_luoma, LUOMA_PLATFORM_SUPPORT)
-#SUBDIRS                 += application/oled
+SUBDIRS                 += application/oled
 SUBDIRS                 += application/klansdk
 SUBDIRS                 += midware/midware
 SUBDIRS                 += common/mqtt

tools/build-rules/_rules-top.mk

@@ -206,6 +206,7 @@ package:
 	mkdir $(releaseDir)/map
 	mkdir $(releaseDir)/config
 	mkdir $(releaseDir)/script
+	cp -rf $(TOP_DIR)/ssd1306-revision.ko $(TOP_DIR)/$(releaseDir)
 	cp -rf $(TOP_DIR)/tsl $(TOP_DIR)/$(releaseDir)
 	cp -rf $(TOP_DIR)/output/release/lib/*.so $(TOP_DIR)/$(releaseDir)/lib
 	cp -rf $(TOP_DIR)/output/release/bin/* $(TOP_DIR)/$(releaseDir)/bin