From bc7c1c583fbde3ddd3188d6f3f2ab8eed2b73607 Mon Sep 17 00:00:00 2001
From: xiaojiazhu <xiaojiazhu@willfine.com>
Date: Mon, 4 Dec 2023 16:14:25 +0800
Subject: [PATCH] Improve network select fuciton.

---
 .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c              | 8 ++++----
 code/application/source/sf_app/code/include/sf_4g_lpa.h   | 2 +-
 .../source/sf_app/code/source/4gMng/sf_4g_lpa.c           | 4 ++--
 .../source/sf_app/code/source/app/sf_service.c            | 4 ++++
 code/lib/source/sifar/code/include/sf_common.h            | 2 +-
 code/lib/source/sifar/code/source/common/sf_common.c      | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
index 3d196089a..a288e4fe7 100644
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
@@ -407,15 +407,15 @@ static void network_scan_task_cb(lv_task_t* task)
     return;
   }
 
-  if(sf_cardv_get_sim_insert() == 0)
+  if(sf_cardv_get_is_esim() == 0)
   {
-    lv_label_set_text(plabel, "\n\nCheck SIM");
+    lv_label_set_text(plabel, "\nNetwork selection is only available with SIM cards that have multiple networks.");
     Countdown = 3;
     return;
   }
-  else if(sf_cardv_get_is_esim() == 0)
+  else if(sf_cardv_get_sim_insert() == 0)
   {
-    lv_label_set_text(plabel, "\n\nNetwork selection is only available with SIM cards that have multiple networks.");
+    lv_label_set_text(plabel, "\n\nCheck SIM");
     Countdown = 3;
     return;
   }
diff --git a/code/application/source/sf_app/code/include/sf_4g_lpa.h b/code/application/source/sf_app/code/include/sf_4g_lpa.h
index 3a3e7151a..85c05dacc 100755
--- a/code/application/source/sf_app/code/include/sf_4g_lpa.h
+++ b/code/application/source/sf_app/code/include/sf_4g_lpa.h
@@ -74,7 +74,7 @@ UINT8 sf_get_wifi_cmd(void);
 void sf_network_select(UINT8 profileId, UINT8 ctlType); //SF_CONTROL_TYPE_e ctlType
 void sf_4g_operator_scan(UINT8 mode, UINT8 ctlType); //SF_CONTROL_TYPE_e ctlType
 SINT32 sf_lpa_get_esim_iccid(SF_CHAR iccid[][22]);
-
+void sf_set_esim_card(INT8 flag);
 
 
 
diff --git a/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c b/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c
index 5651bb3f9..17e9750fb 100755
--- a/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c
+++ b/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c
@@ -1913,8 +1913,8 @@ SINT32 sf_lpa_get_download_profile_iccid(SINT8* iccid)
 
 
 
-static UINT8 g_esim_flag=0; //adjust insert esim or not
-void sf_set_esim_card(UINT8 flag)
+static INT8 g_esim_flag=-1; //adjust insert esim or not
+void sf_set_esim_card(INT8 flag)
 {
 	if(g_esim_flag != flag)
 	{
diff --git a/code/application/source/sf_app/code/source/app/sf_service.c b/code/application/source/sf_app/code/source/app/sf_service.c
index 01c33ba62..d4f4d9763 100755
--- a/code/application/source/sf_app/code/source/app/sf_service.c
+++ b/code/application/source/sf_app/code/source/app/sf_service.c
@@ -1449,6 +1449,10 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
 #endif
 
 	s32ret = sf_4G_sim_init(pfnParam);
+  // if (SF_SUCCESS != s32ret)
+  // {
+	// 	sf_set_esim_card(0);
+  // }
 	SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
 	SLOGD("\n");		
 #if 1
diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h
index b5f570747..eeb7cfb90 100755
--- a/code/lib/source/sifar/code/include/sf_common.h
+++ b/code/lib/source/sifar/code/include/sf_common.h
@@ -119,7 +119,7 @@ UINT8 sf_cardv_4G_status_get(void);
 void sf_cardv_set_sim_insert(INT8 sim);
 INT8 sf_cardv_get_sim_insert(void);
 void sf_cardv_set_is_esim(int flag);
-UINT8 sf_cardv_get_is_esim(void);
+INT8 sf_cardv_get_is_esim(void);
 void sf_cardv_set_operationSelectResp(UINT8 resp);
 UINT8 sf_cardv_get_operationSelectResp(void);
 void sf_set_send_statu(BOOL is);
diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c
index 6b5ea124b..e69ec42b4 100755
--- a/code/lib/source/sifar/code/source/common/sf_common.c
+++ b/code/lib/source/sifar/code/source/common/sf_common.c
@@ -72,7 +72,7 @@ static unsigned int KeepAliveTime_s = DEFAULT_GO_TO_WORK_MODE_TIME_S;
 BOOL isGoing2Pir = FALSE;
 static UINT8 NetWorkFlag = 0;           //SF_4G_STATUS_E
 static INT8 simCardInsert = -1;
-static int g_esim_flag = 0;
+static int g_esim_flag = -1;
 static UINT8 operationSelectResp = 0;   //WIFICameraErrCode_t
 UINT8 RtspFlag = 0;
 static BOOL IsMenu = FALSE;
@@ -2580,7 +2580,7 @@ void sf_cardv_set_is_esim(int flag)
     printf("cardv g_esim_flag:%d\n",g_esim_flag);
 }
 
-UINT8 sf_cardv_get_is_esim(void)
+INT8 sf_cardv_get_is_esim(void)
 {
     return g_esim_flag;
 }