AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape] don't drag a user to his current position after acquiring coordinates (cold and hot start) within 8 hours after a user puts the app to background

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-06-04 19:05:32 +03:00 • committed by Vladimir Byko-Ianko
parent c0d5c5b55e
commit b6bc56dbd9
9 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drape_frontend/drape_engine.cpp
View file

@ -718,10 +718,17 @@ void DrapeEngine::SetKineticScrollEnabled(bool enabled)
MessagePriority::Normal);
}
void DrapeEngine::SetTimeInBackground(double time)
void DrapeEngine::OnEnterForeground(double backgroundTime)
{
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<SetTimeInBackgroundMessage>(time),
make_unique_dp<OnEnterForegroundMessage>(backgroundTime),
MessagePriority::High);
}
void DrapeEngine::OnEnterBackground()
{
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<OnEnterBackgroundMessage>(),
MessagePriority::High);
}

3
drape_frontend/drape_engine.hpp
View file

@ -209,7 +209,8 @@ public:
void SetKineticScrollEnabled(bool enabled);
void SetTimeInBackground(double time);
void OnEnterForeground(double backgroundTime);
void OnEnterBackground();
void SetDisplacementMode(int mode);

12
drape_frontend/frontend_renderer.cpp
View file

@ -829,10 +829,16 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::Type::SetTimeInBackground:
case Message::Type::OnEnterForeground:
{
ref_ptr<SetTimeInBackgroundMessage> msg = message;
m_myPositionController->SetTimeInBackground(msg->GetTime());
ref_ptr<OnEnterForegroundMessage> msg = message;
m_myPositionController->OnEnterForeground(msg->GetTime());
break;
}
case Message::Type::OnEnterBackground:
{
m_myPositionController->OnEnterBackground();
break;
}

3
drape_frontend/message.cpp
View file

@ -63,7 +63,7 @@ std::string DebugPrint(Message::Type msgType)
case Message::Type::ShowChoosePositionMark: return "ShowChoosePositionMark";
case Message::Type::SetKineticScrollEnabled: return "SetKineticScrollEnabled";
case Message::Type::BlockTapEvents: return "BlockTapEvents";
case Message::Type::SetTimeInBackground: return "SetTimeInBackground";
case Message::Type::OnEnterForeground: return "OnEnterForeground";
case Message::Type::SetAddNewPlaceMode: return "SetAddNewPlaceMode";
case Message::Type::SetDisplacementMode: return "SetDisplacementMode";
case Message::Type::AllowAutoZoom: return "AllowAutoZoom";
@ -103,6 +103,7 @@ std::string DebugPrint(Message::Type msgType)
case Message::Type::NotifyGraphicsReady: return "NotifyGraphicsReady";
case Message::Type::EnableIsolines: return "EnableIsolines";
case Message::Type::EnableGuides: return "EnableGuides";
case Message::Type::OnEnterBackground: return "OnEnterBackground";
}
ASSERT(false, ("Unknown message type."));
return "Unknown type";

3
drape_frontend/message.hpp
View file

@ -64,7 +64,7 @@ public:
ShowChoosePositionMark,
SetKineticScrollEnabled,
BlockTapEvents,
SetTimeInBackground,
OnEnterForeground,
SetAddNewPlaceMode,
SetDisplacementMode,
AllowAutoZoom,
@ -104,6 +104,7 @@ public:
NotifyGraphicsReady,
EnableIsolines,
EnableGuides,
OnEnterBackground,
};
virtual ~Message() = default;

12
drape_frontend/message_subclasses.hpp
View file

@ -956,14 +956,14 @@ public:
Type GetType() const override { return Type::ClearGpsTrackPoints; }
};
class SetTimeInBackgroundMessage : public Message
class OnEnterForegroundMessage : public Message
{
public:
explicit SetTimeInBackgroundMessage(double time)
explicit OnEnterForegroundMessage(double time)
: m_time(time)
{}
Type GetType() const override { return Type::SetTimeInBackground; }
Type GetType() const override { return Type::OnEnterForeground; }
double GetTime() const { return m_time; }
@ -971,6 +971,12 @@ private:
double m_time;
};
class OnEnterBackgroundMessage : public Message
{
public:
Type GetType() const override { return Type::OnEnterBackground; }
};
class SetDisplacementModeMessage : public Message
{
public:

15
drape_frontend/my_position_controller.cpp
View file

@ -29,7 +29,7 @@ int const kPositionRoutingOffsetY = 104;
double const kMinSpeedThresholdMps = 2.8; // 10 km/h
double const kGpsBearingLifetimeSec = 5.0;
double const kMaxPendingLocationTimeSec = 60.0;
double const kMaxTimeInBackgroundSec = 60.0 * 60;
double const kMaxTimeInBackgroundSec = 60.0 * 60 * 8; // 8 hours
double const kMaxNotFollowRoutingTimeSec = 20.0;
double const kMaxUpdateLocationInvervalSec = 30.0;
double const kMaxBlockAutoZoomTimeSec = 10.0;
@ -131,7 +131,7 @@ void ResetNotification(uint64_t & notifyId)
MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifier> notifier)
: m_notifier(notifier)
, m_mode(location::PendingPosition)
, m_mode(params.m_isRoutingActive ? location::PendingPosition : location::NotFollowNoPosition)
, m_desiredInitMode(params.m_initMode)
, m_modeChangeCallback(std::move(params.m_myPositionModeCallback))
, m_hints(params.m_hints)
@ -177,6 +177,7 @@ MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifi
}
else if (params.m_timeInBackground >= kMaxTimeInBackgroundSec)
{
m_mode = location::PendingPosition;
m_desiredInitMode = location::Follow;
}
@ -709,15 +710,21 @@ void MyPositionController::StopLocationFollow()
ResetRoutingNotFollowTimer();
}
void MyPositionController::SetTimeInBackground(double time)
void MyPositionController::OnEnterForeground(double backgroundTime)
{
if (time >= kMaxTimeInBackgroundSec && m_mode == location::NotFollow)
if (backgroundTime >= kMaxTimeInBackgroundSec && m_mode == location::NotFollow)
{
ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow);
UpdateViewport(kDoNotChangeZoom);
}
}
void MyPositionController::OnEnterBackground()
{
if (!m_isInRouting)
ChangeMode(location::NotFollowNoPosition);
}
void MyPositionController::OnCompassTapped()
{
alohalytics::LogEvent("$compassClicked", {{"mode", LocationModeStatisticsName(m_mode)},

3
drape_frontend/my_position_controller.hpp
View file

@ -115,7 +115,8 @@ public:
void NextMode(ScreenBase const & screen);
void LoseLocation();
void SetTimeInBackground(double time);
void OnEnterForeground(double backgroundTime);
void OnEnterBackground();
void OnCompassTapped();
void OnLocationUpdate(location::GpsInfo const & info, bool isNavigable, ScreenBase const & screen);

5
map/framework.cpp
View file

@ -1483,6 +1483,9 @@ void Framework::EnterBackground()
m_startBackgroundTime = base::Timer::LocalTime();
settings::Set("LastEnterBackground", m_startBackgroundTime);
if (m_drapeEngine != nullptr)
m_drapeEngine->OnEnterBackground();
SaveViewport();
m_trafficManager.OnEnterBackground();
@ -1507,7 +1510,7 @@ void Framework::EnterForeground()
if (m_drapeEngine != nullptr && m_startBackgroundTime != 0.0)
{
auto const secondsInBackground = m_startForegroundTime - m_startBackgroundTime;
m_drapeEngine->SetTimeInBackground(secondsInBackground);
m_drapeEngine->OnEnterForeground(secondsInBackground);
if (m_guidesManager.IsEnabled() &&
secondsInBackground / 60 / 60 > kGuidesEnabledInBackgroundMaxHours)