payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改设置菜单的部分问题

Browse Source 
2.完成生成CAM_INFO.txt和QR.BMP的功能
This commit is contained in:
zyj 2023-11-10 18:22:48 +08:00
parent 5481dd9b5f
commit c3ba572d50
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -911,7 +911,10 @@ static void update_Camera_Info_msg(lv_obj_t* obj)
strcat(CamInfoStr, tmpStr); strcat(CamInfoStr, tmpStr);
} }
else if(!CameraInfoisHidden) else if(!CameraInfoisHidden)
strcat(CamInfoStr, SF_BASE_VERSION); {
sprintf(tmpStr, "%s\n",SF_BASE_VERSION);
strcat(CamInfoStr, tmpStr);
}
else else
strcat(CamInfoStr, "\n"); strcat(CamInfoStr, "\n");
break; break;

5
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -585,7 +585,10 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu)
lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1);
} }
//#NT#2023/11/03#Eric - end //#NT#2023/11/03#Eric - end
lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, pOption->TextId); if(pItem->ItemId == IDM_NETWORK_SELECTION)
lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, IDS_END);
else
lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, pOption->TextId);
lv_plugin_label_update_font(label_option_1_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN); lv_plugin_label_update_font(label_option_1_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN);
lv_obj_set_hidden(container_option_1_scr_uiflowmenucommonitem, false); lv_obj_set_hidden(container_option_1_scr_uiflowmenucommonitem, false);
}else if(i == 1){ }else if(i == 1){

8
code/application/source/sf_app/code/source/app/sf_common.c
View File

@ -179,7 +179,7 @@ static void create_qrcode(void)
{ {
SF_CHAR version[12] = {0}; SF_CHAR version[12] = {0};
SF_CHAR iccidStr[22] = {0}; SF_CHAR iccidStr[22] = {0};
SF_PDT_PARAM_STATISTICS_S *pStaticParam = sf_statistics_param_get(); UIMenuStoreInfo *pStaticParam = sf_app_ui_para_get();
sf_sys_software_version_get(version); sf_sys_software_version_get(version);
if(pStaticParam->SimType == SF_SIM_OTHER) if(pStaticParam->SimType == SF_SIM_OTHER)
{ {
@ -187,12 +187,12 @@ static void create_qrcode(void)
} }
else else
{ {
sprintf(iccidStr, "%s", pStaticParam->SimID); sprintf(iccidStr, "%s", pStaticParam->SimIccid);
} }
printf(" create_qrcode\n"); printf(" create_qrcode\n");
sf_qrcode_create(pStaticParam->IMEI, iccidStr, version); sf_qrcode_create(pStaticParam->ModuleImei, iccidStr, version);
sf_sys_camera_about(); // sf_sys_camera_about();
} }
} }

12
code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c
View File

@ -23,6 +23,7 @@
#include "sf_log.h" #include "sf_log.h"
#include "sf_base64.h" #include "sf_base64.h"
#include "sf_qrcode.h" #include "sf_qrcode.h"
#include "sf_4g_lpa.h"
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
@ -95,7 +96,7 @@ SINT16 sf_qrcode_create(SF_CHAR *pIMEI,SF_CHAR *pSimID ,SF_CHAR* pVersion)
SLOGE("the current Version is null!!!\n"); SLOGE("the current Version is null!!!\n");
return SF_FAILURE; return SF_FAILURE;
} }
#if 0
sprintf(qrsrc_Str, "m2m-%s-%s-%s-%s-T11000001", pIMEI, pSimID,ACCESS_KEY,pVersion); sprintf(qrsrc_Str, "m2m-%s-%s-%s-%s-T11000001", pIMEI, pSimID,ACCESS_KEY,pVersion);
MLOGI("qrStr = %s\n",qrsrc_Str); MLOGI("qrStr = %s\n",qrsrc_Str);
@ -105,6 +106,15 @@ SINT16 sf_qrcode_create(SF_CHAR *pIMEI,SF_CHAR *pSimID ,SF_CHAR* pVersion)
sf_qrcode_encode(qrdst_Str, strlen(qrdst_Str), "/mnt/mmc/addCam.bmp"); sf_qrcode_encode(qrdst_Str, strlen(qrdst_Str), "/mnt/mmc/addCam.bmp");
MLOGI("addCam.bmp have existed \n"); MLOGI("addCam.bmp have existed \n");
#endif
UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
sprintf(qrsrc_Str, "{\"imei\":\"%s\",\"verizonICCID\":\"%s\",\"attICCID\":\"%s\",\"isEsim\":%s}",
puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, sf_is_esim_card() ? "true" : "false");
MLOGI("qrStr = %s\n",qrsrc_Str);
sf_qrcode_encode(qrsrc_Str, strlen(qrsrc_Str), "/mnt/sd/QR.BMP");
MLOGI("QR.BMP have existed \n");
return ret; return ret;
} }

4
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -2575,7 +2575,7 @@ void sf_save_camera_info(void)
return; return;
fristRun = 0; fristRun = 0;
temp = malloc(200); temp = malloc(300);
if (temp == NULL) { if (temp == NULL) {
MLOGE("temp malloc err\n"); MLOGE("temp malloc err\n");
return; return;
@ -2600,7 +2600,7 @@ void sf_save_camera_info(void)
}*/ }*/
sf_get_wifi_ssid(wifissid); sf_get_wifi_ssid(wifissid);
SF_SPRINTF(temp, "IMEI:%s\r\nSoftwareVER:%s\r\nModuleVER:%s\r\nMcuVER:%s\r\nICCID:%s\r\nICCID-A:%s\r\nICCID-V:%s\r\nSSID:%s\r\nBLE:%s\r\n", snprintf(temp, 300, "IMEI:%s\r\nSoftwareVER:%s\r\nModuleVER:%s\r\nMcuVER:%s\r\nICCID:%s\r\nICCID-A:%s\r\nICCID-V:%s\r\nSSID:%s\r\nBLE:%s\r\n",
puiPara->ModuleImei, localver, puiPara->ModuleSubver, mcuver, puiPara->SimIccid, puiPara->SimIccidA, puiPara->SimIccidV, wifissid,puiPara->BluSsid); puiPara->ModuleImei, localver, puiPara->ModuleSubver, mcuver, puiPara->SimIccid, puiPara->SimIccidA, puiPara->SimIccidV, wifissid,puiPara->BluSsid);
if(access((char*)SF_CAMERA_INFO_FILENAME, F_OK) == 0) if(access((char*)SF_CAMERA_INFO_FILENAME, F_OK) == 0)