Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize

build_all.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #用于gitlab-ci.yml编译使用
 
-make app_clean
+#make app_clean
 
 echo "Start compile."
 export ROOT_PATH=$PWD
@@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
 cd rtos
 source build/envsetup.sh
 lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
-make clean
+#make clean
 make all  > /dev/null
 cp output/application.bin ../
 cp output/rtos-main.bin ../
@@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
 cd $ROOT_PATH
 source build/envsetup.sh
 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
-make clean
+#make clean
 make all  > /dev/null
 
 cd $ROOT_PATH

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c

@@ -623,7 +623,7 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = {
 	{ "NI-MH", 5 },			/* LV_PLUGIN_STRING_ID_STRING_NI_MH */ 
 	{ "Lithium", 7 },			/* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ 
 	{ "Lith Pack", 9 },			/* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ 
-	{ "SD Loop", 7 },			/* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ 
+	{ "EMMC Loop", 9 },			/* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ 
 	{ "Camera FW Upgrade", 17 },			/* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ 
 	{ "Module FW Upgrade", 17 },			/* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ 
 	{ "Reset", 5 },			/* LV_PLUGIN_STRING_ID_STRING_RESET */ 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang

@@ -890,7 +890,7 @@
                 "NI-MH",
                 "Lithium",
                 "Lith Pack",
-                "SD Loop",
+                "EMMC Loop",
                 "Camera FW Upgrade",
                 "Module FW Upgrade",
                 "Reset",

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp

@@ -4802,6 +4802,66 @@
             "filename": "icons/sf_right.bmp",
             "name": "sf_right"
         },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_128gb.bmp",
+            "name": "sf_sd_128gb"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_16gb.bmp",
+            "name": "sf_sd_16gb"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_256gb.bmp",
+            "name": "sf_sd_256gb"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_32gb.bmp",
+            "name": "sf_sd_32gb"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_64gb.bmp",
+            "name": "sf_sd_64gb"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_8gb.bmp",
+            "name": "sf_sd_8gb"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_dis.bmp",
+            "name": "sf_sd_dis"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_emmc.bmp",
+            "name": "sf_sd_emmc"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_emmc_dis.bmp",
+            "name": "sf_sd_emmc_dis"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_emmc_line.bmp",
+            "name": "sf_sd_emmc_line"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_full.bmp",
+            "name": "sf_sd_full"
+        },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sf_sd_no.bmp",
+            "name": "sf_sd_no"
+        },
         {
             "colorFormat": "Indexed 256 in RGB332",
             "filename": "icons/sf_send_type.bmp",
@@ -4907,11 +4967,21 @@
             "filename": "icons/sf_wifi_unsupport.bmp",
             "name": "sf_wifi_unsupport"
         },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sy_bg_1.bmp",
+            "name": "sy_bg_1"
+        },
         {
             "colorFormat": "Indexed 256 in RGB332",
             "filename": "icons/sy_bg_102X28.bmp",
             "name": "sy_bg_102X28"
         },
+        {
+            "colorFormat": "Indexed 256 in RGB332",
+            "filename": "icons/sy_bg_2.bmp",
+            "name": "sy_bg_2"
+        },
         {
             "colorFormat": "Indexed 256 in RGB332",
             "filename": "icons/sy_bg_32X28.bmp",

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

@@ -498,6 +498,18 @@ lv_plugin_img_t lv_plugin_UIFlowLVGL_img_table[] =
 	{ &sf_qr },
 	{ &sf_reset },
 	{ &sf_right },
+	{ &sf_sd_128gb },
+	{ &sf_sd_16gb },
+	{ &sf_sd_256gb },
+	{ &sf_sd_32gb },
+	{ &sf_sd_64gb },
+	{ &sf_sd_8gb },
+	{ &sf_sd_dis },
+	{ &sf_sd_emmc },
+	{ &sf_sd_emmc_dis },
+	{ &sf_sd_emmc_line },
+	{ &sf_sd_full },
+	{ &sf_sd_no },
 	{ &sf_send_type },
 	{ &sf_send_type_dis },
 	{ &sf_sensitvity },
@@ -519,7 +531,9 @@ lv_plugin_img_t lv_plugin_UIFlowLVGL_img_table[] =
 	{ &sf_wifi_connected },
 	{ &sf_wifi_unconnected },
 	{ &sf_wifi_unsupport },
+	{ &sy_bg_1 },
 	{ &sy_bg_102x28 },
+	{ &sy_bg_2 },
 	{ &sy_bg_32x28 },
 	{ &sy_bg_40x28 },
 	{ &sy_bg_msg },

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h

@@ -518,6 +518,8 @@ LV_IMG_DECLARE(sf_green_square);
 LV_IMG_DECLARE(sf_image_size);
 LV_IMG_DECLARE(sf_left);
 LV_IMG_DECLARE(sf_list_selected);
+LV_IMG_DECLARE(sf_list_selected_next1);
+LV_IMG_DECLARE(sf_list_selected_next2);
 LV_IMG_DECLARE(sf_menu_bg);
 LV_IMG_DECLARE(sf_menu_option_select);
 LV_IMG_DECLARE(sf_menu_release);
@@ -542,8 +544,21 @@ LV_IMG_DECLARE(sf_picture_upon_daily_report);
 LV_IMG_DECLARE(sf_play);
 LV_IMG_DECLARE(sf_pwd_down_up);
 LV_IMG_DECLARE(sf_qr);
+LV_IMG_DECLARE(sf_qr_page);
 LV_IMG_DECLARE(sf_reset);
 LV_IMG_DECLARE(sf_right);
+LV_IMG_DECLARE(sf_sd_128gb);
+LV_IMG_DECLARE(sf_sd_16gb);
+LV_IMG_DECLARE(sf_sd_256gb);
+LV_IMG_DECLARE(sf_sd_32gb);
+LV_IMG_DECLARE(sf_sd_64gb);
+LV_IMG_DECLARE(sf_sd_8gb);
+LV_IMG_DECLARE(sf_sd_dis);
+LV_IMG_DECLARE(sf_sd_emmc);
+LV_IMG_DECLARE(sf_sd_emmc_dis);
+LV_IMG_DECLARE(sf_sd_emmc_line);
+LV_IMG_DECLARE(sf_sd_full);
+LV_IMG_DECLARE(sf_sd_no);
 LV_IMG_DECLARE(sf_send_type);
 LV_IMG_DECLARE(sf_send_type_dis);
 LV_IMG_DECLARE(sf_sensitvity);
@@ -565,7 +580,9 @@ LV_IMG_DECLARE(sf_warning_selected);
 LV_IMG_DECLARE(sf_wifi_connected);
 LV_IMG_DECLARE(sf_wifi_unconnected);
 LV_IMG_DECLARE(sf_wifi_unsupport);
+LV_IMG_DECLARE(sy_bg_1);
 LV_IMG_DECLARE(sy_bg_102x28);
+LV_IMG_DECLARE(sy_bg_2);
 LV_IMG_DECLARE(sy_bg_32x28);
 LV_IMG_DECLARE(sy_bg_40x28);
 LV_IMG_DECLARE(sy_bg_msg);
@@ -1010,65 +1027,82 @@ LV_IMG_DECLARE(work_mode);
 #define LV_PLUGIN_IMG_ID_SF_IMAGE_SIZE 431
 #define LV_PLUGIN_IMG_ID_SF_LEFT 432
 #define LV_PLUGIN_IMG_ID_SF_LIST_SELECTED 433
-#define LV_PLUGIN_IMG_ID_SF_MENU_BG 434
+#define LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1 434
-#define LV_PLUGIN_IMG_ID_SF_MENU_OPTION_SELECT 435
+#define LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2 435
-#define LV_PLUGIN_IMG_ID_SF_MENU_RELEASE 436
+#define LV_PLUGIN_IMG_ID_SF_MENU_BG 436
-#define LV_PLUGIN_IMG_ID_SF_MENU_SELECT 437
+#define LV_PLUGIN_IMG_ID_SF_MENU_OPTION_SELECT 437
-#define LV_PLUGIN_IMG_ID_SF_MODE_STILL_VIDEO 438
+#define LV_PLUGIN_IMG_ID_SF_MENU_RELEASE 438
-#define LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE 439
+#define LV_PLUGIN_IMG_ID_SF_MENU_SELECT 439
-#define LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE_DIS 440
+#define LV_PLUGIN_IMG_ID_SF_MODE_STILL_VIDEO 440
-#define LV_PLUGIN_IMG_ID_SF_NET2G 441
+#define LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE 441
-#define LV_PLUGIN_IMG_ID_SF_NET3G 442
+#define LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE_DIS 442
-#define LV_PLUGIN_IMG_ID_SF_NET4G 443
+#define LV_PLUGIN_IMG_ID_SF_NET2G 443
-#define LV_PLUGIN_IMG_ID_SF_NEXT 444
+#define LV_PLUGIN_IMG_ID_SF_NET3G 444
-#define LV_PLUGIN_IMG_ID_SF_NEXT1 445
+#define LV_PLUGIN_IMG_ID_SF_NET4G 445
-#define LV_PLUGIN_IMG_ID_SF_NEXT2 446
+#define LV_PLUGIN_IMG_ID_SF_NEXT 446
-#define LV_PLUGIN_IMG_ID_SF_NEXT3 447
+#define LV_PLUGIN_IMG_ID_SF_NEXT1 447
-#define LV_PLUGIN_IMG_ID_SF_NEXT4 448
+#define LV_PLUGIN_IMG_ID_SF_NEXT2 448
-#define LV_PLUGIN_IMG_ID_SF_NEXT_DIS 449
+#define LV_PLUGIN_IMG_ID_SF_NEXT3 449
-#define LV_PLUGIN_IMG_ID_SF_OFF 450
+#define LV_PLUGIN_IMG_ID_SF_NEXT4 450
-#define LV_PLUGIN_IMG_ID_SF_ON 451
+#define LV_PLUGIN_IMG_ID_SF_NEXT_DIS 451
-#define LV_PLUGIN_IMG_ID_SF_OPERATING_TIME 452
+#define LV_PLUGIN_IMG_ID_SF_OFF 452
-#define LV_PLUGIN_IMG_ID_SF_PASSWORD 453
+#define LV_PLUGIN_IMG_ID_SF_ON 453
-#define LV_PLUGIN_IMG_ID_SF_PICTURE_UPON_DAILY_REPORT 454
+#define LV_PLUGIN_IMG_ID_SF_OPERATING_TIME 454
-#define LV_PLUGIN_IMG_ID_SF_PLAY 455
+#define LV_PLUGIN_IMG_ID_SF_PASSWORD 455
-#define LV_PLUGIN_IMG_ID_SF_PWD_DOWN_UP 456
+#define LV_PLUGIN_IMG_ID_SF_PICTURE_UPON_DAILY_REPORT 456
-#define LV_PLUGIN_IMG_ID_SF_QR 457
+#define LV_PLUGIN_IMG_ID_SF_PLAY 457
-#define LV_PLUGIN_IMG_ID_SF_RESET 458
+#define LV_PLUGIN_IMG_ID_SF_PWD_DOWN_UP 458
-#define LV_PLUGIN_IMG_ID_SF_RIGHT 459
+#define LV_PLUGIN_IMG_ID_SF_QR 459
-#define LV_PLUGIN_IMG_ID_SF_SEND_TYPE 460
+#define LV_PLUGIN_IMG_ID_SF_QR_PAGE 460
-#define LV_PLUGIN_IMG_ID_SF_SEND_TYPE_DIS 461
+#define LV_PLUGIN_IMG_ID_SF_RESET 461
-#define LV_PLUGIN_IMG_ID_SF_SENSITVITY 462
+#define LV_PLUGIN_IMG_ID_SF_RIGHT 462
-#define LV_PLUGIN_IMG_ID_SF_SHOOT_1 463
+#define LV_PLUGIN_IMG_ID_SF_SD_128GB 463
-#define LV_PLUGIN_IMG_ID_SF_SIGNAL0 464
+#define LV_PLUGIN_IMG_ID_SF_SD_16GB 464
-#define LV_PLUGIN_IMG_ID_SF_SIGNAL1 465
+#define LV_PLUGIN_IMG_ID_SF_SD_256GB 465
-#define LV_PLUGIN_IMG_ID_SF_SIGNAL2 466
+#define LV_PLUGIN_IMG_ID_SF_SD_32GB 466
-#define LV_PLUGIN_IMG_ID_SF_SIGNAL3 467
+#define LV_PLUGIN_IMG_ID_SF_SD_64GB 467
-#define LV_PLUGIN_IMG_ID_SF_SIGNAL4 468
+#define LV_PLUGIN_IMG_ID_SF_SD_8GB 468
-#define LV_PLUGIN_IMG_ID_SF_SMS_CTRL 469
+#define LV_PLUGIN_IMG_ID_SF_SD_DIS 469
-#define LV_PLUGIN_IMG_ID_SF_STOP 470
+#define LV_PLUGIN_IMG_ID_SF_SD_EMMC 470
-#define LV_PLUGIN_IMG_ID_SF_TAB_RELEASE 471
+#define LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS 471
-#define LV_PLUGIN_IMG_ID_SF_TAB_SELECT 472
+#define LV_PLUGIN_IMG_ID_SF_SD_EMMC_LINE 472
-#define LV_PLUGIN_IMG_ID_SF_VIDEO_LENGTH 473
+#define LV_PLUGIN_IMG_ID_SF_SD_FULL 473
-#define LV_PLUGIN_IMG_ID_SF_VIDEO_SIZE 474
+#define LV_PLUGIN_IMG_ID_SF_SD_NO 474
-#define LV_PLUGIN_IMG_ID_SF_WARNING_BG 475
+#define LV_PLUGIN_IMG_ID_SF_SEND_TYPE 475
-#define LV_PLUGIN_IMG_ID_SF_WARNING_NOT_SELECT 476
+#define LV_PLUGIN_IMG_ID_SF_SEND_TYPE_DIS 476
-#define LV_PLUGIN_IMG_ID_SF_WARNING_SELECTED 477
+#define LV_PLUGIN_IMG_ID_SF_SENSITVITY 477
-#define LV_PLUGIN_IMG_ID_SF_WIFI_CONNECTED 478
+#define LV_PLUGIN_IMG_ID_SF_SHOOT_1 478
-#define LV_PLUGIN_IMG_ID_SF_WIFI_UNCONNECTED 479
+#define LV_PLUGIN_IMG_ID_SF_SIGNAL0 479
-#define LV_PLUGIN_IMG_ID_SF_WIFI_UNSUPPORT 480
+#define LV_PLUGIN_IMG_ID_SF_SIGNAL1 480
-#define LV_PLUGIN_IMG_ID_SY_BG_102X28 481
+#define LV_PLUGIN_IMG_ID_SF_SIGNAL2 481
-#define LV_PLUGIN_IMG_ID_SY_BG_32X28 482
+#define LV_PLUGIN_IMG_ID_SF_SIGNAL3 482
-#define LV_PLUGIN_IMG_ID_SY_BG_40X28 483
+#define LV_PLUGIN_IMG_ID_SF_SIGNAL4 483
-#define LV_PLUGIN_IMG_ID_SY_BG_MSG 484
+#define LV_PLUGIN_IMG_ID_SF_SMS_CTRL 484
-#define LV_PLUGIN_IMG_ID_SY_BG_MSG2 485
+#define LV_PLUGIN_IMG_ID_SF_STOP 485
-#define LV_PLUGIN_IMG_ID_SY_LANYA2 486
+#define LV_PLUGIN_IMG_ID_SF_TAB_RELEASE 486
-#define LV_PLUGIN_IMG_ID_SY_LUZHI 487
+#define LV_PLUGIN_IMG_ID_SF_TAB_SELECT 487
-#define LV_PLUGIN_IMG_ID_SY_REDLINE 488
+#define LV_PLUGIN_IMG_ID_SF_VIDEO_LENGTH 488
-#define LV_PLUGIN_IMG_ID_SY_REDLINE2 489
+#define LV_PLUGIN_IMG_ID_SF_VIDEO_SIZE 489
-#define LV_PLUGIN_IMG_ID_SY_WIFI2 490
+#define LV_PLUGIN_IMG_ID_SF_WARNING_BG 490
-#define LV_PLUGIN_IMG_ID_WORK_MODE 491
+#define LV_PLUGIN_IMG_ID_SF_WARNING_NOT_SELECT 491
-#define LV_PLUGIN_IMG_TABLE_SIZE 492
+#define LV_PLUGIN_IMG_ID_SF_WARNING_SELECTED 492
+#define LV_PLUGIN_IMG_ID_SF_WIFI_CONNECTED 493
+#define LV_PLUGIN_IMG_ID_SF_WIFI_UNCONNECTED 494
+#define LV_PLUGIN_IMG_ID_SF_WIFI_UNSUPPORT 495
+#define LV_PLUGIN_IMG_ID_SY_BG_1 496
+#define LV_PLUGIN_IMG_ID_SY_BG_102X28 497
+#define LV_PLUGIN_IMG_ID_SY_BG_2 498
+#define LV_PLUGIN_IMG_ID_SY_BG_32X28 499
+#define LV_PLUGIN_IMG_ID_SY_BG_40X28 500
+#define LV_PLUGIN_IMG_ID_SY_BG_MSG 501
+#define LV_PLUGIN_IMG_ID_SY_BG_MSG2 502
+#define LV_PLUGIN_IMG_ID_SY_LANYA2 503
+#define LV_PLUGIN_IMG_ID_SY_LUZHI 504
+#define LV_PLUGIN_IMG_ID_SY_REDLINE 505
+#define LV_PLUGIN_IMG_ID_SY_REDLINE2 506
+#define LV_PLUGIN_IMG_ID_SY_WIFI2 507
+#define LV_PLUGIN_IMG_ID_WORK_MODE 508
+#define LV_PLUGIN_IMG_TABLE_SIZE 509
 
 #define LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16 1
 #define LV_PLUGIN_FONT_ID_NOTOSANSCJKSC_BLACK_16_1BPP 2
@@ -1770,7 +1804,9 @@ LV_IMG_DECLARE(work_mode);
 #define LV_PLUGIN_STRING_ID_STRING_SIZE_40M 679
 #define LV_PLUGIN_STRING_ID_STRING_ENTER_WORK_MODE 680
 #define LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE 681
-#define LV_PLUGIN_STRING_TABLE_SIZE 682
+#define LV_PLUGIN_STRING_ID_STRING_FORMAT_EMMC 682
+#define LV_PLUGIN_STRING_ID_STRING_FORMAT_SD_CARD 683
+#define LV_PLUGIN_STRING_TABLE_SIZE 684
 
 #define LV_PLUGIN_LANGUAGE_ID_EN 1
 #define LV_PLUGIN_LANGUAGE_ID_FR 2

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h

@@ -946,7 +946,7 @@ enum _MENU_IDI {
 	
 	// Setting More page
 	IDI_BATTERY_TYPE = LV_PLUGIN_IMG_ID_SF_BATTERY_TYPE,
-	IDI_SD_LOOP = LV_PLUGIN_IMG_ID_SF_SD_LOOP,
+	IDI_SD_LOOP = LV_PLUGIN_IMG_ID_SF_SD_EMMC_LINE,
 	IDI_CAMERA_FW_UPGRADE = LV_PLUGIN_IMG_ID_SF_CAMERA_FW_UPGRADE,
 	IDI_MODULE_FW_UPGRADE = LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE,
 	IDI_RESET = LV_PLUGIN_IMG_ID_SF_RESET,

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c

@@ -367,7 +367,7 @@ static void update_Network_Selection_msg(lv_obj_t* obj)
 
 static void network_scan_task_end(void)
 {
-  if(network_scan_task)
+  if(NULL != network_scan_task)
   {
     lv_task_del(network_scan_task);
     network_scan_task = NULL;
@@ -380,9 +380,9 @@ static void network_scan_task_cb(lv_task_t* task)
   int fd = -1;
   int BuffLen;
 	unsigned char Buff[1024] = { 0 };
-
+  
   lv_obj_t* obj = (lv_obj_t*)task->user_data;
-
+  printf("[%s]Check simcard...\n", __FUNCTION__);
   if(Countdown)
   {
     printf("[%s]Countdown:%d\n", __FUNCTION__, Countdown);
@@ -399,7 +399,6 @@ static void network_scan_task_cb(lv_task_t* task)
       return;
     }
   }
-
   if(sf_cardv_4G_status_get() == SF_4G_SEARCHING)
   {
     printf("[%s]Searching...\n", __FUNCTION__);
@@ -551,15 +550,17 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj)
 
 	plabel = lv_label_create(obj, NULL);
   lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK);
-  // lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER);
+  //lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER);
   lv_label_set_text(plabel, "");
-  lv_obj_set_pos(plabel, 32, 55);
+  lv_obj_set_pos(plabel, 32, 67);
   lv_obj_set_width(plabel, 256);
   lv_obj_add_style(plabel, 0, &gMatrixStylebtn);
-
+  lv_task_t tas = {0,0,NULL,NULL,0,3};
+  Countdown = 0;
+  network_scan_task_cb(&tas);
   if(network_scan_task == NULL){
     Countdown = 0;
-    network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_MID, (void*)obj);
+    network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_HIGHEST, (void*)obj);
   }
 }
 
@@ -570,7 +571,7 @@ void hidde_Network_Selection_page(void)
 
   pMenu = NULL;
 
-  if(plabel)
+  if(NULL != plabel)
   {
     lv_obj_del(plabel);
     plabel = NULL;
@@ -646,60 +647,224 @@ void Option_Network_Selection_Key(lv_obj_t* obj, uint32_t key)
 char *qr_code_str = "{\"imei\":\"%s\",\"verizonICCID\":\"%s\",\"attICCID\":\"%s\",\"isEsim\":%s}";
 static lv_obj_t *qr = NULL;
 static lv_obj_t *label = NULL;
+static lv_obj_t *labelInit = NULL;
+static lv_obj_t* QRImage = NULL;
+static lv_obj_t *qr_info_msgbox = NULL;
+static lv_task_t* qr_page_task = NULL;
+
+static void qr_page_task_cb(lv_task_t* task){
+  lv_obj_t* obj = (lv_obj_t*)task->user_data;
+  
+
+  #define QR_DATA_LENGTH 1024
+  char qr_date[QR_DATA_LENGTH] = {0};
+  //printf("[qr_page_task_cb]qr task start...\n");
+  int ret = -1;
+
+  if (NULL != qr)
+  {
+    return;
+  }
+
+  if (obj)
+  {
+    ret = sf_cardv_get_is_esim();
+    if (sf_cardv_get_sim_insert() == 0)
+    {
+      //printf("[qr_page_task_cb]no sim card...\n");
+      lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera");
+      return;
+    }/*
+    else if(sf_cardv_4G_status_get() == SF_4G_SEARCHING)
+    {
+      printf("[qr_page_task_cb][*x]loading...\n");
+      lv_label_set_text(labelInit, "\nQR code loading...");
+    }*/
+    else if (ret == 1)
+    {
+      UIMenuStoreInfo *puiPara = sf_ui_para_get();
+      printf("[qr_page_task_cb]is esim card...%s\n", puiPara->ModuleImei);
+      snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true");
+    }
+    else if (ret == 0)
+    {
+      UIMenuStoreInfo *puiPara = sf_ui_para_get();                                                                   
+      printf("[qr_page_task_cb]is sim card...%s\n", puiPara->ModuleImei);
+      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)
+      {
+        lv_label_set_text(labelInit, "\nQR code loading...");
+      }
+      else if (sf_cardv_4G_status_get() == SF_4G_FAIL)
+      {
+        lv_label_set_text(labelInit, "\nPlease restart the camera");
+      }
+      return;
+    }
+    else{
+      lv_label_set_text(labelInit, "\nPlease restart the camera");
+      return;
+    }
+        /*Create a 100x100 QR code*/
+
+    printf("[qr_page_task_cb]qr code create...\n");
+    qr = lv_qrcode_create(obj, 115, (lv_color_t) { .full = 0x02}, (lv_color_t) { .full = 0x23});//23
+    
+    lv_obj_set_pos(qr, 42, 75);
+    lv_qrcode_update(qr, qr_date, strlen(qr_date));
+
+    lv_obj_set_hidden(qr_info_msgbox, true);
+    lv_label_set_text(labelInit, "");
+
+    lv_obj_set_hidden(QRImage, false);
+
+    lv_obj_set_pos(label, 180, 80);
+    lv_obj_set_size(label, 130, 70);
+    lv_label_set_text(label, "Add Camera to Tactacam APP");
+  }
+}
+
+static void qr_page_task_end(void)
+{
+  if(NULL != qr_page_task)
+  {
+    lv_task_del(qr_page_task);
+    qr_page_task = NULL;
+  }
+}
+
 void show_qr_picture_page(lv_obj_t* obj)
 {
+  init_Matrix_style();
 	// lv_color_t colorDrak = {0};
 	// lv_color_t colorLight = {0};
-	UIMenuStoreInfo *puiPara = sf_ui_para_get();
+	
   // const char *data = "https://github.com/topics/littlevgl";
-#define QR_DATA_LENGTH 1024
-  char qr_date[QR_DATA_LENGTH] = {0};
-  if (sf_cardv_get_is_esim() == 1)
-  {
-      snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true");
-  }
-  // else if (sf_cardv_get_is_esim() == 0)
-  // {
-  //     snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidA, puiPara->SimIccidA, "false");
-  // }
-  else
-  {
-      snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidA, puiPara->SimIccidA, "false");
-  }
 
-    if(obj){
+  //text qr page
+  label = lv_label_create(obj, NULL);
+  lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
+  lv_label_set_text(label, "");
+  lv_obj_set_pos(label, 180, 70);
+  lv_obj_set_size(label, 130, 60);
 
-        /*Create a 100x100 QR code*/
+  static lv_style_t labelStyle;
-       qr = lv_qrcode_create(obj, 120, (lv_color_t) { .full = 0x02}, (lv_color_t) { .full = 0x23});
-
-        if(qr){
-            /*Set data*/
-            lv_qrcode_update(qr, qr_date, strlen(qr_date));
-            lv_obj_set_pos(qr, 32, 70);
-        }
-    }
-	lv_color_t color = {0};
-	static lv_style_t labelStyle;
 	lv_style_init(&labelStyle);
-	STYLE_COLOR_PROP(0xff, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&labelStyle, LV_STATE_DEFAULT, color);
+  lv_color_t color = {0};
-	lv_style_set_text_font(&labelStyle,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp);
+	STYLE_COLOR_PROP(0xff, 0xff, 0xff, 0xff); 
-    label = lv_label_create(obj, NULL);
+  lv_style_set_text_color(&labelStyle, LV_STATE_DEFAULT, color);
-    lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
+	lv_style_set_text_font(&labelStyle,LV_STATE_DEFAULT,&sf_ui_text_medium_18_1bpp);
-    lv_label_set_text(label, "Add Camera to Tactacam App");
-    lv_obj_set_pos(label, 180, 78);
-    lv_obj_set_size(label, 110, 63);
 	lv_obj_add_style(label, 0, &labelStyle);
+
+  //text qr msgbox
+  qr_info_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg);
+	lv_obj_set_hidden(qr_info_msgbox, false);
+	labelInit = lv_label_create(qr_info_msgbox, label_msg_scr_uiflowwrnmsg);
+  lv_obj_add_style(labelInit, 0, &gMatrixStylebtn);
+  lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER);
+	lv_obj_align(labelInit, qr_info_msgbox, LV_ALIGN_CENTER, 0, -30);
+
+  if (sf_cardv_get_sim_insert() == 0){
+    lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera");
+  }
+  else{
+    lv_label_set_text(labelInit, "\nQR code loading...");
+  }
+  
+  
+  //icon
+  QRImage = lv_img_create(obj, NULL);
+  lv_obj_set_hidden(QRImage, true);
+  lv_obj_set_click(QRImage, false);
+  lv_obj_set_drag(QRImage, false);
+  lv_obj_set_pos(QRImage, 210, 141);
+  lv_obj_set_size(QRImage, 32, 32);
+  lv_img_set_src(QRImage, &sf_qr_page);
+
+  if(NULL != qr){
+    lv_obj_set_hidden(qr, false);
+    lv_obj_set_hidden(QRImage, false);
+    lv_obj_set_pos(label, 180, 80);
+    lv_obj_set_size(label, 130, 70);
+    lv_label_set_text(label, "Add Camera to Tactacam APP");
+    lv_obj_set_hidden(qr_info_msgbox, true);
+  }
+
+  if(qr_page_task == NULL){
+    qr_page_task = lv_task_create(qr_page_task_cb, 1000, LV_TASK_PRIO_HIGHEST, (void*)obj);
+  }
 }
+
+
 void hidde_qr_picture_page(void)
 {
+  qr_page_task_end();
+  printf("[hidde_qr_picture_page]hidde qr page\n");
     if(NULL != qr)
     {
-        lv_qrcode_delete(qr);
+      //printf("[hidde_qr_picture_page]delete qr\n");
+        lv_obj_set_hidden(qr, true);
+        //lv_qrcode_delete(qr);
+        //qr = NULL;
     }
-    if(label)
+    if(NULL != label)
     {
+      //printf("[hidde_qr_picture_page]delete label\n");
         lv_obj_del(label);
+        label = NULL;
     }
+    if(NULL != labelInit)
+    {
+      //printf("[hidde_qr_picture_page]delete label msgbox\n");
+        lv_obj_del(labelInit);
+        labelInit = NULL;
+    }
+    if(NULL != QRImage)
+    {
+      //printf("[hidde_qr_picture_page]delete icon\n");
+        lv_obj_del(QRImage);
+        QRImage = NULL;
+    }
+    if(NULL != qr_info_msgbox){
+      //printf("[hidde_qr_picture_page]delete msgbox\n");
+        lv_obj_del(qr_info_msgbox);
+        qr_info_msgbox = NULL;
+    }
+    
+}
+
+void Option_qr_picture_Key(lv_obj_t* obj, uint32_t key)
+{
+  printf("[%s]key:%d\n", __FUNCTION__, key);
+
+	switch(key)
+	{
+	case LV_USER_KEY_NEXT:
+    
+    break;
+	case LV_USER_KEY_PREV:
+    
+    break;
+  case LV_USER_KEY_LEFT:
+  {
+    hidde_qr_picture_page();
+    lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0));
+    break;
+  }
+  case LV_USER_KEY_RIGHT:
+    break;
+	case LV_KEY_ENTER:
+  {
+    hidde_qr_picture_page();
+    lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0));
+		break;
+  }
+	default:
+		break;
+	}
 }
 
 // --------------------------------------------------------------------------
@@ -1019,7 +1184,7 @@ void show_Camera_Info_page(lv_obj_t* obj)
 
   init_Matrix_style();
 
-  btnm = lv_btnmatrix_create(lv_scr_act(), NULL);
+  btnm = lv_btnmatrix_create(obj, NULL);
   lv_btnmatrix_set_map(btnm, map);
   lv_obj_add_style(btnm, 0, &gMatrixStylebg);
   lv_obj_add_style(btnm, 1, &gMatrixStylebtn);
@@ -1028,7 +1193,7 @@ void show_Camera_Info_page(lv_obj_t* obj)
   lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
   lv_btnmatrix_set_focused_btn(btnm, 0);
 
-	CameraInfoImage = lv_img_create(lv_scr_act(), NULL);
+	CameraInfoImage = lv_img_create(obj, NULL);
 	lv_obj_set_hidden(CameraInfoImage, false);
 	lv_obj_set_click(CameraInfoImage, false);
 	lv_obj_set_drag(CameraInfoImage, false);

code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c

@@ -2036,7 +2036,7 @@ void sf_sample_lpa_thread(void)
 	
 	if(res)
 	{
-		sf_set_esim_card(1);
+		
 		
 		#if 1
 		SampleLPA_GetSMDPAddress();
@@ -2073,6 +2073,7 @@ void sf_sample_lpa_thread(void)
 
 		//ESIM Init finished
 		sf_set_esim_init_finish(1);
+		sf_set_esim_card(1);
 
 		char choice[SCANF_MAX_LEN];
 		choice[0]= '0';
@@ -2335,11 +2336,12 @@ void sf_sample_lpa_thread(void)
 	else
 	{
 		//not esim
-		sf_set_esim_card(0);
+		
 		
 		lpaUninitialize();
 		//ESIM Init finished
 		sf_set_esim_init_finish(1);
+		sf_set_esim_card(0);
 	}
 }
 

code/lib/include/AppControl/AppControl.h

@@ -33,6 +33,7 @@ typedef enum {
 	NVTEVT_STRG_ATTACH          = 0x11010003, //Param1=storage id, Param2=status
 	NVTEVT_STRG_CHANGE          = 0x11010004, //Param1=storage id, if insert / remove occurs, also indicate change flag
 	NVTEVT_STRG_MOUNT_OK        = 0x11010005,
+	NVTEVT_STRG_SET_ACT_DRIVE   = 0x11010006,
 	/* INSERT NEW EVENT HRER */
 	NVTEVT_STRG_EVT_END         = DEV_STRG_EVENT_BASE + 0x1000 - 1, ///< Max value = 0x11010fff
 

rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c

@@ -38,7 +38,7 @@
 #include "UIAppPhoto_Param.h"
 #include "sys_fwload.h"
 #include "../lfqueue/lfqueue.h"
-#include "sf_sd_common.h"
+
 
 #include <sys_linuxboot.h>
 #include <libfdt.h>
@@ -102,7 +102,11 @@ static lfqueue_t write_queue = {0};
 
 //local variable
 static DCF_HANDLE g_dcf_hdl = 0;
+
+#if	(FS_MULTI_STRG_FUNC)
 static DCF_HANDLE g_dcf_hdl2 = 0;
+#endif
+
 static ID MOVIEFAST_FLG_ID = 0;
 static UINT32 g_moviefast_tsk_run = 1;
 static UINT32 g_moviefast_poweroff_tsk_run = 1;
@@ -120,11 +124,6 @@ static VOS_TICK g_vprc_trigger_frm_time= 0;
 static UINT32 g_vprc_trigger_frm_count= 0;
 
 UINT32 Movie2_nextFolderID = 0, Movie2_nextFileID = 0;
-
-#if	FS_MULTI_STRG_FUNC
-CHAR	 FilePath2[NMC_TOTALFILEPATH_MAX_LEN];
-#endif
-
 //local function
 static void MovieFast_OnRecStart(void);
 static void MovieFast_OnRecStop(void);
@@ -314,7 +313,6 @@ static void MovieFast_ShutDown(void)
         fastboot_msg_en(ENABLE);
         #endif
     	sf_file_thumb_cfg_sava();
-		printf("%s %d\n", __FUNCTION__, __LINE__);
         sf_para_print();
         #if (LOGFILE_FUNC==ENABLE)
         UIMenuStoreInfo *puiPara = sf_ui_para_get();
@@ -859,6 +857,16 @@ static void MovieFast_OnRecStop(void)
 
 }
 
+static DCF_HANDLE MovieFast_Get_DCF_Handle(void)
+{
+#if	(FS_MULTI_STRG_FUNC)
+	/* check free space here */
+	return g_dcf_hdl2;
+#else
+	return g_dcf_hdl;
+#endif
+}
+
 static void MovieFast_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName)
 {
     //1. The FileID and DirID is set at booting.
@@ -866,13 +874,12 @@ static void MovieFast_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName)
     //3. If the working mode is normal and it is cyclic recording, please judge the DirID and FileID by yourself before enering next new file recording.
 	UINT32 nextFolderID = 0, nextFileID = 0;
     UINT32 max_cnt = 0;
-
-	
     if (DCF_GetDBInfo(DCF_INFO_IS_9999)) {
 		DBG_ERR("Exceed max dcf file!\r\n");
 		pFileName[0] = '\0';
 	} else {
-		DCF_GetNextID(&nextFolderID,&nextFileID);
+		DCF_HANDLE handle = MovieFast_Get_DCF_Handle();
+		DCF_GetNextIDEx(handle, &nextFolderID,&nextFileID);
         if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2)
         {
             Movie2_nextFolderID = nextFolderID;
@@ -909,23 +916,9 @@ static void MovieFast_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName)
                 }
             }
         }
-		DCF_MakeObjPath(nextFolderID, nextFileID, DCF_FILE_TYPE_MP4, pFileName);
+		DCF_MakeObjPathEx(handle, nextFolderID, nextFileID, DCF_FILE_TYPE_MP4, pFileName);
-        DCF_AddDBfile(pFileName);
+        DCF_AddDBfileEx(handle, pFileName);
         DBG_DUMP("%s added to DCF\r\n", pFileName);
-
-#if	FS_MULTI_STRG_FUNC
-		printf("%s %d\n", __FUNCTION__, __LINE__);
-        if (DCF_GetDBInfoEx(g_dcf_hdl2, DCF_INFO_IS_9999)) {
-            printf("Exceed max dcf file!\r\n");
-        }
-        else {
-            //DCF_GetNextIDEx(g_dcf_hdl2, &nextFolderID,&nextFileID);
-            DCF_MakeObjPathEx(g_dcf_hdl2, nextFolderID, nextFileID, DCF_FILE_TYPE_MP4, FilePath2);
-            DCF_AddDBfileEx(g_dcf_hdl2, FilePath2);
-            printf("%s added to DCF2\r\n", FilePath2);
-        }
-#endif
-		
         #if HUNTING_CAMERA_MCU == ENABLE
         char tmp[NMC_TOTALFILEPATH_MAX_LEN] = {'\0'};
         sprintf(tmp, "S%03ld%04ld.JPG", nextFolderID, nextFileID);
@@ -1015,14 +1008,10 @@ static void MovieFast_WriteFile_Task(void* arg)
 {
 	lfqueue_t* queue = (lfqueue_t*)arg;
 	MOVIEFAST_WRITE_QUEUE_PARAM* param;
-	INT32    rt;
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
 	fastboot_wait_done(BOOT_INIT_FILESYSOK);
     #if HUNTING_CAMERA_MCU == ENABLE
-    //if(TRUE == sf_is_card_full())
+    if(TRUE == sf_is_card_full())
-    MMC_DEV_TYPE mmc_dev = sf_rtos_mmc_check_workable_dev();
-	if(mmc_dev == MMC_DEV_NO)
     {
         DBG_ERR("ERR card full\r\n");
         //return ;
@@ -1039,71 +1028,26 @@ static void MovieFast_WriteFile_Task(void* arg)
 		if(param->va){
 			DBG_DUMP("Write %s\n", param->path);
             #if HUNTING_CAMERA_MCU == ENABLE
-            //if(TRUE != sf_is_card_full())
+            if(TRUE != sf_is_card_full())
-            if(mmc_dev == MMC_DEV_SD)
             #endif
             {
                 FST_FILE fp = FileSys_OpenFile(param->path, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
                 FileSys_WriteFile(fp, (UINT8*)param->va, &param->size, 0, NULL);
                 FileSys_CloseFile(fp);
             }
-#if	FS_MULTI_STRG_FUNC
+
-		 if(mmc_dev == MMC_DEV_EMMC)
-		 {
-			DBG_WRN("write %s\n", FilePath2);
-			FST_FILE fp = FileSys_OpenFile(FilePath2, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
-			if ((fp != NULL)) {
-				rt = FileSys_WriteFile(fp, (UINT8*)param->va, &param->size, 0, NULL);
-		        //FileSys_FlushFile(fp);
-				FileSys_CloseFile(fp);
-				if (rt == FST_STA_OK) {
-				// DCF_AddDBfile(FilePath);
-				// DBG_DUMP("%s added to DCF\r\n", FilePath);
-				} else {
-					DBG_ERR("Addr=0x%x,Size=0x%x\r\n", (UINT8*)param->va, &param->size);
-				}
-			}
-			else {
-				DBG_ERR("FileSys_OpenFile fail\r\n");
-			}
-		 }
-#endif
 			free(param->va);
 		}
 		else if(param->frame.phy_addr[0]){
 			DBG_DUMP("Write %s\n", param->path);
             #if HUNTING_CAMERA_MCU == ENABLE
-            //if(TRUE != sf_is_card_full())
+            if(TRUE != sf_is_card_full())
-            if(mmc_dev == MMC_DEV_SD)
             #endif
             {
                 FST_FILE fp = FileSys_OpenFile(param->path, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
                 FileSys_WriteFile(fp, (UINT8*)param->frame.phy_addr[0], &param->size, 0, NULL);
                 FileSys_CloseFile(fp);
             }
-
-#if	FS_MULTI_STRG_FUNC
-			if(mmc_dev == MMC_DEV_EMMC)
-			{
-				DBG_WRN("write %s\n", FilePath2);
-				FST_FILE fp = FileSys_OpenFile(FilePath2, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
-				if ((fp != NULL)) {
-					rt = FileSys_WriteFile(fp, (UINT8*)param->frame.phy_addr[0], &param->size, 0, NULL);
-			        //FileSys_FlushFile(fp);
-					FileSys_CloseFile(fp);
-					if (rt == FST_STA_OK) {
-					// DCF_AddDBfile(FilePath);
-					// DBG_DUMP("%s added to DCF\r\n", FilePath);
-					} else {
-						DBG_ERR("Addr=0x%x,Size=0x%x\r\n", (UINT8*)param->frame.phy_addr[0], &param->size);
-					}
-				}
-				else {
-					DBG_ERR("FileSys_OpenFile fail\r\n");
-				}
-			}
-
-#endif
 			hd_videoproc_release_out_buf(param->vprc_path_id, &param->frame);
 		}
 
@@ -1284,17 +1228,12 @@ THREAD_RETTYPE MovieFast_InitFileNamingThread(void *arg)
 			}
 
 
-			printf("DCF_ScanObjEx emmc handle=%d\n", g_dcf_hdl2);
+			DBG_WRN("DCF_ScanObjEx emmc handle=%d\n", g_dcf_hdl2);
-	//		DCF_SetParm(DCF_PRMID_REMOVE_DUPLICATE_FOLDER, TRUE);
-	//		DCF_SetParm(DCF_PRMID_REMOVE_DUPLICATE_FILE, TRUE);
-	//		DCF_SetParm(DCF_PRMID_SET_VALID_FILE_FMT, DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_MP4|DCF_FILE_TYPE_MOV);
-	//		DCF_SetParm(DCF_PRMID_SET_DEP_FILE_FMT, DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_WAV|DCF_FILE_TYPE_MPO);
-	//		DCF_SetDirFreeChars(DCF_DIR_NAME);
-	//		DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, DCF_FILE_NAME);
 			DCF_ScanObjEx(g_dcf_hdl2);
 		}
 #endif
-		
+
+
         #if HUNTING_CAMERA_MCU == ENABLE
         if(TRUE != sf_is_card_full())
         #endif
@@ -1991,12 +1930,11 @@ static void MovieFast_Close(void)
 EXIT:
 
 	DCF_Close(g_dcf_hdl);
-	g_dcf_hdl = -1;
 
 #if	(FS_MULTI_STRG_FUNC)
 	DCF_Close(g_dcf_hdl2);
-	g_dcf_hdl2 = -1;
 #endif
+
 	DCF_UnInstallID();
 
 	vos_flag_destroy(MOVIEFAST_FLG_ID);

rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c

@@ -41,8 +41,6 @@
 #if HUNTING_CAMERA_MCU == ENABLE
 #include <sf_mcu.h>
 #include "sf_led.h"
-#include "sf_sd_common.h"
-
 #endif
 
 #if POWERON_FAST_SLICE_ENC == ENABLE
@@ -90,7 +88,11 @@ static CHAR                g_photo_fast_write_file_Path[NMC_TOTALFILEPATH_MAX_LE
 static INT32               g_photo_fast_id_mapping[PHOTO_CAP_ID_MAX]             = {-1,-1};
 static PHOTO_FILENAME_CB   *g_fpPhotoFastFileNameCB = NULL;
 static DCF_HANDLE g_dcf_hdl = 0;
+
+#if	(FS_MULTI_STRG_FUNC)
 static DCF_HANDLE g_dcf_hdl2 = 0;
+#endif
+
 static HD_PATH_ID      g_video_enc_path[PHOTO_ENC_JPG_TYPE_MAX_ID] = {0};
 static UINT32          g_bVideoEncPathStart[PHOTO_ENC_JPG_TYPE_MAX_ID] = {0};
 static HD_VIDEOENC_BUFINFO g_enc_buf_info[PHOTO_ENC_JPG_TYPE_MAX_ID] = {0};
@@ -739,12 +741,6 @@ INT32 PhotoFast_FileNaming_Open(void)
 
 
 		DBG_WRN("DCF_ScanObjEx emmc handle=%d\n", g_dcf_hdl2);
-//		DCF_SetParm(DCF_PRMID_REMOVE_DUPLICATE_FOLDER, TRUE);
-//		DCF_SetParm(DCF_PRMID_REMOVE_DUPLICATE_FILE, TRUE);
-//		DCF_SetParm(DCF_PRMID_SET_VALID_FILE_FMT, DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_MP4|DCF_FILE_TYPE_MOV);
-//		DCF_SetParm(DCF_PRMID_SET_DEP_FILE_FMT, DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_WAV|DCF_FILE_TYPE_MPO);
-//		DCF_SetDirFreeChars(DCF_DIR_NAME);
-//		DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, DCF_FILE_NAME);
 		DCF_ScanObjEx(g_dcf_hdl2);
 	}
 #endif
@@ -763,8 +759,10 @@ INT32 PhotoFast_FileNaming_Close(void)
 		}
 
 #if	(FS_MULTI_STRG_FUNC)
-		DCF_Close(g_dcf_hdl2);
+		if(g_dcf_hdl2 >= 0){
-		g_dcf_hdl2 = -1;
+			DCF_Close(g_dcf_hdl2);
+			g_dcf_hdl2 = -1;
+		}
 #endif
 
 		DCF_UnInstallID();
@@ -883,23 +881,29 @@ void PhotoFast_FileNaming_SetSortBySN(CHAR *pDelimStr, UINT32 nDelimCount, UINT3
         DBG_ERR("No set Delim String!!\r\n");
 }
 
+DCF_HANDLE PhotoFast_Get_DCF_Handle()
+{
+#if	(FS_MULTI_STRG_FUNC)
+	/* check free space here */
+	return g_dcf_hdl2;
+#else
+	return g_dcf_hdl;
+#endif
+}
+
 INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId, char* Path)
 {
 	FST_FILE fp;
-	INT32    rt = 0;
+	INT32    rt;
 	UINT32   Length;
 	CHAR     FilePath[NMC_TOTALFILEPATH_MAX_LEN];
-
-#if	FS_MULTI_STRG_FUNC
-	CHAR     FilePath2[NMC_TOTALFILEPATH_MAX_LEN];
-#endif
-
 	UINT32   fileType;
 	UINT32   open_flag;
-	UINT32 nextFolderID = 0, nextFileID = 0;
+	UINT32   nextFolderID = 0, nextFileID = 0;
+	DCF_HANDLE handle = PhotoFast_Get_DCF_Handle(); /* handle determines which storage would be written */
 
 	if(Path == NULL){
-        if (DCF_GetDBInfo(DCF_INFO_IS_9999)) {
+        if (DCF_GetDBInfoEx(handle, DCF_INFO_IS_9999)) {
             DBG_ERR("Exceed max dcf file!\r\n");
             return FST_STA_NOFREE_SPACE;
         }
@@ -910,7 +914,7 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
             else{
                 fileType = DCF_FILE_TYPE_JPG;
             }
-            DCF_GetNextID(&nextFolderID,&nextFileID);
+            DCF_GetNextIDEx(handle, &nextFolderID,&nextFileID);
             if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2)
             {
                 nextFolderID = Movie2_nextFolderID;
@@ -935,12 +939,12 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
                     }
                 }
             }
-            DCF_MakeObjPath(nextFolderID, nextFileID, fileType, FilePath);
+            DCF_MakeObjPathEx(handle, nextFolderID, nextFileID, fileType, FilePath);
-            DCF_AddDBfile(FilePath);
+            DCF_AddDBfileEx(handle, FilePath);
             DBG_DUMP("%s added to DCF\r\n", FilePath);
             }
 
-#if FS_MULTI_STRG_FUNC
+#if	0//FS_MULTI_STRG_FUNC
 
         if (DCF_GetDBInfoEx(g_dcf_hdl2, DCF_INFO_IS_9999)) {
             DBG_ERR("Exceed max dcf file!\r\n");
@@ -975,9 +979,7 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
     //sprintf(tmp, "W%03ld%04ld.JPG", nextFolderID, nextFileID);
 	strncpy(g_photo_fast_write_file_Path, tmp, sizeof(g_photo_fast_write_file_Path) - 1);
 	DBG_IND("last send file:%s\r\n", tmp);
-    //if(TRUE == sf_is_card_full())
+    if(TRUE == sf_is_card_full())
-    MMC_DEV_TYPE mmc_dev = sf_rtos_mmc_check_workable_dev();
-	if(mmc_dev == MMC_DEV_NO)
     {
         DBG_ERR("ERR Addr=0x%x,Size=0x%x,Fmt=%d card full\r\n", Addr, Size, Fmt);
         rt =FST_STA_ERROR;
@@ -992,9 +994,7 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
 
 	open_flag = FST_CREATE_ALWAYS | FST_OPEN_WRITE;
 
-	if(mmc_dev == MMC_DEV_SD)
+	if ((fp = FileSys_OpenFile(FilePath, open_flag)) != NULL) {
-	{
-		if ((fp = FileSys_OpenFile(FilePath, open_flag)) != NULL) {
 		Length = Size;
 
 		rt = FileSys_WriteFile(fp, (UINT8 *)Addr, &Length, 0, NULL);
@@ -1006,34 +1006,10 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
 		} else {
 			DBG_ERR("Addr=0x%x,Size=0x%x,Fmt=%d\r\n", Addr, Size, Fmt);
 		}
-		}else{
+	}else{
-			DBG_ERR("FileSys_OpenFile fail\r\n");
+		DBG_ERR("FileSys_OpenFile fail\r\n");
-			rt =FST_STA_ERROR;
+		rt =FST_STA_ERROR;
-		}
 	}
-#if	FS_MULTI_STRG_FUNC
-	if(mmc_dev == MMC_DEV_EMMC)
-	{
-		DBG_WRN("write %s\n", FilePath2);
-		if ((fp = FileSys_OpenFile(FilePath2, open_flag)) != NULL) {
-			Length = Size;
-
-			rt = FileSys_WriteFile(fp, (UINT8 *)Addr, &Length, 0, NULL);
-	        FileSys_FlushFile(fp);
-			FileSys_CloseFile(fp);
-			if (rt == FST_STA_OK) {
-			// DCF_AddDBfile(FilePath);
-			// DBG_DUMP("%s added to DCF\r\n", FilePath);
-			} else {
-				DBG_ERR("Addr=0x%x,Size=0x%x,Fmt=%d\r\n", Addr, Size, Fmt);
-			}
-		}else{
-			DBG_ERR("FileSys_OpenFile fail\r\n");
-			rt =FST_STA_ERROR;
-		}
-	}
-
-#endif
 	return rt;
 }
 

rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.h

@@ -4,6 +4,7 @@
 #include "hd_common.h"
 #include "UIAppPhoto.h"
 #include <vf_gfx.h>
+#include "DCF.h"
 
 #define FLGPHOTOFAST_CHGMODE       0x00000001
 #define FLGPHOTOFAST_SHUTDOWN      0x00000002
@@ -62,5 +63,6 @@ extern BOOL PhotoFast_SetTriggerFrmCnt(UINT32 cnt); /* trigger vcap frame count
 UINT32 PhotoFast_GetTriggerFrmCnt(VOID);
 extern UINT32 PhotoFast_GetTickBufSize(void);
 ER PhotoFast_Movie_Init(void);
+DCF_HANDLE PhotoFast_Get_DCF_Handle(void);
 
 #endif //_UIAPP_PHOTO_H_

rtos/code/application/source/cardv/SrcCode/UIApp/UsbDisk/UIAppUsbDisk_Exe.c

@@ -153,10 +153,10 @@ ER AppInit_ModeUSBMSDC(void)
 	MSDCInfo.msdc_vendor_cb = NULL;
 	//#NT#2016/12/20#Niven Cho -begin
 	//#NT#MULTI_DRIVE
-// #if (FS_MULTI_STRG_FUNC == ENABLE)
+//#if (FS_MULTI_STRG_FUNC == ENABLE)
-// 	char *pDxName2 = NULL;
+//	char *pDxName2 = NULL;
-// 	DX_HANDLE pStrgDev2 = 0;
+//	DX_HANDLE pStrgDev2 = 0;
-// #endif
+//#endif
 
 	pStrgDev = Dx_GetObject(DX_CLASS_STORAGE_EXT | FS_DX_TYPE_DRIVE_A);