From 07bc5f52bf48b447326b73f09dd0dcde535f6588 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Thu, 25 Jan 2024 20:28:43 +0800 Subject: [PATCH 1/2] 1.ver:7MR5RCwE10B --- code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 +- .../code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index a9871b8dd..fde5f2a33 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -924,7 +924,7 @@ #define HUNTING_MCU_UART ENABLE #define HUNTING_IR_LED_940 ENABLE #define SF_EXIF_MN_BUF_SIZE 256 -#define SF_BASE_VERSION "7MR5RCwE10A" +#define SF_BASE_VERSION "7MR5RCwE10B" #define HW_S530 DISABLE #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index db8a57061..05b63d9f4 100755 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -945,7 +945,7 @@ #define HUNTING_MCU_UART ENABLE #define HUNTING_IR_LED_940 ENABLE #define SF_EXIF_MN_BUF_SIZE 256 -#define SF_BASE_VERSION "7MR5RCwE10A" +#define SF_BASE_VERSION "7MR5RCwE10B" #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */ From 0a6cae2911fd72cafe4c3ea5c654a421c107d883 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Fri, 26 Jan 2024 09:50:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E5=AE=8C=E6=88=90=E5=90=8E=E7=AD=89=E5=BE=85=E4=B8=89?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 15 ++++++--------- 1 file changed, 6 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 ce9666e8b..c878451f9 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 @@ -310,6 +310,7 @@ static int ProfileFocused = 0; static unsigned char ProfileNameList[PROFILE_MAX][PROFILE_NAME_SIZE] = {0}; int ReadFile = 0; int isFirst = 0; +int isComplete = 0; static int Countdown = 0; @@ -531,6 +532,7 @@ static void network_scan_task_cb(lv_task_t* task) static void network_select_task_end(void) { + isComplete = 0; if(network_select_task) { lv_task_del(network_select_task); @@ -542,7 +544,7 @@ static void network_select_task_cb(lv_task_t* task) { lv_obj_t* obj = (lv_obj_t*)task->user_data; - if(Countdown) + if(Countdown && isComplete) { printf("[%s]Countdown:%d\n", __FUNCTION__, Countdown); Countdown--; @@ -573,24 +575,19 @@ static void network_select_task_cb(lv_task_t* task) stMessageBuf.cmdId = CMD_DEV; sf_com_message_send_to_app(&stMessageBuf); Countdown = 3; + isComplete = 1; break; case 0x34:/*NETWORK_NOT_NEED_SET*/ lv_label_set_text(plabel, "\n\nProfile is enabled"); Countdown = 3; - while (Countdown > 0) - { - Countdown--; - usleep(1000*1000); - } - network_select_task_end(); - lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); - hidde_Network_Selection_page(); + isComplete = 1; break; case 0xff: break; default: lv_label_set_text(plabel, "\n\nCurrently network is busy, Please try it later"); Countdown = 3; + isComplete = 1; break; } }