|
@@ -2296,12 +2296,13 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
//巡逻车临时停车逻辑,begin,20211203,cxw
|
|
//巡逻车临时停车逻辑,begin,20211203,cxw
|
|
int parkpointnum=-1;
|
|
int parkpointnum=-1;
|
|
double min_distoparkpoint =8;
|
|
double min_distoparkpoint =8;
|
|
- bool parktimeEN = false;
|
|
|
|
- QTime parktimer;
|
|
|
|
- static bool timer_en=true;
|
|
|
|
|
|
+ static bool parktimeEN = false;
|
|
|
|
+ static QTime parktimer;
|
|
|
|
+ static bool timer_en=true;
|
|
if((ServiceCarStatus.mbparkEN==true)&&(ServiceCarStatus.mnparknum!=0))
|
|
if((ServiceCarStatus.mbparkEN==true)&&(ServiceCarStatus.mnparknum!=0))
|
|
{
|
|
{
|
|
- int timecnt =ServiceCarStatus.mnparktime*60*1000;
|
|
|
|
|
|
+// int timecnt =ServiceCarStatus.mnparktime*60*1000;
|
|
|
|
+ int timecnt =ServiceCarStatus.mnparktime*1000;
|
|
for(unsigned int i=0;i<ServiceCarStatus.xlcParkPoint.size();i++)
|
|
for(unsigned int i=0;i<ServiceCarStatus.xlcParkPoint.size();i++)
|
|
{
|
|
{
|
|
double dis= GetDistance(ServiceCarStatus.xlcParkPoint[i],now_gps_ins);
|
|
double dis= GetDistance(ServiceCarStatus.xlcParkPoint[i],now_gps_ins);
|
|
@@ -2315,7 +2316,7 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
givlog->debug("brain_decition","xlcparkpoingnum %d","min_distoparknum %f",
|
|
givlog->debug("brain_decition","xlcparkpoingnum %d","min_distoparknum %f",
|
|
parkpointnum,min_distoparkpoint);
|
|
parkpointnum,min_distoparkpoint);
|
|
|
|
|
|
- if((parkpointnum!=-1)&&(min_distoparkpoint<5) && (parktimeEN ==false))
|
|
|
|
|
|
+ if((parkpointnum!=-1)&&(min_distoparkpoint<ServiceCarStatus.distoParkPoint) && (parktimeEN ==false))
|
|
{
|
|
{
|
|
minDecelerate=-5;
|
|
minDecelerate=-5;
|
|
if(timer_en==true)
|
|
if(timer_en==true)
|