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/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c

@@ -694,7 +694,7 @@ static void qr_page_task_cb(lv_task_t* task){
     {
       UIMenuStoreInfo *puiPara = sf_ui_para_get();
       printf("[qr_page_task_cb]is esim card...%s\n", puiPara->ModuleImei);
-      if(strlen(puiPara->SimIccidV) == 0 && strlen(puiPara->SimIccidA) == 0)
+      if (strlen(puiPara->SimIccid) == 0 || strlen(puiPara->ModuleImei) == 0)
       {
         lv_label_set_text(labelInit, "Please restart the camera");
         return;
@@ -705,9 +705,9 @@ static void qr_page_task_cb(lv_task_t* task){
     {
       UIMenuStoreInfo *puiPara = sf_ui_para_get();                                                                   
       printf("[qr_page_task_cb]is sim card...%s\n", puiPara->ModuleImei);
-      if(strlen(puiPara->SimIccidV) == 0 && strlen(puiPara->SimIccidA) == 0)
+      if (strlen(puiPara->SimIccid) == 0 || strlen(puiPara->ModuleImei) == 0)
       {
-        lv_label_set_text(labelInit, "Please insert SIM card and restart the camera");
+        lv_label_set_text(labelInit, "Please restart the camera");
         return;
       }
       snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "false");

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

@@ -27,7 +27,7 @@
 //#define PLAY_KEY_PRESS_MASK        (FLGKEY_KEY_MASK_DEFAULT)
 //#define PLAY_KEY_RELEASE_MASK      FLGKEY_KEY_MASK_NULL//(FLGKEY_UP | FLGKEY_DOWN | FLGKEY_LEFT | FLGKEY_RIGHT)
 //#define PLAY_KEY_CONTINUE_MASK     FLGKEY_KEY_CONT_MASK_DEFAULT
-static SF_ST_MMC_DEV *mmc_dev = NULL;
+extern int System_Get_DCF_Handle(void);
 //static lv_obj_t* pMenu = NULL;
 enum SELECTION_SHOW
 {
@@ -60,6 +60,9 @@ extern void PBView_DrawNoFile(void);
 static void stop_play(void);
 //#NT#2023/11/14#Eric - end
 
+#define HANDLE_SD           1
+#define HANDLE_EMMC         0
+
 static BOOL g_PlayBgInitFileSys = FALSE;
 
 #if 1
@@ -221,6 +224,22 @@ static void update_play_Selection_msg(lv_obj_t* obj)
             }
         }
   }
+      UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
+	if (cardStatus == CARD_REMOVED && OPTION_PAGE_SELECT_FUNCTION != gOptionPage)
+	{
+        ProfileFocused = 0;
+        ProfileSelected = 0;
+        lv_obj_set_state(image_button_option_1_scr_uiflowplay, LV_STATE_FOCUSED);
+		lv_obj_set_state(label_option1_scr_uiflowplay, LV_STATE_FOCUSED);
+
+	    lv_plugin_img_set_src(image_option1_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_LIST_SELECTED);
+        lv_obj_set_pos(image_option1_scr_uiflowplay, 272, 0);
+        lv_obj_set_hidden(image_option1_scr_uiflowplay, false);
+
+        lv_obj_set_state(image_button_option_2_scr_uiflowplay, LV_STATE_DISABLED);
+		lv_obj_set_state(label_option2_scr_uiflowplay, LV_STATE_DISABLED);
+        lv_obj_set_hidden(image_option2_scr_uiflowplay, true);
+    }
 }
 
 
@@ -279,6 +298,7 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
         }
         case LV_USER_KEY_LEFT:
         {
+            /*
             if (OPTION_PAGE_SELECT_FUNCTION == gOptionPage)
             {
                 hidde_Selection_page();
@@ -288,6 +308,7 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
                 gOptionPage = OPTION_PAGE_SELECT_FUNCTION;
                 show_Selection_page(obj);
             }
+            */
             break;
         }
         case LV_USER_KEY_RIGHT:
@@ -307,33 +328,27 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
                 } 
                 else //GO TO STORAGE OPTIONS
                 {
-                    mmc_dev = SF_GetMMCDev();
-                    if (mmc_dev->dev_type == 0)//sd 0, emmc 1
-                    {
-                        ProfileFocused = 1;
-                    }
-                    else
-                    {
-                        ProfileFocused = 0;
-                    }
-                    printf(" ================================== storage option init%d\n", ProfileSelected);
                     ProfileFocused = ProfileSelected;
                     gOptionPage = OPTION_PAGE_FORMAT;
                     show_Selection_page(obj);
                 }
             } 
             else {
-            if (1 == ProfileFocused)
+            if (1 == ProfileFocused && ProfileSelected == 0)
             {
                  printf(" ================================== switch sd card.\n");
                 ProfileSelected = 1;
-                FileDB_Refresh(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);
             } 
-            else 
+            else if (0 == ProfileFocused && ProfileSelected == 1)
             {
                  printf(" ================================== switch emmc.\n");
                 ProfileSelected = 0;
-                FileDB_Refresh(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);
             }
             ProfileFocused = 0;
             hidde_Selection_page();
@@ -1272,6 +1287,16 @@ 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);
+    if (SelectedHandle == HANDLE_SD)
+    {
+        ProfileSelected = 1;
+    }
+    else if (SelectedHandle == HANDLE_EMMC)
+    {
+        ProfileSelected = 0;
+    }
     
     set_indev_keypad_group(obj);
     if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) {

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

@@ -45,7 +45,7 @@ static void task_msgbox_timer_cb(lv_task_t* task)
 
 		if (0 == autoClose || autoOffTime <= 10)
 		{
-			
+			printf("[task_msgbox_timer_cb][*x]auto close\n");
 			
 			lv_task_del(msgbox_timer);
 			msgbox_timer = NULL;
@@ -56,6 +56,7 @@ static void task_msgbox_timer_cb(lv_task_t* task)
 			}
 			if (0 == autoClose)
 			{
+				printf("[task_msgbox_timer_cb][*x]set statu flag\n");
 				sf_set_pir_statu_flag(1);
 				// OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
 				//#define DO_NOT_SHOW_POWER_OFF 0

code/lib/source/sifar/code/source/common/sf_common.c

@@ -284,6 +284,7 @@ void sf_mode_detect(void)
         }
         else if((sf_get_pir_statu_flag()) && (CMD_FORMAT_SD_STA != sf_get_card_statu()))
         {
+            printf("[sf_mode_detect][*x] empezar going to pir................................\n");
             pwroffcnt++;
             //printf("[%s:%d]pwroffcnt=%d\n",__FUNCTION__,__LINE__,pwroffcnt);
             //sf_enter_auto_mode_count_down_show(4 - pwroffcnt);