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

BUG:10694 电量小于40%升级提示弹窗

Browse Source
This commit is contained in:
xiehongyan 2023-12-27 15:12:18 +08:00
parent 8935e03b70
commit b08b85b0c6
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_all.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
#用于gitlab-ci.yml编译使用 #用于gitlab-ci.yml编译使用
make app_clean #make app_clean
echo "Start compile." echo "Start compile."
export ROOT_PATH=$PWD export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
make clean #make clean
make all > /dev/null make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
make clean #make clean
make all > /dev/null make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

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

@ -79,25 +79,24 @@ static int is_camera_fw_upgrade(void)
FST_FILE hFile = NULL; FST_FILE hFile = NULL;
// return UPGRADABLE; // return UPGRADABLE;
hFile = FileSys_OpenFile(FW_UPDATE_NAME, FST_OPEN_READ); hFile = FileSys_OpenFile(FW_UPDATE_NAME, FST_OPEN_READ);
if (gBattery < 40 || hFile == NULL) //if (gBattery < 40 || hFile == NULL)
if (hFile == NULL)
{ {
if (hFile != NULL)
{
FileSys_CloseFile(hFile);
}
return NOT_UPGRADABLE; return NOT_UPGRADABLE;
} }
if (hFile != NULL) else
{ {
FileSys_CloseFile(hFile); FileSys_CloseFile(hFile);
} }
return UPGRADABLE; return UPGRADABLE;
} }
static int is_module_fw_upgrade(void) static int is_module_fw_upgrade(void)
{ {
// return UPGRADABLE; // return UPGRADABLE;
UINT8 updateFileName[60] = {0}; UINT8 updateFileName[60] = {0};
if (gBattery < 40 || sf_is_4g_module_usb_update_file_exist(updateFileName) == FALSE) //if (gBattery < 40 || sf_is_4g_module_usb_update_file_exist(updateFileName) == FALSE)
if (sf_is_4g_module_usb_update_file_exist(updateFileName) == FALSE)
{ {
return NOT_UPGRADABLE; return NOT_UPGRADABLE;
} }

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

@ -769,7 +769,7 @@ static void update_camera_message(void)
else else
{ {
set_warning_label_text(label_6_scr_uiflowphoto); set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "SD Card Error"); lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card");
} }
} }

11
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
View File

@ -327,7 +327,11 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
{ {
case LV_USER_KEY_MENU: case LV_USER_KEY_MENU:
// message_box_wrnmsg_OnKeyMenu(msgbox); // message_box_wrnmsg_OnKeyMenu(msgbox);
break; if(evt != NVTEVT_NULL){
UIFlowWrnMsg_CloseScr(evt);
}else{
UIFlowWrnMsg_CloseScr(NVTEVT_NULL);
}
//#NT#2023/11/14#Eric - begin //#NT#2023/11/14#Eric - begin
//#NT#Support IVOT_N12144_CO-148_A //#NT#Support IVOT_N12144_CO-148_A
case LV_KEY_ENTER: case LV_KEY_ENTER:
@ -335,6 +339,7 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
break; break;
//#NT#2023/11/14#Eric - end //#NT#2023/11/14#Eric - end
default: default:
UIFlowWrnMsg_CloseScr(evt);
break; break;
} }
@ -371,7 +376,9 @@ void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event)
msgbox = NULL; msgbox = NULL;
if(msgID == LV_PLUGIN_STRING_ID_STRING_NO_SD || if(msgID == LV_PLUGIN_STRING_ID_STRING_NO_SD ||
msgID == LV_PLUGIN_STRING_ID_STRING_FORMATING) msgID == LV_PLUGIN_STRING_ID_STRING_FORMATING ||
msgID == LV_PLUGIN_STRING_ID_STRING_UPGRADE_LOWBAT ||
msgID == LV_PLUGIN_STRING_ID_STRING_UPGRADE_ERR)
{ {
evt = NVTRET_ENTER_MENU; evt = NVTRET_ENTER_MENU;
} }