蓝牙wifi连接后回退预览修改

This commit is contained in:
xiehongyan 2024-01-22 16:35:08 +08:00
parent ac376fea1e
commit 3e1d3372bf
2 changed files with 9 additions and 4 deletions

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
bear make all > /dev/null bear 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
bear make all > /dev/null bear make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

View File

@ -405,7 +405,8 @@ void UIFlowMenuCommonConfirm_OnOpen(lv_obj_t* obj)
void UIFlowMenuCommonConfirm_CloseScr(void) void UIFlowMenuCommonConfirm_CloseScr(void)
{ {
lv_msgbox_start_auto_close(msgbox, 0); if(msgbox)
lv_msgbox_start_auto_close(msgbox, 0);
} }
void UIFlowMenuCommonConfirm_OnChildScrClose(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg) void UIFlowMenuCommonConfirm_OnChildScrClose(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
@ -592,7 +593,11 @@ void UIFlowMenuCommonConfirmEventCallback(lv_obj_t* obj, lv_event_t event)
} }
case LV_PLUGIN_EVENT_SCR_CLOSE: case LV_PLUGIN_EVENT_SCR_CLOSE:
{
UIFlowMenuCommonConfirm_CloseScr();
break; break;
}
case LV_PLUGIN_EVENT_CHILD_SCR_CLOSE: case LV_PLUGIN_EVENT_CHILD_SCR_CLOSE: