From f5ee68317b12ceec649d5cd5b3021d39b29207ab Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Wed, 6 Dec 2023 17:49:35 +0800 Subject: [PATCH 01/12] Fixed bug number 10292. --- code/application/source/cardv/SrcCode/System/SysMain_Exe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/source/cardv/SrcCode/System/SysMain_Exe.c b/code/application/source/cardv/SrcCode/System/SysMain_Exe.c index 936988d03..f5e566e2d 100755 --- a/code/application/source/cardv/SrcCode/System/SysMain_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysMain_Exe.c @@ -156,7 +156,7 @@ INT32 System_GetBootFirstMode(void) printf("%s:%d CamMode :%d\n", __FUNCTION__, __LINE__,puiPara->CamMode); if(GxUSB_GetIsUSBPlug()) { - return PRIMARY_MODE_PHOTO; + return PRIMARY_MODE_USBMSDC; } else if((PWR_ON_SETUP != PowerOnMode) /*|| (sf_get_fw_update())*/) { From 8b723b54b4fb05bf01c22ec85e9d20a324362045 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 7 Dec 2023 09:39:56 +0800 Subject: [PATCH 02/12] Fixed bug about max num/day. --- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index cce29470d..a8980f507 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -335,10 +335,12 @@ void hidde_MaxNum_page(void) if(MaxNumTitleLabel) { lv_obj_del(MaxNumTitleLabel); + MaxNumTitleLabel = NULL; } if(MaxNumValueLabel) { lv_obj_del(MaxNumValueLabel); + MaxNumValueLabel = NULL; } } From 8d32ca76f199bdbcd41858c84893c2ca1486123b Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 7 Dec 2023 10:57:11 +0800 Subject: [PATCH 03/12] Fixed bug number 10033. --- .../source/sf_app/code/source/qrcodeMng/sf_bmp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/code/application/source/sf_app/code/source/qrcodeMng/sf_bmp.c b/code/application/source/sf_app/code/source/qrcodeMng/sf_bmp.c index 580d6e26c..59866a066 100644 --- a/code/application/source/sf_app/code/source/qrcodeMng/sf_bmp.c +++ b/code/application/source/sf_app/code/source/qrcodeMng/sf_bmp.c @@ -155,18 +155,30 @@ void vd_g_SaveBitmap(const ST_BITMAP * st_ap_bitmap, const char * sz_ap_path) do { if(st_ap_bitmap == NULL) + { + printf("st_ap_bitmap failed.\n"); break; + } if((st_ap_bitmap->u2_bitcount != 16) && (st_ap_bitmap->u2_bitcount != 24) && (st_ap_bitmap->u2_bitcount != 32)) + { + printf("st_ap_bitmap failed 2.\n"); break; + } if(sz_ap_path == NULL) + { + printf("sz_ap_path failed.\n"); break; + } file_bitmap = fopen(sz_ap_path, "wb"); if(file_bitmap == NULL) + { + printf("fopen failed.\n"); break; - + } + printf("sz_ap_path = %s\n", sz_ap_path); // set bitmap head info vd_SerializeLittleEndianU4(&u1_tp_bitmap_header[2], sizeof(u1_tp_bitmap_header) + st_ap_bitmap->u4_image_size); vd_SerializeLittleEndianU4(&u1_tp_bitmap_header[10], sizeof(u1_tp_bitmap_header)); @@ -188,7 +200,7 @@ void vd_g_SaveBitmap(const ST_BITMAP * st_ap_bitmap, const char * sz_ap_path) } while(0); - + system("sync"); if(file_bitmap) fclose(file_bitmap); } From 3a5d6379b3005b8983589d2dc75158cff2e4170f Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 7 Dec 2023 13:39:42 +0800 Subject: [PATCH 04/12] Fixed bug number 10414. --- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) 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 9d8ea7640..8f55d3f48 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 @@ -570,8 +570,7 @@ static void update_4g_module_icon(void) signal_icon_show(signal_level); signal = signal_new; } - // else if (sf_cardv_get_sim_insert() == NO_SIM_CARD) - else if (SIM_CARD_NOT_INIT == puiPara->NetGeneration) + else if (sf_cardv_get_sim_insert() == NO_SIM_CARD) { signal_icon_hidden(0); signal_icon_hidden(1); @@ -582,7 +581,21 @@ static void update_4g_module_icon(void) set_warning_label_text(label_tips_scr_uiflowphoto); lv_label_set_text(label_tips_scr_uiflowphoto,"Check Sim"); lv_obj_set_hidden(label_sim_scr_uiflowphoto, true); - } else { + } + else if (signal != signal_new && 0 == signal_new) + { + signal_icon_hidden(0); + signal_icon_hidden(1); + signal_icon_hidden(2); + signal_icon_hidden(3); + signal_icon_hidden(4); + lv_obj_set_hidden(label_tips_scr_uiflowphoto, false); + set_warning_label_text(label_tips_scr_uiflowphoto); + lv_label_set_text(label_tips_scr_uiflowphoto,"No Signal"); + lv_obj_set_hidden(label_sim_scr_uiflowphoto, true); + signal = signal_new; + } + else { // Nothing changed. // printf(" nothing changed.\n"); } From 708b1f04279520b4289de3312fae74eda036c55d Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 7 Dec 2023 14:07:19 +0800 Subject: [PATCH 05/12] Fixed bug number 10155. --- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c index 5cdd9ac7d..b3efc196a 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c @@ -6,7 +6,7 @@ TMDEF_BEGIN_OPTIONS(BATTERY_TYPE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_ALKALINE, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_NI_MH, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITHIUM, TM_OPTION_ENABLE) -TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE) +// TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(SD_LOOP) TMDEF_OPTION_TEXT_S(SD_LOOP_OFF, TM_OPTION_ENABLE) From 93ce51c6c389841b7133b287eadb5be41274a155 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 7 Dec 2023 17:08:10 +0800 Subject: [PATCH 06/12] Fixed bug about sending show. --- .../UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c | 2 +- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c index 380c689db..b86e78514 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -397,7 +397,7 @@ static void update_rec_time(void) lv_obj_set_hidden(label_maxtime_scr_uiflowmovie,true); } - lv_label_set_text_fmt(label_rec_time_scr_uiflowmovie, "%02d:%02d:%02d", rec_sec / 3600, (rec_sec % 3600) / 60, (rec_sec % 3600) % 60); + lv_label_set_text_fmt(label_rec_time_scr_uiflowmovie, "%02d:%02d:%02d", rec_sec / 3600, (rec_sec % 3600) / 60, (rec_sec % 3600) % 60 + 1); } static void update_wifi(void) 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 8f55d3f48..e510b7058 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 @@ -59,6 +59,7 @@ static void task_update_icons_timer_cb(lv_task_t* task); #define LONG_PRESS_INTERVAL 500 static unsigned long KeyLeftPressingTimeMs = 0; static unsigned long KeyDownPressingTimeMs = 0; +static int gSendingStatus = FILE_SENDING_GUI_END; #define SENDING_KEEP_SHOW -1 #define SENDING_NOT_SHOW 0 @@ -607,6 +608,10 @@ static void update_4g_module_icon(void) lv_obj_set_hidden(label_sim_scr_uiflowphoto, true); } } + // if(sf_cardv_4G_status_get() == SF_4G_SENDING) + // { + + // } const int EMPTY_IMAGE = 0; lv_plugin_res_id res[] = { EMPTY_IMAGE, @@ -1699,6 +1704,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg) static void sf_show_send_text(lv_obj_t* obj, const unsigned short status) { #define SENDING_KEEP_SHOW_TIME_S 3 + gSendingStatus = FILE_SENDING_GUI_END; switch (status) { case FILE_SENDING_GUI_START_SENDING: @@ -1706,6 +1712,7 @@ static void sf_show_send_text(lv_obj_t* obj, const unsigned short status) lv_obj_set_hidden(label_sim_scr_uiflowphoto, false); lv_label_set_text(label_sim_scr_uiflowphoto, "Sending ... "); SendMsgShow = SENDING_KEEP_SHOW; + gSendingStatus = FILE_SENDING_GUI_START_SENDING; break; } case FILE_SENDING_GUI_STOP_SENDING: @@ -2028,7 +2035,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event) case LV_EVENT_KEY: { - if (PHOTO_ST_CAPTURE == gPhotoData.State) + if (PHOTO_ST_CAPTURE == gPhotoData.State || FILE_SENDING_GUI_START_SENDING == gSendingStatus) { printf("PHOTO_ST_CAPTURE not handl key event.\n"); break; @@ -2041,7 +2048,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event) } case LV_USER_EVENT_KEY_RELEASE: { - if (PHOTO_ST_CAPTURE == gPhotoData.State) + if (PHOTO_ST_CAPTURE == gPhotoData.State || FILE_SENDING_GUI_START_SENDING == gSendingStatus) { printf("PHOTO_ST_CAPTURE not handl key event.\n"); break; From 8d1e130df8751af807b3345e54dff5ec7f4f806d Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 7 Dec 2023 17:30:38 +0800 Subject: [PATCH 07/12] Fixed bug number 10492. --- code/lib/source/sifar/code/source/common/sf_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f162a5d91..ebfb58b9a 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -312,7 +312,7 @@ void sf_mode_detect(void) //countDownOffFlg = 0; } - if(puiPara->AutoOffSwitch == 0 || SF_BLE_CON == sf_get_ble_status() || (0x04 == NetWorkFlag/*SF_4G_SENDING*/) || + if(puiPara->AutoOffSwitch == 0 || SF_BLE_CON == sf_get_ble_status() || SF_WIFI_CON == sf_get_wifi_status() || (0x04 == NetWorkFlag/*SF_4G_SENDING*/) || (0x05 == NetWorkFlag/*SF_4G_SEARCHING*/) || (sf_get_fw_update()) || (sf_get_module_update()) || (sf_get_mcu_update_flag()) || ( System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_PLAYBACK)/*|| (appActiveStateGet() == APP_STATE_CUSTOMER_TRANSFER)*/) { From 61ccc09bee0c68fd80d07697f7e6b230e5c4d39a Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Fri, 8 Dec 2023 09:23:48 +0800 Subject: [PATCH 08/12] Fixed bug number 10297. --- .../UIFlowMenuCommonItem/MenuSend.c | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index a8980f507..34d4e75bf 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -298,6 +298,7 @@ static void init_Matrix_style(void) } +static lv_obj_t* SelectedImage = NULL; // -------------------------------------------------------------------------- // MaxNum // -------------------------------------------------------------------------- @@ -324,10 +325,17 @@ void show_MaxNum_page(lv_obj_t* obj) sprintf(result, "%02d", puiPara->SendMaxNum); MaxNumValueLabel = lv_label_create(obj, NULL); lv_obj_set_pos(MaxNumValueLabel, 145, 93); - lv_obj_set_size(MaxNumValueLabel, 30, 24); + lv_obj_set_size(MaxNumValueLabel, 32, 24); lv_obj_add_style(MaxNumValueLabel, 0, &gMatrixStylebtn); - lv_obj_set_state(MaxNumValueLabel, LV_STATE_DEFAULT); + lv_obj_set_state(MaxNumValueLabel, LV_STATE_FOCUSED); lv_label_set_text(MaxNumValueLabel, result); + SelectedImage = lv_img_create(obj, NULL); + lv_obj_set_hidden(SelectedImage, false); + lv_obj_set_click(SelectedImage, false); + lv_obj_set_drag(SelectedImage, false); + lv_obj_set_size(SelectedImage, 32, 88); + lv_img_set_src(SelectedImage, &sf_pwd_down_up); + lv_obj_set_pos(SelectedImage, 145, 62); } void hidde_MaxNum_page(void) @@ -342,6 +350,11 @@ void hidde_MaxNum_page(void) lv_obj_del(MaxNumValueLabel); MaxNumValueLabel = NULL; } + if(SelectedImage) + { + lv_obj_del(SelectedImage); + SelectedImage = NULL; + } } void Option_MaxNum_Key(lv_obj_t* obj, uint32_t key) @@ -364,7 +377,7 @@ void Option_MaxNum_Key(lv_obj_t* obj, uint32_t key) puiPara->SendMaxNum--; else puiPara->SendMaxNum = 99; - sprintf(result, "%d", puiPara->SendMaxNum); + sprintf(result, "%02d", puiPara->SendMaxNum); lv_label_set_text(MaxNumValueLabel, result); break; case LV_USER_KEY_PREV: @@ -373,7 +386,7 @@ void Option_MaxNum_Key(lv_obj_t* obj, uint32_t key) puiPara->SendMaxNum++; else puiPara->SendMaxNum = 1; - sprintf(result, "%d", puiPara->SendMaxNum); + sprintf(result, "%02d", puiPara->SendMaxNum); lv_label_set_text(MaxNumValueLabel, result); break; case LV_USER_KEY_LEFT: @@ -438,7 +451,6 @@ static const char* SendTimeMap_1[BUTTON_NUM_4] = // static int CameraInfoIndex = 0; // static lv_obj_t *CameraInfolabel = NULL; static lv_obj_t *SendTypeImage = NULL; -static lv_obj_t* SelectedImage = NULL; static lv_obj_t * btnm = NULL; static const char * map[] = {"1", "2", ""}; @@ -493,7 +505,6 @@ void show_send_time_page(lv_obj_t* obj, const int sendType) SendTimeMatrixObj_1 = NULL; SendTimeMatrixObj_0 = NULL; btnm = NULL; - SelectedImage = NULL; init_Matrix_style(); From f170293da003aebceb08f7673ae6fb145af7a4e7 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Fri, 8 Dec 2023 14:42:57 +0800 Subject: [PATCH 09/12] Megre code of ding to fixed disable item. --- .../UIFlowMenuCommonItem/MenuMore.c | 2 +- .../UIFlowMenuCommonItemEventCallback.c | 43 ++++++++++++++----- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c index b3efc196a..5cdd9ac7d 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c @@ -6,7 +6,7 @@ TMDEF_BEGIN_OPTIONS(BATTERY_TYPE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_ALKALINE, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_NI_MH, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITHIUM, TM_OPTION_ENABLE) -// TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(SD_LOOP) TMDEF_OPTION_TEXT_S(SD_LOOP_OFF, TM_OPTION_ENABLE) 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 329172162..1fe934ef0 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 @@ -214,8 +214,9 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) TM_PAGE *pPage; TM_ITEM *pItem; BOOL uSel_Jump = false; - + pPage = &pMenu->pPages[pMenu->SelPage]; + pItem = &pPage->pItems[pPage->SelItem]; if (pMenu->Status == TMS_ON_TAB){ if(pPage->SelItem == 0){ // DBG_WRN("already foucs on tab !"); @@ -227,6 +228,10 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) } }else{ OneMore: + pItem = &pPage->pItems[pPage->SelItem - 1]; + if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){ + pPage->SelItem = 0; + } //if item = 0; up key foucs to tab if(pPage->SelItem == 0){ pMenu->Status = TMS_ON_TAB; @@ -260,14 +265,21 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) TM_PAGE *pPage; TM_ITEM *pItem; BOOL uSel_Jump = false; + static BOOL FisrtSel_Jump = false; pPage = &pMenu->pPages[pMenu->SelPage]; -// DBG_DUMP("\r\n %s pMenu Status= %d\r\n", __func__, pMenu->Status); + pItem = &pPage->pItems[pPage->SelItem]; + if (pMenu->Status == TMS_ON_TAB){ - pMenu->Status = TMS_ON_ITEM; - pPage->SelItem = 0; + pMenu->Status = TMS_ON_ITEM; + if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){ + pPage->SelItem = 1; + FisrtSel_Jump = true; + }else{ + pPage->SelItem = 0; + } LV_MenuCommonItem_UpdateContent(pMenu); - lv_plugin_menu_select_item(menu_item, 0); + lv_plugin_menu_select_item(menu_item, pPage->SelItem); }else{ Onetime: pPage->SelItem++; @@ -283,15 +295,15 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) } if(pPage->SelItem >= pPage->Count){ - pPage->SelItem = 0; + if(FisrtSel_Jump /**&& uItem_Locked**/){ + pPage->SelItem = 1; + }else{ + pPage->SelItem = 0; + } LV_MenuCommonItem_UpdateContent(pMenu); lv_plugin_menu_select_item(menu_item, pPage->SelItem); return; } - //#NT#2023/11/03#Eric - begin - //#NT#Support IVOT_N12144_CO-148 -5 - PrevSel_Img = false; - //#NT#2023/11/03#Eric - end LV_MenuCommonItem_UpdateContent(pMenu); lv_plugin_menu_select_next_item(menu_item); if(uSel_Jump){ @@ -707,6 +719,11 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) lv_plugin_menu_set_item_state(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_SF_SEND_TYPE_DIS); } + else if (pItem->ItemId == IDM_BATTERY_TYPE && 0) + { + lv_plugin_menu_set_item_state(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED); + lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_SF_SEND_TYPE_DIS); + } else { lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); } @@ -722,7 +739,11 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) if(((pPage->SelItem%PER_PAGE_NUM) == 0)&&(pMenu->Status == TMS_ON_ITEM)){ lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT2); }else{ - lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); + if(pItem->ItemId == IDM_BATTERY_TYPE && 0){ + lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT_DIS); + } else { + lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); + } } //#NT#2023/11/03#Eric - end if(pItem->ItemId == IDM_NETWORK_SELECTION) From 65e8c9f67b60e1d96be058b8e6436f9876f0d1d5 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Fri, 8 Dec 2023 15:18:58 +0800 Subject: [PATCH 10/12] Merge code of ding about playback screen. --- .../UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c index cd0eec929..c9dc59fba 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c @@ -124,8 +124,11 @@ static void UIFlowPlay_IconImageSize(BOOL bShow) lv_obj_set_hidden(container_play_scr_uiflowplay, false); lv_plugin_img_set_src(image_play_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_STOP); PB_GetParam(PBPRMID_INFO_VDO, (UINT32 *)&MovieInfo); - lv_slider_set_range(slider_1_scr_uiflowplay, 0, MovieInfo.uiToltalSecs); - lv_slider_set_value(slider_1_scr_uiflowplay, 0, LV_ANIM_OFF); + if (0 < MovieInfo.uiToltalSecs) + { + lv_slider_set_range(slider_1_scr_uiflowplay, 0, MovieInfo.uiToltalSecs); + lv_slider_set_value(slider_1_scr_uiflowplay, 0, LV_ANIM_OFF); + } switch (MovieInfo.uiVidWidth) { case 3840: if (MovieInfo.uiVidRate == 50) { From c3891c3ac58bbd18a43a2949c662466e67cdcfd4 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Fri, 8 Dec 2023 15:23:33 +0800 Subject: [PATCH 11/12] Fixed bug about gps switch. --- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c | 4 ++-- .../UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index 34d4e75bf..cc5e4b27e 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -119,8 +119,8 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) case IDM_GPS: { #define GPRS_OFF_OPTION 0 - puiPara->GprsSwitch = (GPRS_OFF_OPTION == uwOption ? SF_OFF : SF_ON); - printf("\033[33m[Send_MenuCallback]GprsSwitch:%d\033[0m\n", puiPara->GprsSwitch); + puiPara->GpsSwitch = (GPRS_OFF_OPTION == uwOption ? SF_OFF : SF_ON); + printf("\033[33m[Send_MenuCallback]GpsSwitch:%d\033[0m\n", puiPara->GpsSwitch); break; } default: 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 1fe934ef0..19ebd579b 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 @@ -176,7 +176,7 @@ static void load_info_from_sf(void) SysSetFlag(IDF_SETTINGS_CHECK, puiPara->GprsMode); SysSetFlag(IDF_SEND_TYPE, puiPara->SendType); SysSetFlag(IDF_CHECK_IN_PHOTO, puiPara->PicUpDailyReport); - SysSetFlag(IDF_GPS, puiPara->GprsSwitch); + SysSetFlag(IDF_GPS, puiPara->GpsSwitch); SysSetFlag(IDF_BATTERY_TYPE, puiPara->BatteryType); SysSetFlag(IDF_SD_LOOP, puiPara->SdLoopSwitch); } From 43cd5a08447319239f89a8f14053068dbd588075 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Fri, 8 Dec 2023 15:45:46 +0800 Subject: [PATCH 12/12] Cancel code of ding about item screen. --- .../UIFlowMenuCommonItemEventCallback.c | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) 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 19ebd579b..692e9dccc 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 @@ -216,7 +216,7 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) BOOL uSel_Jump = false; pPage = &pMenu->pPages[pMenu->SelPage]; - pItem = &pPage->pItems[pPage->SelItem]; + // pItem = &pPage->pItems[pPage->SelItem]; if (pMenu->Status == TMS_ON_TAB){ if(pPage->SelItem == 0){ // DBG_WRN("already foucs on tab !"); @@ -228,10 +228,10 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) } }else{ OneMore: - pItem = &pPage->pItems[pPage->SelItem - 1]; - if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){ - pPage->SelItem = 0; - } + // pItem = &pPage->pItems[pPage->SelItem - 1]; + // if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){ + // pPage->SelItem = 0; + // } //if item = 0; up key foucs to tab if(pPage->SelItem == 0){ pMenu->Status = TMS_ON_TAB; @@ -241,8 +241,6 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) } pPage->SelItem--; pItem = &pPage->pItems[pPage->SelItem]; - // BOOL uItem_Locked = true; // TODO: - // if(((pItem->ItemId == IDM_CAMERA_FW_UPGRADE) || (pItem->ItemId == IDM_MODULE_FW_UPGRADE)) && uItem_Locked){ if((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || (pItem->ItemId == IDM_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE) || (pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)) { @@ -265,27 +263,28 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) TM_PAGE *pPage; TM_ITEM *pItem; BOOL uSel_Jump = false; - static BOOL FisrtSel_Jump = false; + // static BOOL FisrtSel_Jump = false; pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; if (pMenu->Status == TMS_ON_TAB){ pMenu->Status = TMS_ON_ITEM; - if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){ - pPage->SelItem = 1; - FisrtSel_Jump = true; - }else{ - pPage->SelItem = 0; - } + pPage->SelItem = 0; + // pMenu->Status = TMS_ON_ITEM; + // if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){ + // pPage->SelItem = 1; + // FisrtSel_Jump = true; + // }else{ + // pPage->SelItem = 0; + // } LV_MenuCommonItem_UpdateContent(pMenu); - lv_plugin_menu_select_item(menu_item, pPage->SelItem); + lv_plugin_menu_select_item(menu_item, 0); + // lv_plugin_menu_select_item(menu_item, pPage->SelItem); }else{ Onetime: pPage->SelItem++; pItem = &pPage->pItems[pPage->SelItem]; - // BOOL uItem_Locked = true; // TODO: - // if(((pItem->ItemId == IDM_CAMERA_FW_UPGRADE) || (pItem->ItemId == IDM_MODULE_FW_UPGRADE)) && uItem_Locked){ if((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || (pItem->ItemId == IDM_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE) || (pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)){ @@ -295,15 +294,21 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) } if(pPage->SelItem >= pPage->Count){ - if(FisrtSel_Jump /**&& uItem_Locked**/){ - pPage->SelItem = 1; - }else{ - pPage->SelItem = 0; - } + pPage->SelItem = 0; + // if(FisrtSel_Jump /**&& uItem_Locked**/){ + // pPage->SelItem = 1; + // }else{ + // pPage->SelItem = 0; + // } LV_MenuCommonItem_UpdateContent(pMenu); lv_plugin_menu_select_item(menu_item, pPage->SelItem); return; - } + } + //#NT#2023/11/03#Eric - begin + //#NT#Support IVOT_N12144_CO-148 -5 + PrevSel_Img = false; + //#NT#2023/11/03#Eric - end + LV_MenuCommonItem_UpdateContent(pMenu); lv_plugin_menu_select_next_item(menu_item); if(uSel_Jump){