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

supporting smooth progress while copying files from bundle file.

Browse source
This commit is contained in:
rachytski 2012-02-26 23:35:11 +04:00 • committed by Alex Zolotarev
parent 7b61b446b6
commit fb02b19b4c
2 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
android/jni/com/mapswithme/maps/CopyResourcesActivity.cpp
View file

@ -13,6 +13,9 @@
#include "../../../../../std/vector.hpp"
#include "../../../../../std/string.hpp"
#include "../jni/jni_thread.hpp"
#include "../jni/jni_method.hpp"
// Special error codes to notify GUI about free space
//@{
#define ERR_COPIED_SUCCESSFULLY 0
@ -35,6 +38,12 @@ static jint g_copiedBytesProgress = 0;
extern "C"
{
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_CopyResourcesActivity_nativeGetCopiedBytes(JNIEnv * env, jobject thiz)
{
return g_copiedBytesProgress;
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_CopyResourcesActivity_nativeGetBytesToCopy(JNIEnv * env, jobject thiz,
jstring apkPath, jstring sdcardPath)
@ -90,8 +99,21 @@ extern "C"
return totalSizeToCopy;
}
jobject g_observer = 0;
jni::Method * g_progressFn = 0;
int g_cycles = 0;
void CopyFileProgress(int size, int pos)
{
g_cycles++;
/// calling JNI method only once in 5 cycles, as there
/// are an overhead on frequent calls.
if ((g_cycles %=5) == 0)
g_progressFn->CallVoid(g_observer, size, pos);
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_CopyResourcesActivity_nativeCopyNextFile(JNIEnv * env, jobject thiz)
Java_com_mapswithme_maps_CopyResourcesActivity_nativeCopyNextFile(JNIEnv * env, jobject thiz, jobject observer)
{
if (g_filesToCopy.empty())
return ERR_COPIED_SUCCESSFULLY;
@ -110,16 +132,27 @@ extern "C"
return ERR_NOT_ENOUGH_FREE_SPACE;
}
jclass k = jni::GetCurrentThreadJNIEnv()->GetObjectClass(observer);
g_progressFn = new jni::Method(k, "onFileProgress", "(II)V");
g_observer = observer;
g_cycles = 0;
// Perform copying
try
{
ZipFileReader::UnzipFile(g_apkPath, it->m_pathInZip, it->m_pathInSdcard);
ZipFileReader::UnzipFile(g_apkPath, it->m_pathInZip, it->m_pathInSdcard, &CopyFileProgress);
}
catch (std::exception const & e)
{
LOG(LERROR, ("Error while extracting", it->m_pathInZip, "from apk to", it->m_pathInSdcard));
delete g_progressFn;
g_observer = 0;
return ERR_NOT_ENOUGH_FREE_SPACE;
}
g_observer = 0;
delete g_progressFn;
g_copiedBytesProgress += it->m_uncompressedSize;
g_filesToCopy.erase(it);
return g_copiedBytesProgress;

14
android/src/com/mapswithme/maps/CopyResourcesActivity.java
View file

@ -30,7 +30,7 @@ public class CopyResourcesActivity extends Activity
{
private final String m_apkPath;
private final String m_sdcardPath;
CopyResourcesTask(String apkPath, String sdcardPath)
{
m_apkPath = apkPath;
@ -79,6 +79,11 @@ public class CopyResourcesActivity extends Activity
CopyResourcesActivity.this.onCopyResourcesProgress(copiedBytes[0]);
}
protected void onFileProgress(int size, int pos)
{
publishProgress(nativeGetCopiedBytes() + pos);
}
@Override
protected Integer doInBackground(Void... p)
{
@ -86,7 +91,7 @@ public class CopyResourcesActivity extends Activity
int bytesCopied;
do
{
bytesCopied = nativeCopyNextFile();
bytesCopied = nativeCopyNextFile(this);
if (bytesCopied > 0)
publishProgress(new Integer(bytesCopied));
else if (bytesCopied < 0)
@ -152,7 +157,7 @@ public class CopyResourcesActivity extends Activity
final String str = getString(R.string.app_name);
int len = current * str.length() / total;
if (len <= 0)
len = 1;
len = 0;
else if (len > str.length())
len = str.length();
return String.format(getString(R.string.loading), str.substring(0, len));
@ -180,5 +185,6 @@ public class CopyResourcesActivity extends Activity
private native void nativeMoveMaps(String fromFolder, String toFolder);
private native int nativeGetBytesToCopy(String m_apkPath, String m_sdcardPath);
private native int nativeCopyNextFile();
private native int nativeGetCopiedBytes();
private native int nativeCopyNextFile(Object observer);
}