From c3ba572d50b3184b0cca5190ff0fd1731fa94b94 Mon Sep 17 00:00:00 2001 From: zyj Date: Fri, 10 Nov 2023 18:22:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=202.?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=9F=E6=88=90CAM=5FINFO.txt=E5=92=8CQR.B?= =?UTF-8?q?MP=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 5 ++++- .../UIFlowMenuCommonItemEventCallback.c | 5 ++++- .../source/sf_app/code/source/app/sf_common.c | 8 ++++---- .../source/sf_app/code/source/qrcodeMng/sf_qrcode.c | 12 +++++++++++- code/lib/source/sifar/code/source/common/sf_common.c | 4 ++-- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index cf3c24ac4..90df5e263 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -911,7 +911,10 @@ static void update_Camera_Info_msg(lv_obj_t* obj) strcat(CamInfoStr, tmpStr); } else if(!CameraInfoisHidden) - strcat(CamInfoStr, SF_BASE_VERSION); + { + sprintf(tmpStr, "%s\n",SF_BASE_VERSION); + strcat(CamInfoStr, tmpStr); + } else strcat(CamInfoStr, "\n"); break; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index c2745f7a0..37e83cab3 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -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); } //#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_obj_set_hidden(container_option_1_scr_uiflowmenucommonitem, false); }else if(i == 1){ diff --git a/code/application/source/sf_app/code/source/app/sf_common.c b/code/application/source/sf_app/code/source/app/sf_common.c index 78b8edba7..2c06b9f31 100755 --- a/code/application/source/sf_app/code/source/app/sf_common.c +++ b/code/application/source/sf_app/code/source/app/sf_common.c @@ -179,7 +179,7 @@ static void create_qrcode(void) { SF_CHAR version[12] = {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); if(pStaticParam->SimType == SF_SIM_OTHER) { @@ -187,12 +187,12 @@ static void create_qrcode(void) } else { - sprintf(iccidStr, "%s", pStaticParam->SimID); + sprintf(iccidStr, "%s", pStaticParam->SimIccid); } printf(" create_qrcode\n"); - sf_qrcode_create(pStaticParam->IMEI, iccidStr, version); - sf_sys_camera_about(); + sf_qrcode_create(pStaticParam->ModuleImei, iccidStr, version); + // sf_sys_camera_about(); } } diff --git a/code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c b/code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c index 88188e706..8f5b35ef1 100644 --- a/code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c +++ b/code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c @@ -23,6 +23,7 @@ #include "sf_log.h" #include "sf_base64.h" #include "sf_qrcode.h" +#include "sf_4g_lpa.h" #ifdef __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"); return SF_FAILURE; } - +#if 0 sprintf(qrsrc_Str, "m2m-%s-%s-%s-%s-T11000001", pIMEI, pSimID,ACCESS_KEY,pVersion); 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"); 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; } diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index c35b43845..dc1c6c078 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -2575,7 +2575,7 @@ void sf_save_camera_info(void) return; fristRun = 0; - temp = malloc(200); + temp = malloc(300); if (temp == NULL) { MLOGE("temp malloc err\n"); return; @@ -2600,7 +2600,7 @@ void sf_save_camera_info(void) }*/ 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); if(access((char*)SF_CAMERA_INFO_FILENAME, F_OK) == 0)