kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[release-81-fixes] [ios] Fixed autoupdate status update.

Browse source
This commit is contained in:
Ilya Grechuhin 2018-02-21 14:23:11 +03:00 • committed by Aleksandr Zatsepin
parent 837fdace0e
commit b16a1df1ef
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm
View file

@ -235,6 +235,18 @@ enum class State
} completion:nil];
}
- (void)updateProcessStatus:(TCountryId const &)countryId
{
auto const & s = GetFramework().GetStorage();
NodeAttrs nodeAttrs;
s.GetNodeAttrs(RootId(), nodeAttrs);
auto view = static_cast<MWMAutoupdateView *>(self.view);
NSString * nodeName = @(s.GetNodeLocalName(countryId).c_str());
[view setStatusForNodeName:nodeName rootAttributes:nodeAttrs];
if (nodeAttrs.m_downloadingProgress.first == nodeAttrs.m_downloadingProgress.second)
self.progressFinished = YES;
}
#pragma mark - MWMCircularProgressProtocol
- (void)progressButtonPressed:(MWMCircularProgress *)progress { [self cancel]; }
@ -265,6 +277,8 @@ enum class State
if (self.progressFinished && m_updatingCountries.empty())
[self dismiss];
else
[self updateProcessStatus:countryId];
}
- (void)processError
@ -294,16 +308,8 @@ enum class State
- (void)processCountry:(TCountryId const &)countryId
progress:(MapFilesDownloader::TProgress const &)progress
{
if (m_updatingCountries.find(countryId) == m_updatingCountries.end())
return;
auto const & s = GetFramework().GetStorage();
NodeAttrs nodeAttrs;
s.GetNodeAttrs(RootId(), nodeAttrs);
auto view = static_cast<MWMAutoupdateView *>(self.view);
NSString * nodeName = @(s.GetNodeLocalName(countryId).c_str());
[view setStatusForNodeName:nodeName rootAttributes:nodeAttrs];
if (nodeAttrs.m_downloadingProgress.first == nodeAttrs.m_downloadingProgress.second)
self.progressFinished = YES;
if (m_updatingCountries.find(countryId) != m_updatingCountries.end())
[self updateProcessStatus:countryId];
}
@end