diff --git a/android/jni/android_platform.cpp b/android/jni/android_platform.cpp index d9dfbfff3b..eb11347f18 100644 --- a/android/jni/android_platform.cpp +++ b/android/jni/android_platform.cpp @@ -3,8 +3,6 @@ #include "../../base/logging.hpp" -#include "../../coding/zip_reader.hpp" - void AndroidPlatform::Initialize(JNIEnv * env, jstring apkPath, jstring storagePath) { m_resourcesDir = jni::ToString(env, apkPath); @@ -13,61 +11,6 @@ void AndroidPlatform::Initialize(JNIEnv * env, jstring apkPath, jstring storageP LOG(LDEBUG, ("Writable path = ", m_writableDir)); } -ModelReader * AndroidPlatform::GetReader(string const & file) const -{ - if (IsFileExists(m_writableDir + file)) - return BasePlatformImpl::GetReader(file); - else - { // paths from GetFilesInDir will already contain "assets/" - if (file.find("assets/") != string::npos) - return new ZipFileReader(m_resourcesDir, file); - else - return new ZipFileReader(m_resourcesDir, "assets/" + file); - } -} - -void AndroidPlatform::GetFilesInDir(string const & directory, string const & mask, FilesList & res) const -{ - if (ZipFileReader::IsZip(directory)) - { // Get files list inside zip file - res = ZipFileReader::FilesList(directory); - // filter out according to the mask - // @TODO we don't support wildcards at the moment - string fixedMask = mask; - if (fixedMask.size() && fixedMask[0] == '*') - fixedMask.erase(0, 1); - for (FilesList::iterator it = res.begin(); it != res.end();) - { - if (it->find(fixedMask) == string::npos) - it = res.erase(it); - else - ++it; - } - } - else - BasePlatformImpl::GetFilesInDir(directory, mask, res); -} - -int AndroidPlatform::CpuCores() const -{ - return 1; -} - -string AndroidPlatform::DeviceID() const -{ - return "Android"; -} - -double AndroidPlatform::VisualScale() const -{ - return 1.3; -} - -string AndroidPlatform::SkinName() const -{ - return "basic.skn"; -} - AndroidPlatform & GetAndroidPlatform() { static AndroidPlatform platform; diff --git a/android/jni/android_platform.hpp b/android/jni/android_platform.hpp index 3a462e0a8c..adb17f7aeb 100644 --- a/android/jni/android_platform.hpp +++ b/android/jni/android_platform.hpp @@ -4,20 +4,10 @@ #include -class AndroidPlatform : public BasePlatformImpl +class AndroidPlatform : public Platform { public: void Initialize(JNIEnv * env, jstring apkPath, jstring storagePath); - - virtual ModelReader * GetReader(string const & file) const; - /// Overrided to support zip file listing - virtual void GetFilesInDir(string const & directory, string const & mask, FilesList & res) const; - - virtual int CpuCores() const; - virtual string DeviceID() const; - - double VisualScale() const; - string SkinName() const; }; AndroidPlatform & GetAndroidPlatform(); diff --git a/android/jni/main_native.cpp b/android/jni/main_native.cpp index 1ad8e7e2b3..12923987eb 100644 --- a/android/jni/main_native.cpp +++ b/android/jni/main_native.cpp @@ -120,7 +120,7 @@ JNIEXPORT jlong JNICALL Java_com_mapswithme_maps_DownloadUI_countrySizeInBytes(JNIEnv * env, jobject thiz, jint group, jint country, jint region) { - storage::TLocalAndRemoteSize const s = g_work->Storage().CountrySizeInBytes(storage::TIndex(group, country, region)); + storage::LocalAndRemoteSizeT const s = g_work->Storage().CountrySizeInBytes(storage::TIndex(group, country, region)); // lower int contains remote size, and upper - local one int64_t mergedSize = s.second; mergedSize |= (s.first << 32); diff --git a/platform/platform.hpp b/platform/platform.hpp index 5bed8e580e..793f8bacb1 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -13,6 +13,7 @@ DECLARE_EXCEPTION(NotImplementedException, RootException); class Platform { +protected: string m_writableDir, m_resourcesDir; class PlatformImpl; PlatformImpl * m_impl; diff --git a/platform/platform.pro b/platform/platform.pro index f42b382208..74ba8b35f3 100644 --- a/platform/platform.pro +++ b/platform/platform.pro @@ -36,6 +36,8 @@ QT *= core network OBJECTIVE_SOURCES += ios_video_timer.mm \ ios_concurrent_runner.mm \ platform_ios.mm +} else:android* { + SOURCES += platform_android.cpp } macx|iphone* { diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp new file mode 100644 index 0000000000..4a9886eb07 --- /dev/null +++ b/platform/platform_android.cpp @@ -0,0 +1,103 @@ +#include "platform.hpp" + +#include "../coding/file_reader.hpp" +#include "../coding/zip_reader.hpp" + +#include +#include + +static string ReadPathForFile(string const & writableDir, + string const & resourcesDir, string const & file) +{ + string fullPath = writableDir + file; + if (!GetPlatform().IsFileExists(fullPath)) + { + fullPath = resourcesDir + file; + if (!GetPlatform().IsFileExists(fullPath)) + MYTHROW(FileAbsentException, ("File doesn't exist", fullPath)); + } + return fullPath; +} + +ModelReader * Platform::GetReader(string const & file) const +{ + if (IsFileExists(m_writableDir + file)) + return new FileReader(ReadPathForFile(m_writableDir, m_resourcesDir, file), 10, 12); + else + { // paths from GetFilesInDir will already contain "assets/" + if (file.find("assets/") != string::npos) + return new ZipFileReader(m_resourcesDir, file); + else + return new ZipFileReader(m_resourcesDir, "assets/" + file); + } +} + +void Platform::GetFilesInDir(string const & directory, string const & mask, FilesList & res) const +{ + if (ZipFileReader::IsZip(directory)) + { // Get files list inside zip file + res = ZipFileReader::FilesList(directory); + // filter out according to the mask + // @TODO we don't support wildcards at the moment + string fixedMask = mask; + if (fixedMask.size() && fixedMask[0] == '*') + fixedMask.erase(0, 1); + for (FilesList::iterator it = res.begin(); it != res.end();) + { + if (it->find(fixedMask) == string::npos) + it = res.erase(it); + else + ++it; + } + } + else + { + DIR * dir; + struct dirent * entry; + if ((dir = opendir(directory.c_str())) == NULL) + return; + // TODO: take wildcards into account... + string mask_fixed = mask; + if (mask_fixed.size() && mask_fixed[0] == '*') + mask_fixed.erase(0, 1); + do + { + if ((entry = readdir(dir)) != NULL) + { + string fname(entry->d_name); + size_t index = fname.rfind(mask_fixed); + if (index != string::npos && index == fname.size() - mask_fixed.size()) + { + res.push_back(fname); + } + } + } while (entry != NULL); + + closedir(dir); + } +} + +int Platform::CpuCores() const +{ + long const numCPU = sysconf(_SC_NPROCESSORS_ONLN); + if (numCPU >= 1) + return static_cast(numCPU); + return 1; + +} + +string Platform::DeviceName() const +{ + return "Android"; +} + +double Platform::VisualScale() const +{ + return 1.3; +} + +string Platform::SkinName() const +{ + return "basic.skn"; +} +