payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve network select fuciton.

Browse Source
This commit is contained in:
xiaojiazhu 2023-12-04 16:14:25 +08:00
parent 59dcff9209
commit bc7c1c583f
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,15 +407,15 @@ static void network_scan_task_cb(lv_task_t* task)
return; 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; Countdown = 3;
return; 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; Countdown = 3;
return; return;
} }

2
code/application/source/sf_app/code/include/sf_4g_lpa.h
View File

@ -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_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 void sf_4g_operator_scan(UINT8 mode, UINT8 ctlType); //SF_CONTROL_TYPE_e ctlType
SINT32 sf_lpa_get_esim_iccid(SF_CHAR iccid[][22]); SINT32 sf_lpa_get_esim_iccid(SF_CHAR iccid[][22]);
void sf_set_esim_card(INT8 flag);

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

@ -1913,8 +1913,8 @@ SINT32 sf_lpa_get_download_profile_iccid(SINT8* iccid)
static UINT8 g_esim_flag=0; //adjust insert esim or not static INT8 g_esim_flag=-1; //adjust insert esim or not
void sf_set_esim_card(UINT8 flag) void sf_set_esim_card(INT8 flag)
{ {
if(g_esim_flag != flag) if(g_esim_flag != flag)
{ {

4
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -1449,6 +1449,10 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
#endif #endif
s32ret = sf_4G_sim_init(pfnParam); s32ret = sf_4G_sim_init(pfnParam);
// if (SF_SUCCESS != s32ret)
// {
// sf_set_esim_card(0);
// }
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
SLOGD("\n"); SLOGD("\n");
#if 1 #if 1

2
code/lib/source/sifar/code/include/sf_common.h
View File

@ -119,7 +119,7 @@ UINT8 sf_cardv_4G_status_get(void);
void sf_cardv_set_sim_insert(INT8 sim); void sf_cardv_set_sim_insert(INT8 sim);
INT8 sf_cardv_get_sim_insert(void); INT8 sf_cardv_get_sim_insert(void);
void sf_cardv_set_is_esim(int flag); 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); void sf_cardv_set_operationSelectResp(UINT8 resp);
UINT8 sf_cardv_get_operationSelectResp(void); UINT8 sf_cardv_get_operationSelectResp(void);
void sf_set_send_statu(BOOL is); void sf_set_send_statu(BOOL is);

4
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -72,7 +72,7 @@ static unsigned int KeepAliveTime_s = DEFAULT_GO_TO_WORK_MODE_TIME_S;
BOOL isGoing2Pir = FALSE; BOOL isGoing2Pir = FALSE;
static UINT8 NetWorkFlag = 0; //SF_4G_STATUS_E static UINT8 NetWorkFlag = 0; //SF_4G_STATUS_E
static INT8 simCardInsert = -1; static INT8 simCardInsert = -1;
static int g_esim_flag = 0; static int g_esim_flag = -1;
static UINT8 operationSelectResp = 0; //WIFICameraErrCode_t static UINT8 operationSelectResp = 0; //WIFICameraErrCode_t
UINT8 RtspFlag = 0; UINT8 RtspFlag = 0;
static BOOL IsMenu = FALSE; 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); 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; return g_esim_flag;
} }