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

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

Browse Source
This commit is contained in:
payton 2024-01-20 00:58:40 +08:00
commit 055cb48646
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -251,7 +251,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
lv_obj_set_width(Confirm_label, 190); lv_obj_set_width(Confirm_label, 190);
// lv_obj_set_size(Confirm_label, 182, 80); // lv_obj_set_size(Confirm_label, 182, 80);
lv_obj_add_style(Confirm_label, 0, &gStyleLabel1); lv_obj_add_style(Confirm_label, 0, &gStyleLabel1);
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -48); lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
} }
DBG_DUMP("itemID=%u\r\n",itemID); DBG_DUMP("itemID=%u\r\n",itemID);
@ -296,37 +296,44 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
break; break;
case IDM_DELETE_THIS: case IDM_DELETE_THIS:
strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE; strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
lv_label_set_text(Confirm_label, "Comfirm Delete"); lv_label_set_text(Confirm_label, "Comfirm Delete");
gBKGEvt = NVTEVT_BKW_DELALL; gBKGEvt = NVTEVT_BKW_DELALL;
break; break;
case IDM_FORMAT_SD: case IDM_FORMAT_SD:
strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD; strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD;
gBKGEvt = NVTEVT_BKW_FORMAT_CARD; gBKGEvt = NVTEVT_BKW_FORMAT_CARD;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
lv_label_set_text(Confirm_label, "Format SD"); lv_label_set_text(Confirm_label, "Format SD");
break; break;
case IDM_FORMAT_EMMC: case IDM_FORMAT_EMMC:
strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD; strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD;
gBKGEvt = NVTEVT_BKW_FORMAT_EMMC; gBKGEvt = NVTEVT_BKW_FORMAT_EMMC;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
lv_label_set_text(Confirm_label, "Format EMMC"); lv_label_set_text(Confirm_label, "Format EMMC");
break; break;
case IDM_CAMERA_FW_UPGRADE: case IDM_CAMERA_FW_UPGRADE:
strID = LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE; strID = LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE;
gBKGEvt = NVTEVT_BKW_CAMERA_FW_UPGRADE; gBKGEvt = NVTEVT_BKW_CAMERA_FW_UPGRADE;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
lv_label_set_text(Confirm_label, "Camera FW Upgrade"); lv_label_set_text(Confirm_label, "Camera FW Upgrade");
break; break;
case IDM_MODULE_FW_UPGRADE: case IDM_MODULE_FW_UPGRADE:
strID = LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE; strID = LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE;
gBKGEvt = NVTEVT_BKW_MODULE_FW_UPGRADE; gBKGEvt = NVTEVT_BKW_MODULE_FW_UPGRADE;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
lv_label_set_text(Confirm_label, "Camera FW Upgrade"); lv_label_set_text(Confirm_label, "Camera FW Upgrade");
break; break;
case IDM_RESET: case IDM_RESET:
strID = LV_PLUGIN_STRING_ID_STRING_RESET_WARNING; strID = LV_PLUGIN_STRING_ID_STRING_RESET_WARNING;
gBKGEvt = NVTEVT_BKW_RESET; gBKGEvt = NVTEVT_BKW_RESET;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -46);
lv_label_set_text(Confirm_label, "Reset the Camera?\n\nCamera will restart after reset is complete"); lv_label_set_text(Confirm_label, "Reset the Camera?\n\nCamera will restart after reset is complete");
break; break;
case IDM_ENTER_WORK_MODE: case IDM_ENTER_WORK_MODE:
strID = LV_PLUGIN_STRING_ID_STRING_ENTER_WORK_MODE; strID = LV_PLUGIN_STRING_ID_STRING_ENTER_WORK_MODE;
gBKGEvt = NVTEVT_BKW_ENTER_WORK_MODE; gBKGEvt = NVTEVT_BKW_ENTER_WORK_MODE;
lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20);
lv_label_set_text(Confirm_label, "Enter Work Mode"); lv_label_set_text(Confirm_label, "Enter Work Mode");
break; break;
default: default:

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

@ -953,7 +953,7 @@ static void update_Password_msg(lv_obj_t* obj)
lv_btnmatrix_set_focused_btn(PasswordMatrixObj, PasswordIndex); lv_btnmatrix_set_focused_btn(PasswordMatrixObj, PasswordIndex);
lv_obj_set_x(PasswordImage, (64 + 32 * PasswordIndex)); lv_obj_set_x(PasswordImage, (63 + 32 * PasswordIndex));
} }
void show_Password_page(lv_obj_t* obj) void show_Password_page(lv_obj_t* obj)

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -351,7 +351,7 @@ void show_MaxNum_page(lv_obj_t* obj)
lv_obj_set_drag(SelectedImage, false); lv_obj_set_drag(SelectedImage, false);
lv_obj_set_size(SelectedImage, 32, 88); lv_obj_set_size(SelectedImage, 32, 88);
lv_img_set_src(SelectedImage, &sf_pwd_down_up); lv_img_set_src(SelectedImage, &sf_pwd_down_up);
lv_obj_set_pos(SelectedImage, 145, 62); lv_obj_set_pos(SelectedImage, 144, 62);
} }
void hidde_MaxNum_page(void) void hidde_MaxNum_page(void)

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c
View File

@ -216,7 +216,7 @@ static void update_Password_msg(lv_obj_t* obj)
lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, PasswordIndex); lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, PasswordIndex);
lv_btnmatrix_set_map(SendTimeMatrixObj_0, PasswordMap); lv_btnmatrix_set_map(SendTimeMatrixObj_0, PasswordMap);
int offset = 0; int offset = 0;
lv_obj_set_x(SelectedImage, (69 + 32 * PasswordIndex + offset)); lv_obj_set_x(SelectedImage, (68 + 32 * PasswordIndex + offset));
} }
static void UIFlowPassword_Key(lv_obj_t* obj, uint32_t key) static void UIFlowPassword_Key(lv_obj_t* obj, uint32_t key)
{ {