diff --git a/sample/api_sample/widget/test_widget.c b/sample/api_sample/widget/test_widget.c index 7ffda8c..6683971 100644 --- a/sample/api_sample/widget/test_widget.c +++ b/sample/api_sample/widget/test_widget.c @@ -78,11 +78,9 @@ static int s_stateOfSbg=0; static int s_stateOfFile=0; static char * s_strStateOfSbg="未打开"; -static char * s_strSbgMagState="等待磁矫正"; static char * s_strSbgAccuracy="1000"; static char * s_strSbgSolutionMode="UNINITIALIZED"; static char * s_strStateOfXimea="未打开"; -static char * s_strStateOfFile="等待拷贝数据"; static int s_sockfd; static struct sockaddr_in s_server; @@ -270,7 +268,7 @@ static void *PsdkTest_WidgetTask(void *arg) //snprintf(message, PSDK_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "System time: %u ms;\nMAG: %d;\nIMAGER: %d;\nIMU: %d;\nFile: %d;\n", sysTimeMs, s_sbgMagState, s_stateOfXimea, s_stateOfSbg, s_stateOfFile); - snprintf(message, PSDK_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "System time: %u ms;\n磁场矫正: %s;\n光谱仪: %s;\n惯导: %s;\n精度: %s;\nmode: %s;\n文件: %s;\n", sysTimeMs, s_strSbgMagState, s_strStateOfXimea, s_strStateOfSbg, s_strSbgAccuracy, s_strSbgSolutionMode, s_strStateOfFile); + snprintf(message, PSDK_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "System time: %u ms;\n光谱仪: %s;\n惯导: %s;\n精度: %s;\nmode: %s;\n", sysTimeMs, s_strStateOfXimea, s_strStateOfSbg, s_strSbgAccuracy, s_strSbgSolutionMode); psdkStat = PsdkWidgetFloatingWindow_ShowMessage(message); if (psdkStat != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { @@ -409,42 +407,6 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)// break; } } - else if (strcmp(result[0],"mag") == 0) - { - s_sbgMagState = atoi(result[1]); - printf("磁场矫正状态为: %d\n\n", atoi(result[1])); - - switch (s_sbgMagState) - { - case 0: - s_strSbgMagState="串口打开错误"; - break; - case 1: - s_strSbgMagState="磁场矫正失败"; - break; - case 2: - s_strSbgMagState="无法获取磁场数据"; - break; - case 3: - s_strSbgMagState="磁场数据无效"; - break; - case 4: - s_strSbgMagState="写入磁场数据失败"; - break; - case 5: - s_strSbgMagState="POOR"; - break; - case 6: - s_strSbgMagState="GOOD"; - break; - case 7: - s_strSbgMagState="OPTIMAL"; - break; - - default: - break; - } - } else if (strcmp(result[0],"ximea") == 0) { s_stateOfXimea = atoi(result[1]); @@ -479,30 +441,6 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)// break; } } - else if (strcmp(result[0],"file") == 0) - { - s_stateOfFile = atoi(result[1]); - printf("file的状态为: %d\n\n", atoi(result[1])); - - switch (s_stateOfFile) - { - case 0: - s_strStateOfFile="等待拷贝数据"; - break; - case 1: - s_strStateOfFile="正在拷贝"; - break; - case 2: - s_strStateOfFile="没有数据可拷贝"; - break; - case 3: - s_strStateOfFile="请插入u盘"; - break; - - default: - break; - } - } } } @@ -558,19 +496,11 @@ static T_PsdkReturnCode PsdkTestWidget_SetWidgetValue_StartRecord(E_PsdkWidgetTy } break; case 3: - if (value==0)//停止磁场矫正 + if (value==0) { - char* command = "8,0"; - sendto(s_sockfd, command,strlen(command),0,(struct sockaddr *)&s_server,sizeof(s_server)); - - //printf("ttttttttttttt\n"); } - else if (value==1)//开始磁场矫正 + else if (value==1) { - char* command = "8,1"; - sendto(s_sockfd, command,strlen(command),0,(struct sockaddr *)&s_server,sizeof(s_server)); - - //printf("kkkkkkkkkkkkk\n"); } break; case 5://自动曝光 @@ -610,10 +540,8 @@ static T_PsdkReturnCode PsdkTestWidget_SetWidgetValue_StartRecord(E_PsdkWidgetTy { } - if (value==1)//拷贝数据 + if (value==1) { - char* command = "7"; - sendto(s_sockfd, command,strlen(command),0,(struct sockaddr *)&s_server,sizeof(s_server)); } else if (value==2)//重启电脑 { diff --git a/sample/api_sample/widget/widget_file/cn_big_screen/widget_config.json b/sample/api_sample/widget/widget_file/cn_big_screen/widget_config.json index 6b286c6..378694b 100644 --- a/sample/api_sample/widget/widget_file/cn_big_screen/widget_config.json +++ b/sample/api_sample/widget/widget_file/cn_big_screen/widget_config.json @@ -13,8 +13,8 @@ "widget_type": "button", "widget_name": "按钮_1", "icon_file_set": { - "icon_file_name_selected" : "icon_button1.png", - "icon_file_name_unselected" : "icon_button1.png" + "icon_file_name_selected" : "null_white.png", + "icon_file_name_unselected" : "null_white.png" } }, { @@ -22,8 +22,8 @@ "widget_type": "button", "widget_name": "按钮_2", "icon_file_set": { - "icon_file_name_selected" : "icon_button2.png", - "icon_file_name_unselected" : "icon_button2.png" + "icon_file_name_selected" : "null_white.png", + "icon_file_name_unselected" : "null_white.png" } }, { @@ -34,15 +34,15 @@ { "item_name": "系统关闭", "icon_file_set": { - "icon_file_name_selected": "icon_list_item1.png", - "icon_file_name_unselected": "icon_list_item1.png" + "icon_file_name_selected": "system_OFF.png", + "icon_file_name_unselected": "system_OFF.png" } }, { "item_name": "系统启动", "icon_file_set": { - "icon_file_name_selected" : "icon_list_item2.png", - "icon_file_name_unselected" : "icon_list_item2.png" + "icon_file_name_selected" : "system_ON.png", + "icon_file_name_unselected" : "system_ON.png" } } ] @@ -52,8 +52,8 @@ "widget_type": "switch", "widget_name": "开关_4", "icon_file_set": { - "icon_file_name_selected": "icon_switch_select.png", - "icon_file_name_unselected": "icon_switch_unselect.png" + "icon_file_name_selected": "null_white.png", + "icon_file_name_unselected": "null_white.png" } }, { @@ -61,8 +61,8 @@ "widget_type": "scale", "widget_name": "范围条_5", "icon_file_set": { - "icon_file_name_selected": "icon_scale.png", - "icon_file_name_unselected": "icon_scale.png" + "icon_file_name_selected": "null_white.png", + "icon_file_name_unselected": "null_white.png" } } ] @@ -104,7 +104,7 @@ "item_name": "等待指令" }, { - "item_name": "拷贝数据" + "item_name": "无" }, { "item_name": "重启电脑"