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

[new downloader] iOS build fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-02-18 15:52:09 +03:00 • committed by Sergey Yershov
parent d562b786e2
commit 6d9c7250fc
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm
View file

@ -73,7 +73,7 @@
self.progressView.state = MWMCircularProgressStateNormal;
break;
case NodeStatus::Downloading:
self.progressView.progress = static_cast<CGFloat>(nodeAttrs.m_downloadingProgress) / 100.0;
self.progressView.progress = static_cast<CGFloat>(nodeAttrs.m_downloadingProgress.first) / 100.0;
break;
case NodeStatus::InQueue:
self.progressView.state = MWMCircularProgressStateSpinner;
@ -88,8 +88,6 @@
case NodeStatus::OnDiskOutOfDate:
self.progressView.state = MWMCircularProgressStateSelected;
break;
case NodeStatus::Mixed:
break;
}
}
@ -144,7 +142,6 @@
[self.delegate cancelNode:m_countryId];
break;
case NodeStatus::OnDisk:
case NodeStatus::Mixed:
break;
}
}

3
iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
View file

@ -98,7 +98,7 @@ using namespace storage;
break;
}
case NodeStatus::Downloading:
[self showDownloading:static_cast<CGFloat>(nodeAttrs.m_downloadingProgress) / 100.0];
[self showDownloading:static_cast<CGFloat>(nodeAttrs.m_downloadingProgress.first) / nodeAttrs.m_downloadingProgress.second];
addSubview();
break;
case NodeStatus::InQueue:
@ -112,7 +112,6 @@ using namespace storage;
break;
case NodeStatus::OnDisk:
case NodeStatus::OnDiskOutOfDate:
case NodeStatus::Mixed:
removeSubview();
break;
}