diff --git a/code/application/source/sf_app/code/source/4gMng/sf_sms.c b/code/application/source/sf_app/code/source/4gMng/sf_sms.c index f7d5a27bf..7212a155c 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_sms.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_sms.c @@ -686,7 +686,7 @@ UINT8 sf_message_data_processing(UINT8 strValue[30][32], UINT16 mm, UINT8 *sms_s } else if((strValue[i][0] - '0') == 3) { - pPara_sms_saved->SendType = 3; + pPara_sms_saved->SendType = 4; } else { @@ -2568,6 +2568,8 @@ SINT32 sf_power_off_check_module_sleep(void) { UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UINT8 PowerOnMode = sf_poweron_type_get(); + SLOGI("PowerOnMode:%d SendType:%d NetWorkNeedSearch:%d GprsMode:%d sleep flag:%d sim insert:%d\n\n", PowerOnMode, puiPara->SendType, puiPara->NetWorkNeedSearch, puiPara->GprsMode, sf_get_module_sleep_flag(), sf_get_sim_insert()); + if(sf_get_sim_insert() && puiPara->GprsSwitch && (sf_get_fw_update() == 0) && (sf_get_power_off_flag() == 0) && (!CameraCmd.cameraRestart) && (puiPara->NetWorkNeedSearch != 3)) { if (!(sf_get_mode_flag() && sf_get_pir_statu_flag() == 0)) //setup mode, !go to pir mode, no set cfun or sleep diff --git a/code/application/source/sf_app/code/source/fileMng/sf_file.c b/code/application/source/sf_app/code/source/fileMng/sf_file.c index 1bbe96232..f5d47b4fa 100755 --- a/code/application/source/sf_app/code/source/fileMng/sf_file.c +++ b/code/application/source/sf_app/code/source/fileMng/sf_file.c @@ -939,7 +939,8 @@ UINT32 sf_create_dailyreport_file(void) SF_PARA_TIME_S drRtcTime; SINT16 fTemper = 0, cTemper = 0; - + char imageSize = 0; + char videoSize = 0; /*Avoid New Card*/ if (access(SF_THUMB_DIR, F_OK) == -1) { @@ -1108,11 +1109,52 @@ UINT32 sf_create_dailyreport_file(void) sprintf((char *)cfgTmp, "$R01*%d#", pPara->CamMode== SF_CAM_MODE_PHOTO ?1:2); - sprintf(str, "%d#", pPara->ImgSize+1); + if(PHOTO_SIZE_16M == pPara->ImgSize) + { + imageSize = 1; + } + else if(PHOTO_SIZE_12M == pPara->ImgSize) + { + imageSize = 2; + } + else if(PHOTO_SIZE_8M == pPara->ImgSize) + { + imageSize = 3; + } + else if(PHOTO_SIZE_24M == pPara->ImgSize) + { + imageSize = 4; + } + else if(PHOTO_SIZE_32M == pPara->ImgSize) + { + imageSize = 5; + } + else if(PHOTO_SIZE_40M == pPara->ImgSize) + { + imageSize = 6; + } + else + { + imageSize = 3; + } + sprintf(str, "%d#", imageSize); SF_STRCAT(cfgTmp, (const char *)str); - sprintf(str, "%d#", pPara->VideoSize+1); + + if(MOVIE_SIZE_FRONT_1920x1080P30 == pPara->VideoSize){ + videoSize = 1; + } + else if(MOVIE_SIZE_FRONT_1280x720P30 == pPara->VideoSize){ + videoSize = 2; + } + else if(MOVIE_SIZE_FRONT_848x480P30 == pPara->VideoSize){ + videoSize = 3; + } + else{ + videoSize = 2; + } + sprintf(str, "%d#", videoSize); SF_STRCAT(cfgTmp, (const char *)str); - sprintf(str, "%02d#", pPara->VideoLenth == 0 ? 10 : 15); + sprintf(str, "%02d#", pPara->VideoLenth); SF_STRCAT(cfgTmp, (const char *)str); sprintf(str, "%d#", pPara->Multishot+1); SF_STRCAT(cfgTmp, (const char *)str); @@ -1170,33 +1212,58 @@ UINT32 sf_create_dailyreport_file(void) SF_STRCAT(cfgTmp, (const char *)str); - sprintf(str, "%d#", pPara->SendType); + sprintf(str, "%d#", pPara->SendType == 4 ?3:pPara->SendType); SF_STRCAT(cfgTmp, (const char *)str); - if(pPara->SendType) + if(pPara->SendType == 0) + { + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + } + else if(pPara->SendType == 1) { sprintf(str, "%02d:%02d#", pPara->TimeSend1.Hour, pPara->TimeSend1.Min); - } - else - { + SF_STRCAT(cfgTmp, (const char *)str); sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); } - SF_STRCAT(cfgTmp, (const char *)str); - - if(pPara->SendType == 2) + else if(pPara->SendType == 2) { + sprintf(str, "%02d:%02d#", pPara->TimeSend1.Hour, pPara->TimeSend1.Min); + SF_STRCAT(cfgTmp, (const char *)str); sprintf(str, "%02d:%02d#", pPara->TimeSend2.Hour, pPara->TimeSend2.Min); - } - else - { + SF_STRCAT(cfgTmp, (const char *)str); sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "null#"); + SF_STRCAT(cfgTmp, (const char *)str); + } + else if(pPara->SendType == 4) + { + sprintf(str, "%02d:%02d#", pPara->TimeSend1.Hour, pPara->TimeSend1.Min); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "%02d:%02d#", pPara->TimeSend2.Hour, pPara->TimeSend2.Min); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "%02d:%02d#", pPara->TimeSend3.Hour, pPara->TimeSend3.Min); + SF_STRCAT(cfgTmp, (const char *)str); + sprintf(str, "%02d:%02d#", pPara->TimeSend4.Hour, pPara->TimeSend4.Min); + SF_STRCAT(cfgTmp, (const char *)str); } - SF_STRCAT(cfgTmp, (const char *)str); sprintf(str, "%d#", pPara->GpsSwitch); SF_STRCAT(cfgTmp, (const char *)str); - sprintf(str, "0#"); //gps number + sprintf(str, "%d#", pPara->GpsNumber); //gps number SF_STRCAT(cfgTmp, (const char *)str); sprintf(str, "%d#", pPara->PicUpDailyReport);