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

Merge branch 'branch_s550_gui' into branch_s550_fast

Browse Source
This commit is contained in:
xiaojiazhu 2023-12-08 15:47:28 +08:00
commit 1514cc5823
8 changed files with 105 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/System/SysMain_Exe.c
View File

@ -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())*/)
{

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

@ -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:
@ -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)
@ -335,10 +343,17 @@ void hidde_MaxNum_page(void)
if(MaxNumTitleLabel)
{
lv_obj_del(MaxNumTitleLabel);
MaxNumTitleLabel = NULL;
}
if(MaxNumValueLabel)
{
lv_obj_del(MaxNumValueLabel);
MaxNumValueLabel = NULL;
}
if(SelectedImage)
{
lv_obj_del(SelectedImage);
SelectedImage = NULL;
}
}
@ -362,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:
@ -371,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:
@ -436,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", ""};
@ -491,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();

42
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -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);
}
@ -216,6 +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];
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;
@ -236,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)) {
@ -260,20 +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;
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;
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++;
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)){
@ -284,6 +295,11 @@ 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;
@ -292,6 +308,7 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj)
//#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 +724,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 +744,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)

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -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)

30
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -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
@ -570,8 +571,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 +582,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");
}
@ -594,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,
@ -1686,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:
@ -1693,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:
@ -2015,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;
@ -2028,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;

7
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -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) {

16
code/application/source/sf_app/code/source/qrcodeMng/sf_bmp.c
View File

@ -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);
}

2
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -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)*/)
{