diff --git a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c index 0ca05ef7f..70f31cf8b 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c +++ b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c @@ -98,6 +98,7 @@ static UINT32 BackgroundEthCamIperfTest(void); static UINT32 BackgroundCameraFWUpgrade(void); static UINT32 BackgroundModuleFWUpgrade(void); static UINT32 BackgroundReset(void); +static UINT32 EnterWorkMode(void); static UINT32 g_uiDpofOPMode = PLAYDPOF_SETONE; static UINT32 g_uiDpofPrtNum = 0; @@ -194,6 +195,7 @@ BKG_JOB_ENTRY gBackgroundExtFuncTable[] = { {NVTEVT_BKW_CAMERA_FW_UPGRADE, BackgroundCameraFWUpgrade}, {NVTEVT_BKW_MODULE_FW_UPGRADE, BackgroundModuleFWUpgrade}, {NVTEVT_BKW_RESET, BackgroundReset}, + {NVTEVT_BKW_ENTER_WORK_MODE, EnterWorkMode}, {0, 0}, }; @@ -1922,6 +1924,14 @@ UINT32 BackgroundReset(void) Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_NORMAL); return TRUE; } +static UINT32 EnterWorkMode(void) +{ + printf(" EnterWorkMode \n"); + // Reset_MenuInfo(); + // sf_sleep_ms(500); + Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_NORMAL); + return TRUE; +} void AppBKW_SetData(BKW_DATA_SET attribute, UINT32 value) { diff --git a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.h b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.h index 638689149..4eb1528eb 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.h +++ b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.h @@ -50,6 +50,7 @@ typedef enum { NVTEVT_BKW_CAMERA_FW_UPGRADE, NVTEVT_BKW_MODULE_FW_UPGRADE, NVTEVT_BKW_RESET, + NVTEVT_BKW_ENTER_WORK_MODE, NVTEVT_BKW_END, } NVT_BKW_CMD; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c index 9649760fe..5c2fa061b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c @@ -122,6 +122,10 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) strID = LV_PLUGIN_STRING_ID_STRING_RESET_WARNING; gBKGEvt = NVTEVT_BKW_RESET; break; + case IDM_ENTER_WORK_MODE: + strID = LV_PLUGIN_STRING_ID_STRING_RESET_WARNING; + gBKGEvt = NVTEVT_BKW_ENTER_WORK_MODE; + break; default: gBKGEvt = 0; DBG_ERR("error itemID %d\r\n", gItemID); @@ -327,6 +331,10 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3 lv_obj_set_hidden(msgbox, true); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_COMPLETED, 10000); BKG_PostEvent(gBKGEvt); + } else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE) + { + BKG_PostEvent(gBKGEvt); + UIFlowMenuCommonConfirm_CloseScr(); } else if (gBKGEvt) { DBG_FUNC("gBKGEvt=%d\r\n",gBKGEvt); lv_plugin_scr_open(wait_moment_scr, &string_id_please_wait); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h index 3d2822c6b..522ec4245 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h @@ -137,6 +137,8 @@ enum _MENU_ID { IDM_MODULE_FW_UPGRADE, IDM_RESET, + IDM_ENTER_WORK_MODE, + }; // Menu String ID 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 1e24c3fb8..a58a3050e 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 @@ -594,7 +594,7 @@ void show_qr_picture_page(lv_obj_t* obj) char qr_date[QR_DATA_LENGTH] = {0}; if (sf_cardv_get_is_esim() == 1) { - snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidA, puiPara->SimIccidA, "true"); + snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true"); } // else if (sf_cardv_get_is_esim() == 0) // { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 6a07ff6d9..00c9a80ee 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1477,6 +1477,10 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) { case LV_USER_KEY_LEFT: { + if (KeyLeftPressingTimeMs < LONG_PRESS_INTERVAL) + { + UIFlowMenuCommonConfirmAPI_Open(IDM_ENTER_WORK_MODE); + } KeyLeftPressingTimeMs = 0; break; }