Fixed key release event bug.
This commit is contained in:
		
							parent
							
								
									1d79b833e7
								
							
						
					
					
						commit
						0798d69d71
					
				| 
						 | 
				
			
			@ -618,7 +618,7 @@ void UserMainProc(void)
 | 
			
		|||
 | 
			
		||||
								lv_obj_t* focused = lv_group_get_focused(indev_keypad->group);
 | 
			
		||||
								if(focused)
 | 
			
		||||
									lv_event_send(lv_plugin_scr_act(), LV_USER_EVENT_KEY_RELEASE, &nvt_user_key);
 | 
			
		||||
									lv_event_send(focused, LV_USER_EVENT_KEY_RELEASE, &nvt_user_key);
 | 
			
		||||
 | 
			
		||||
								_lv_user_task_handler_unlock();
 | 
			
		||||
							}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -406,7 +406,8 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
		break;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -824,7 +824,8 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
		LV_MenuItem_OnSelected(obj);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
	case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -833,7 +833,8 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
	// 	LV_MenuOption_OnSelected(obj);
 | 
			
		||||
	// 	break;
 | 
			
		||||
 | 
			
		||||
	case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
		printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_KEY key:%d\033[0m\n", *key);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1334,7 +1334,7 @@ static void UIFlowMovie_OnExeZoomOutStop(lv_obj_t* obj)
 | 
			
		|||
	return;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void UIFlowMovie_KeyRelease(lv_obj_t* obj, uint32_t key)
 | 
			
		||||
void UIFlowMovie_KeyRelease(lv_obj_t* obj, uint32_t key)
 | 
			
		||||
{
 | 
			
		||||
	switch(key)
 | 
			
		||||
	{
 | 
			
		||||
| 
						 | 
				
			
			@ -1499,7 +1499,8 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
		// UIFlowMovie_OnKeyMenu(obj);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
	case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1518,13 +1519,13 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
		break;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
		UIFlowMovie_KeyRelease(obj, *key);
 | 
			
		||||
	// case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	// {
 | 
			
		||||
	// 	uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
	// 	UIFlowMovie_KeyRelease(obj, *key);
 | 
			
		||||
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	// 	break;
 | 
			
		||||
	// }
 | 
			
		||||
 | 
			
		||||
	/* handle nvt event except key event */
 | 
			
		||||
	case LV_USER_EVENT_NVTMSG:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -147,8 +147,8 @@ printf(" UIFlowPasswordEventCallback %d\n", event);
 | 
			
		|||
	case LV_EVENT_CLICKED:
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
	/* any key(including enter key) state changed(pressed), it's recommended to handle enter key in LV_EVENT_CLICKED instead of here. */
 | 
			
		||||
	case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1560,8 +1560,8 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
		UIFlowPhoto_OnKeyMenu(obj);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
	case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
	{
 | 
			
		||||
		uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
        printf(" ===================================== 2222 release key = %d\n", *key);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2041,7 +2041,8 @@ static void UIFlowPlayBtnEventCallback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
    	break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    case LV_EVENT_KEY:
 | 
			
		||||
    // case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
    {
 | 
			
		||||
        uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -256,7 +256,8 @@ void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event)
 | 
			
		|||
	printf("[%s]event:%d\n", __FUNCTION__, event);
 | 
			
		||||
    switch (event)
 | 
			
		||||
    {
 | 
			
		||||
		case LV_EVENT_KEY:
 | 
			
		||||
	// case LV_EVENT_KEY:
 | 
			
		||||
	case LV_USER_EVENT_KEY_RELEASE:
 | 
			
		||||
		{
 | 
			
		||||
			uint32_t* key = (uint32_t*)lv_event_get_data();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user