Merge branch 'branch_s550_gui' into branch_s550_fast

This commit is contained in:
xiaojiazhu 2023-11-17 19:02:51 +08:00
commit 182c6ea68a

View File

@ -516,10 +516,6 @@ static void update_camera_message(void)
static void update_wifi(void) static void update_wifi(void)
{ {
// SF_WIFI_OK = 0x01,/*wifi start success*/
// SF_WIFI_CON, /*wifi has been connected*/
// SF_WIFI_FAIL, /*wifi start fail*/
// SF_WIFI_BUTT,
const int EMPTY_IMAGE = 0; const int EMPTY_IMAGE = 0;
SF_WIFI_STATUS_E status = sf_get_wifi_status(); SF_WIFI_STATUS_E status = sf_get_wifi_status();
lv_plugin_res_id res[] = { lv_plugin_res_id res[] = {
@ -1610,7 +1606,11 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_MENU: case LV_USER_KEY_MENU:
case LV_USER_KEY_RIGHT: case LV_USER_KEY_RIGHT:
{ {
UIFlowPhoto_OnKeyMenu(obj); SF_WIFI_STATUS_E status = sf_get_wifi_status();
if (SF_WIFI_CON != status)
{
UIFlowPhoto_OnKeyMenu(obj);
}
break; break;
} }