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

1.wifi链接后退出到预览界面

Browse Source
This commit is contained in:
payton 2023-11-27 16:51:05 +08:00
parent ee09338f59
commit 43ed123735
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -944,5 +944,5 @@ void sf_wifi_app_start(void);
UINT8 sf_wifi_server_stop_shoot_respond(UINT8 errCode); UINT8 sf_wifi_server_stop_shoot_respond(UINT8 errCode);
void sf_apinfo_thread_init(void); void sf_apinfo_thread_init(void);
void sf_wifi_set_cam_mode(void);
#endif /*__SF_WIFI_SERVER__*/ #endif /*__SF_WIFI_SERVER__*/

5
code/application/source/sf_app/code/source/wifi/sf_getapinfo.c
View File

@ -302,7 +302,7 @@ static int print_event(struct nl_msg *msg, void *arg)
switch (gnlh->cmd) { switch (gnlh->cmd) {
case NL80211_CMD_NEW_STATION: case NL80211_CMD_NEW_STATION:
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
MLOGI("new station %s\n", macbuf); MLOGI("new station %s connectNum:%d\n", macbuf,connectNum);
connectNum++; connectNum++;
if(connectNum == 1) if(connectNum == 1)
{ {
@ -310,11 +310,12 @@ static int print_event(struct nl_msg *msg, void *arg)
sf_sys_status_led_set(SF_LED_SYS_STATE_WIFI_CONNECTED); sf_sys_status_led_set(SF_LED_SYS_STATE_WIFI_CONNECTED);
//sf_app_msg_data_snd(SY_MSG_WIFI_CONNECT,(unsigned char*)NULL); //sf_app_msg_data_snd(SY_MSG_WIFI_CONNECT,(unsigned char*)NULL);
} }
sf_wifi_set_cam_mode();
break; break;
case NL80211_CMD_DEL_STATION: case NL80211_CMD_DEL_STATION:
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
MLOGI("del station %s\n", macbuf); MLOGI("del station %s connectNum:%d\n", macbuf, connectNum);
connectNum--; connectNum--;
if(connectNum < 0) if(connectNum < 0)
connectNum = 0; connectNum = 0;

25
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -263,6 +263,31 @@ void sf_set_wifi_status(SF_WIFI_STATUS_E enStatus)
} }
void sf_wifi_set_cam_mode(void)
{
int iCurrMode = System_GetState(SYS_STATE_CURRMODE);
int iNextMode = PRIMARY_MODE_PHOTO;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
{
iNextMode = PRIMARY_MODE_PHOTO;
}
else if(puiPara->CamMode == SF_CAM_MODE_VIDEO)
{
iNextMode = PRIMARY_MODE_MOVIE;
}
else
{
iNextMode = PRIMARY_MODE_PHOTO;
}
if((iNextMode != iCurrMode) || ((TRUE != sf_is_preview())))
{
UI_SetData(FL_PreMode, iCurrMode);
UI_SetData(FL_NextMode, iNextMode);
Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode);
}
}
//forbuild function need in other file --start--- //forbuild function need in other file --start---
UINT32 sp5kFsFileSizeGet(const char *path) UINT32 sp5kFsFileSizeGet(const char *path)
{ {

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

@ -318,7 +318,8 @@ void sf_mode_detect(void)
//if(((System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_PHOTO)&& (gPhotoData.State == PHOTO_ST_VIEW)) //if(((System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_PHOTO)&& (gPhotoData.State == PHOTO_ST_VIEW))
// || ((System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_MOVIE) && (FlowMovie_GetMovDataState() == MOV_ST_VIEW))) // || ((System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_MOVIE) && (FlowMovie_GetMovDataState() == MOV_ST_VIEW)))
if(sf_is_preview()) //if(sf_is_preview())
if(FALSE == sf_get_cap_statu() && FALSE == sf_is_movie_running())
{ {
//printf("----AutoOfftime=%d\n",AutoOfftime); //printf("----AutoOfftime=%d\n",AutoOfftime);
/*if(AutoOfftime<184) /*if(AutoOfftime<184)