Gui Megre emmc branch.
This commit is contained in:
parent
b0325af260
commit
787ee85bbd
|
@ -642,6 +642,14 @@ static void update_gps_status(void)
|
||||||
sf_show_send_text(UIFlowPhoto, FILE_SENDING_GUI_START_SENDING);
|
sf_show_send_text(UIFlowPhoto, FILE_SENDING_GUI_START_SENDING);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (FTP_CONNECTING_FTP_CONNECTING == sf_cardv_get_ftp_status())
|
||||||
|
{
|
||||||
|
sf_show_send_text(UIFlowPhoto, FTP_CONNECTING_FTP_CONNECTING);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (FTP_CONNECTING_END != sf_cardv_get_ftp_status()) {
|
||||||
|
sf_show_send_text(UIFlowPhoto, sf_cardv_get_ftp_status());
|
||||||
|
}
|
||||||
SF_GPS_STATUS_E status = sf_cardv_get_gps_status();
|
SF_GPS_STATUS_E status = sf_cardv_get_gps_status();
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
|
@ -1764,6 +1772,19 @@ static void sf_show_send_text(lv_obj_t* obj, const unsigned short status)
|
||||||
SendMsgShow = SENDING_KEEP_SHOW_TIME_S;
|
SendMsgShow = SENDING_KEEP_SHOW_TIME_S;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case FTP_CONNECTING_FTP_CONNECTING:
|
||||||
|
{
|
||||||
|
lv_obj_set_hidden(label_sim_scr_uiflowphoto, false);
|
||||||
|
lv_label_set_text(label_sim_scr_uiflowphoto, "Connecting ... ");
|
||||||
|
SendMsgShow = SENDING_KEEP_SHOW;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case FTP_CONNECTING_FTP_CONNECT_SUCCESSFUL:
|
||||||
|
case FTP_CONNECTING_FTP_CONNECT_FAILED:
|
||||||
|
{
|
||||||
|
SendMsgShow = SENDING_NOT_SHOW;
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -362,6 +362,10 @@ void sf_set_sim_insert(INT32 sim);
|
||||||
#define GPS_SEARCHING_SUCCESSFUL 2
|
#define GPS_SEARCHING_SUCCESSFUL 2
|
||||||
#define GPS_SEARCHING_FAILED 3
|
#define GPS_SEARCHING_FAILED 3
|
||||||
void sf_set_gps_status(const short status);
|
void sf_set_gps_status(const short status);
|
||||||
|
#define FTP_CONNECTING 4
|
||||||
|
#define FTP_CONNECT_SUCCESSFUL 5
|
||||||
|
#define FTP_CONNECT_FAILED 6
|
||||||
|
void sf_set_ftp_status(const short status);
|
||||||
void sf_set_usb_init(int flag);
|
void sf_set_usb_init(int flag);
|
||||||
UINT32 sf_get_sim_insert(void);
|
UINT32 sf_get_sim_insert(void);
|
||||||
int sf_get_signal_ready(void);
|
int sf_get_signal_ready(void);
|
||||||
|
|
|
@ -487,6 +487,7 @@ typedef enum sf_PARA_MESSAGE_TYPE_E
|
||||||
SF_PARA_CMD_ISESIM = 0x1F07,
|
SF_PARA_CMD_ISESIM = 0x1F07,
|
||||||
SF_PARA_CMD_USB_INIT = 0x1F08,
|
SF_PARA_CMD_USB_INIT = 0x1F08,
|
||||||
SF_PARA_CMD_GPS_STATUS = 0X1F09,
|
SF_PARA_CMD_GPS_STATUS = 0X1F09,
|
||||||
|
SF_PARA_CMD_FTP_CONNECT_STATUS= 0X1F0A,
|
||||||
}SF_PARA_MESSAGE_TYPE_E;
|
}SF_PARA_MESSAGE_TYPE_E;
|
||||||
|
|
||||||
typedef enum sf_WIFI_MESSAGE_TYPE_E
|
typedef enum sf_WIFI_MESSAGE_TYPE_E
|
||||||
|
|
|
@ -1415,6 +1415,7 @@ SINT32 sf_4g_module_ota_ftp(void)
|
||||||
*************************************************/
|
*************************************************/
|
||||||
SINT32 sf_connect_ftps_server(void)
|
SINT32 sf_connect_ftps_server(void)
|
||||||
{
|
{
|
||||||
|
sf_set_ftp_status(FTP_CONNECTING);
|
||||||
SINT32 ret = SF_SUCCESS;//0:success; else:fail;
|
SINT32 ret = SF_SUCCESS;//0:success; else:fail;
|
||||||
UINT8 ssl = 0;
|
UINT8 ssl = 0;
|
||||||
UINT8 gprsMode = 0;
|
UINT8 gprsMode = 0;
|
||||||
|
@ -1441,8 +1442,13 @@ SINT32 sf_connect_ftps_server(void)
|
||||||
if(FTP_MANAGER_SERVICE_AVAILABLE == result)
|
if(FTP_MANAGER_SERVICE_AVAILABLE == result)
|
||||||
{
|
{
|
||||||
FtpOpenOk = SUCCESS;
|
FtpOpenOk = SUCCESS;
|
||||||
|
sf_set_ftp_status(FTP_CONNECT_SUCCESSFUL);
|
||||||
}
|
}
|
||||||
//ret = sf_ftp_stop(ssl, gprsMode);
|
else
|
||||||
|
{
|
||||||
|
sf_set_ftp_status(FTP_CONNECT_FAILED);
|
||||||
|
}
|
||||||
|
ret = sf_ftp_stop(ssl, gprsMode);
|
||||||
|
|
||||||
//SF_FTP_CONNECT_END:
|
//SF_FTP_CONNECT_END:
|
||||||
//printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret);
|
//printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret);
|
||||||
|
|
|
@ -1256,6 +1256,14 @@ void sf_set_gps_status(const short status)
|
||||||
stMessageBuf.cmdId = CMD_PARA;
|
stMessageBuf.cmdId = CMD_PARA;
|
||||||
sf_com_message_send_to_cardv(&stMessageBuf);
|
sf_com_message_send_to_cardv(&stMessageBuf);
|
||||||
}
|
}
|
||||||
|
void sf_set_ftp_status(const short status)
|
||||||
|
{
|
||||||
|
SF_MESSAGE_BUF_S stMessageBuf = {0};
|
||||||
|
stMessageBuf.arg2 = status;
|
||||||
|
stMessageBuf.arg1 = SF_PARA_CMD_FTP_CONNECT_STATUS;
|
||||||
|
stMessageBuf.cmdId = CMD_PARA;
|
||||||
|
sf_com_message_send_to_cardv(&stMessageBuf);
|
||||||
|
}
|
||||||
void sf_set_usb_init(int flag)
|
void sf_set_usb_init(int flag)
|
||||||
{
|
{
|
||||||
SF_MESSAGE_BUF_S stMessageBuf = {0};
|
SF_MESSAGE_BUF_S stMessageBuf = {0};
|
||||||
|
|
|
@ -40,6 +40,12 @@ typedef enum{
|
||||||
FILE_SENDING_GUI_SEND_FAILED,
|
FILE_SENDING_GUI_SEND_FAILED,
|
||||||
FILE_SENDING_GUI_END
|
FILE_SENDING_GUI_END
|
||||||
} FILE_SENDING_GUI_E;
|
} FILE_SENDING_GUI_E;
|
||||||
|
typedef enum{
|
||||||
|
FTP_CONNECTING_FTP_CONNECTING = FILE_SENDING_GUI_END,
|
||||||
|
FTP_CONNECTING_FTP_CONNECT_SUCCESSFUL,
|
||||||
|
FTP_CONNECTING_FTP_CONNECT_FAILED,
|
||||||
|
FTP_CONNECTING_END
|
||||||
|
} FTP_CONNECTING_E;
|
||||||
#define DEFAULT_GO_TO_WORK_MODE_TIME_S 85
|
#define DEFAULT_GO_TO_WORK_MODE_TIME_S 85
|
||||||
#define PASSWORD_SCREEN_GO_TO_WORK_MODE_TIME_S 61
|
#define PASSWORD_SCREEN_GO_TO_WORK_MODE_TIME_S 61
|
||||||
#define MENU_SCREEN_GO_TO_WORK_MODE_TIME_S 60
|
#define MENU_SCREEN_GO_TO_WORK_MODE_TIME_S 60
|
||||||
|
@ -126,6 +132,8 @@ BOOL sf_is_preview(void);
|
||||||
short sf_cardv_get_cq_signal(void);
|
short sf_cardv_get_cq_signal(void);
|
||||||
void sf_cardv_set_gps_status(const SF_GPS_STATUS_E status);
|
void sf_cardv_set_gps_status(const SF_GPS_STATUS_E status);
|
||||||
const SF_GPS_STATUS_E sf_cardv_get_gps_status(void);
|
const SF_GPS_STATUS_E sf_cardv_get_gps_status(void);
|
||||||
|
void sf_cardv_set_ftp_status(const FTP_CONNECTING_E status);
|
||||||
|
const FTP_CONNECTING_E sf_cardv_get_ftp_status(void);
|
||||||
void sf_cardv_4G_status_set(UINT8 status);
|
void sf_cardv_4G_status_set(UINT8 status);
|
||||||
UINT8 sf_cardv_4G_status_get(void);
|
UINT8 sf_cardv_4G_status_get(void);
|
||||||
void sf_cardv_set_sim_insert(INT8 sim);
|
void sf_cardv_set_sim_insert(INT8 sim);
|
||||||
|
|
|
@ -100,6 +100,7 @@ static UINT8 UiparaFlag = 0;
|
||||||
static SF_BLE_STATUS_E BleStatus = SF_BLE_OK;
|
static SF_BLE_STATUS_E BleStatus = SF_BLE_OK;
|
||||||
static UINT8 McuUpdateFlag = 0;
|
static UINT8 McuUpdateFlag = 0;
|
||||||
static SF_GPS_STATUS_E gGpsSearching = SF_GPS_SEARCHING_UNKNOW;
|
static SF_GPS_STATUS_E gGpsSearching = SF_GPS_SEARCHING_UNKNOW;
|
||||||
|
static FTP_CONNECTING_E gFtpConnectingStatus = FTP_CONNECTING_END;
|
||||||
static char CamMode = 0;
|
static char CamMode = 0;
|
||||||
static CHAR netGeneration = SF_NET_NO;
|
static CHAR netGeneration = SF_NET_NO;
|
||||||
static SF_THREAD_S UpgradeTskParam =
|
static SF_THREAD_S UpgradeTskParam =
|
||||||
|
@ -1542,6 +1543,15 @@ const SF_GPS_STATUS_E sf_cardv_get_gps_status(void)
|
||||||
{
|
{
|
||||||
return gGpsSearching;
|
return gGpsSearching;
|
||||||
}
|
}
|
||||||
|
void sf_cardv_set_ftp_status(const FTP_CONNECTING_E status)
|
||||||
|
{
|
||||||
|
printf("sf_cardv_set_ftp_status = %d\n", status);
|
||||||
|
gFtpConnectingStatus = status;
|
||||||
|
}
|
||||||
|
const FTP_CONNECTING_E sf_cardv_get_ftp_status(void)
|
||||||
|
{
|
||||||
|
return gFtpConnectingStatus;
|
||||||
|
}
|
||||||
|
|
||||||
/*************************************************
|
/*************************************************
|
||||||
Function: sf_cardv_adc_value_get
|
Function: sf_cardv_adc_value_get
|
||||||
|
@ -1784,6 +1794,9 @@ static SINT32 sf_cardv_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf)
|
||||||
break;
|
break;
|
||||||
case SF_PARA_CMD_GPS_STATUS:
|
case SF_PARA_CMD_GPS_STATUS:
|
||||||
sf_cardv_set_gps_status(pMessageBuf->arg2);
|
sf_cardv_set_gps_status(pMessageBuf->arg2);
|
||||||
|
break;
|
||||||
|
case SF_PARA_CMD_FTP_CONNECT_STATUS:
|
||||||
|
sf_cardv_set_ftp_status(pMessageBuf->arg2);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user