9842,10801 二维码显示逻辑问题, 回放界面设置菜单未插卡变灰

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,16 +705,16 @@ 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");
     }
     else if (ret == -1)
     {
-      if(sf_cardv_4G_status_get() == SF_4G_SEARCHING)
+      if (sf_cardv_4G_status_get() == SF_4G_SEARCHING)
       {
         lv_label_set_text(labelInit, "\nQR code loading...");
       }

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

@@ -697,7 +697,7 @@ static void update_storage_sd_card(void)
 			{
 				static int cnt = 0;
 				if(cnt++<1){
-					lv_label_set_text(label_6_scr_uiflowphoto, "Loarding...");
+					lv_label_set_text(label_6_scr_uiflowphoto, "");
 				}else{
 					g_SysStrg_Chg = false;
 					cnt = 0;

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_option2_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);
+    }
 }
 
 
@@ -307,33 +326,23 @@ 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);
             } 
-            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);
             }
             ProfileFocused = 0;
             hidde_Selection_page();
@@ -1272,7 +1281,17 @@ 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.", 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) {