Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

code/application/source/cardv/SrcCode/NVTUserCommand.h

@@ -103,6 +103,7 @@ typedef enum {
 #if defined(_UI_STYLE_LVGL_)
 	NVTEVT_UPDATE_LVGL          = 0x80000001, ///< Update lvgl task handel
 #endif
+	NVTEVT_MSG_SCREEN_KEY       = 0x80000002,
 
 	/* INSERT NEW EVENT HRER */
 

code/application/source/cardv/SrcCode/System/SysMain.c

@@ -696,12 +696,6 @@ void UserMainProc(void)
     					g_keyboard_pressed = false;
 						leftKeyPressingTime_ms = 0;
     				}
-                    //call input task immediately for read key state
-                    if(indev_keypad){
-                    	_lv_user_task_handler_lock();
-                        indev_keypad->driver.read_task->task_cb(indev_keypad->driver.read_task);
-                        _lv_user_task_handler_unlock();
-                    }
 
                     /* workaround to extend key release event for lvgl */
                     if((paramArray[0] > NVTEVT_KEY_RELEASE_START) && (paramArray[0] < NVTEVT_KEY_RELEASE_END)){
@@ -723,6 +717,12 @@ void UserMainProc(void)
                     		DBG_WRN("evt = %lx\r\n", evt);
                     	}
                     }
+                    //call input task immediately for read key state
+                    if(indev_keypad){
+                    	_lv_user_task_handler_lock();
+                        indev_keypad->driver.read_task->task_cb(indev_keypad->driver.read_task);
+                        _lv_user_task_handler_unlock();
+                    }
                     if(paramArray[0] == NVTEVT_KEY_CONTINUE){
                     	uint32_t nvt_user_key = lv_user_keymap_find(evt);
 						#define MENU_UNLUCK 0

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

@@ -73,6 +73,7 @@ static BOOL g_PhotoBgInitFileSys = FALSE;
 static BOOL g_SysStrg_Chg = FALSE;
 //#NT#2023/11/21#Eric - end
 
+static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key);
 static void sf_show_send_text(lv_obj_t* obj, const unsigned short status);
 static lv_obj_t *g_preview_info_msgbox = NULL;
 static lv_obj_t *g_preview_info_label = NULL;

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

@@ -339,16 +339,14 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
                  printf(" ================================== switch sd card.\n");
                 ProfileSelected = 1;
                 Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PLAYBACK);
-                int SelectedHandle = System_Get_DCF_Handle();
+                
-    printf("[Option_play_Selection_Key][*x] select handle: %d.\n", SelectedHandle);
             } 
             else if (0 == ProfileFocused && ProfileSelected == 1)
             {
                  printf(" ================================== switch emmc.\n");
                 ProfileSelected = 0;
                 Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PLAYBACK);
-                int SelectedHandle = System_Get_DCF_Handle();
+
-    printf("[Option_play_Selection_Key][*x] select handle: %d.\n", SelectedHandle);
             }
             ProfileFocused = 0;
             hidde_Selection_page();
@@ -1286,6 +1284,7 @@ static void set_indev_keypad_group(lv_obj_t* obj)
 
 static void UIFlowPlay_ScrOpen(lv_obj_t* obj)
 {
+    
     DBG_IND("UIFlowPlay_ScrOpen\r\n");
     int SelectedHandle = System_Get_DCF_Handle();
     printf("[UIFlowPlay_ScrOpen][*x] select handle: %d.\n", SelectedHandle);
@@ -2434,7 +2433,6 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key)
 
 static void UIFlowPlay_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
 {
-
     switch(msg->event)
     {
     case NVTEVT_CB_MOVIE_FINISH:
@@ -2506,6 +2504,18 @@ static void UIFlowPlay_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* ms
 
         break;
     }
+	case NVTEVT_MSG_SCREEN_KEY:
+	if (1 == msg->paramNum)
+	{
+        uint32_t key = msg->paramArray[0];
+        if (SELECTION_SHOW_TURE == gSeletionShow) {
+            Option_play_Selection_Key(obj, key);
+        } else {
+            /* handle key event */
+            UIFlowPlay_Key(obj, key);
+        }
+	}
+	break;
     default:
         break;
 

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

@@ -326,7 +326,11 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
 {
 	// static uint32_t key22 = LV_KEY_END;
 	// key22 = key;
-	// lv_event_send(lv_obj_get_parent(UIFlowWrnMsg), LV_USER_EVENT_KEY_RELEASE, &key22);
+	if(lv_plugin_scr_count() >= 2){
+		lv_event_send(lv_plugin_scr_by_index(lv_plugin_scr_count() - 2), LV_USER_EVENT_NVTMSG, gen_nvtmsg_data(NVTEVT_MSG_SCREEN_KEY, 1, key));
+	}else{
+		lv_event_send(lv_plugin_scr_act(), LV_USER_EVENT_NVTMSG, gen_nvtmsg_data(NVTEVT_MSG_SCREEN_KEY, 1, key));
+	}
 	return;
 	switch(key)
 	{

code/application/source/sf_app/code/source/battery/sf_battery.c

@@ -418,11 +418,15 @@ UINT32 sf_battery_adc_value_get_once(void)
 		}
 		else
 		{	first_init--;
+			if (puiPara->BatteryType == SF_BATT_LI_PACK)
+			{
 				puiPara->BatteryType = SF_BATT_ALKALINE;
 			}
 			
 		}
 		
+	}
+
 
 	getBatAdcFlg = 0;
 
@@ -969,9 +973,13 @@ void sf_battery_level_polling(void)
         }
     }
 	else{
+		if(puiPara->BatteryType == SF_BATT_LI_PACK)
+		{
 			puiPara->BatteryType = SF_BATT_ALKALINE;
 		}
 		
+	}
+	
 	//ret = sf_check_low_battery();
 
 	if(puiPara->BatteryLogSwitch)