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

[android] First hacking commit, added mouse gestures

Browse source
This commit is contained in:
Alex Zolotarev 2011-07-21 20:49:09 +03:00 • committed by Alex Zolotarev
parent e68c9d43b4
commit e8adc20882
8 changed files with 97 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
android/jni/framework.cpp
View file

@ -26,6 +26,8 @@ AndroidFramework::AndroidFramework()
m_work.InitStorage(m_storage);
shared_ptr<RenderPolicy> renderPolicy(new RenderPolicyST(m_view, bind(&Framework<model::FeaturesFetcher>::DrawModel, &m_work, _1, _2, _3, _4)));
m_work.SetRenderPolicy(renderPolicy);
// @TODO refactor storage
m_storage.ReInitCountries(false);
}
void AndroidFramework::SetParentView(JNIEnv * env, jobject view)
@ -62,22 +64,27 @@ void AndroidFramework::Resize(int w, int h)
void AndroidFramework::DrawFrame()
{
/* yg::gl::Screen * screen = m_view->drawer()->screen().get();
screen->beginFrame();
screen->clear();
m2::PointD centerPt(screen->width() / 2,
screen->height() / 2);
m2::RectD r(centerPt.x - 100,
centerPt.y - 50,
centerPt.x + 100,
centerPt.y + 50);
screen->drawText(yg::FontDesc::defaultFont, centerPt, yg::EPosCenter, "Simplicity is the ultimate sophistication", yg::maxDepth, false);
screen->drawRectangle(r, yg::Color(255, 0, 0, 255), yg::maxDepth);
screen->drawRectangle(m2::Offset(r, m2::PointD(50, 50)), yg::Color(0, 255, 0, 255), yg::maxDepth);
screen->endFrame();
*/
m_work.Paint(make_shared_ptr(new PaintEvent(m_view->drawer())));
}
void AndroidFramework::Move(int mode, double x, double y)
{
DragEvent e(x, y);
switch (mode)
{
case 0: m_work.StartDrag(e); break;
case 1: m_work.DoDrag(e); break;
case 2: m_work.StopDrag(e); break;
}
}
void AndroidFramework::Zoom(int mode, double x1, double y1, double x2, double y2)
{
ScaleEvent e(x1, y1, x2, y2);
switch (mode)
{
case 0: m_work.StartScale(e); break;
case 1: m_work.DoScale(e); break;
case 2: m_work.StopScale(e); break;
}
}

5
android/jni/framework.h
View file

@ -33,6 +33,8 @@ private:
public:
AndroidFramework();
storage::Storage & Storage() { return m_storage; }
void SetParentView(JNIEnv * env, jobject view);
void InitRenderer();
@ -40,4 +42,7 @@ public:
void Resize(int w, int h);
void DrawFrame();
void Move(int mode, double x, double y);
void Zoom(int mode, double x1, double y1, double x2, double y2);
};

43
android/jni/main_native.cpp
View file

@ -2,6 +2,8 @@
#include "platform.h"
#include "framework.h"
#include "../../storage/storage.hpp"
#include <string.h>
#include <jni.h>
@ -43,12 +45,16 @@ JNIEXPORT void JNICALL
Java_com_mapswithme_maps_GesturesProcessor_nativeMove(JNIEnv * env,
jobject thiz, jint mode, jdouble x, jdouble y)
{
ASSERT ( g_work, () );
g_work->Move(mode, x, y);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_GesturesProcessor_nativeZoom(JNIEnv * env,
jobject thiz, jint mode, jdouble x1, jdouble y1, jdouble x2, jdouble y2)
{
ASSERT ( g_work, () );
g_work->Zoom(mode, x1, y1, x2, y2);
}
///////////////////////////////////////////////////////////////////////////////////
@ -76,4 +82,41 @@ Java_com_mapswithme_maps_MainRenderer_nativeDraw(JNIEnv * env, jobject thiz)
g_work->DrawFrame();
}
///////////////////////////////////////////////////////////////////////////////////
// DownloadUI
///////////////////////////////////////////////////////////////////////////////////
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_DownloadUI_countriesCount(JNIEnv * env, jobject thiz,
jint group, jint country, jint region)
{
return static_cast<jint>(g_work->Storage().CountriesCount(storage::TIndex(group, country, region)));
}
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_DownloadUI_countryName(JNIEnv * env, jobject thiz,
jint group, jint country, jint region)
{
string const name = g_work->Storage().CountryName(storage::TIndex(group, country, region));
return env->NewStringUTF(name.c_str());
}
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));
// lower int contains remote size, and upper - local one
int64_t mergedSize = s.second;
mergedSize |= (s.first << 32);
return mergedSize;
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_DownloadUI_countryStatus(JNIEnv * env, jobject thiz,
jint group, jint country, jint region)
{
return static_cast<jint>(g_work->Storage().CountryStatus(storage::TIndex(group, country, region)));
}
} // extern "C"

21
android/jni/platform.cpp
View file

@ -22,14 +22,15 @@ ModelReader * AndroidPlatform::GetReader(string const & file) const
return new ZipFileReader(m_resourcesDir, "assets/" + file);
}
bool AndroidPlatform::IsMultiSampled() const
{
return false;
}
void AndroidPlatform::GetFontNames(FilesList & res) const
{
res.push_back("01_dejavusans.ttf");
res.push_back("02_wqy-microhei.ttf");
res.push_back("03_jomolhari-id-a3d.ttf");
res.push_back("04_padauk.ttf");
res.push_back("05_khmeros.ttf");
res.push_back("06_code2000.ttf");
/// @todo Need to make refactoring of yg fonts
}
@ -43,6 +44,16 @@ 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;

5
android/jni/platform.h
View file

@ -11,11 +11,12 @@ public:
virtual ModelReader * GetReader(string const & file) const;
virtual bool IsMultiSampled() const;
virtual void GetFontNames(FilesList & res) const;
virtual int CpuCores() const;
virtual string DeviceID() const;
double VisualScale() const;
string SkinName() const;
};
AndroidPlatform & GetAndroidPlatform();

5
android/src/com/mapswithme/maps/GesturesProcessor.java
View file

@ -42,12 +42,13 @@ public class GesturesProcessor
switch (e.getAction() & MotionEvent.ACTION_MASK)
{
case MotionEvent.ACTION_DOWN:
getPointsMove(e);
m_mode = MOVE;
getPointsMove(e);
nativeMove(START, m_pt1.x, m_pt1.y);
break;
case MotionEvent.ACTION_POINTER_DOWN:
m_mode = ZOOM;
getPointsZoom(e);
nativeZoom(START, m_pt1.x, m_pt1.y, m_pt2.x, m_pt2.y);
break;
@ -61,7 +62,7 @@ public class GesturesProcessor
case MotionEvent.ACTION_POINTER_UP:
getPointsZoom(e);
nativeZoom(END, m_pt1.x, m_pt1.y, m_pt2.x, m_pt2.y);
m_mode = NONE;
m_mode = NONE; // MOVE
break;
case MotionEvent.ACTION_MOVE:

2
android/src/com/mapswithme/maps/MainGLView.java
View file

@ -54,7 +54,7 @@ class MainRenderer implements GLSurfaceView.Renderer
//@Override
public void onDrawFrame(GL10 gl)
{
Log.i(TAG, "onDrawFrame");
//Log.i(TAG, "onDrawFrame");
nativeDraw();
}

3
storage/storage.hpp
View file

@ -104,10 +104,11 @@ namespace storage
void DownloadNextCountryFromQueue();
Country const & CountryByIndex(TIndex const & index) const;
string UpdateBaseUrl() const;
void ReInitCountries(bool forceReload);
public:
Storage() {}
/// @TODO temporarily made public for Android, refactor
void ReInitCountries(bool forceReload);
/// Adds all locally downloaded maps to the model
void Init(TAddMapFunction addFunc, TRemoveMapFunction removeFunc, TUpdateRectFunction updateRectFunc, TEnumMapsFunction enumMapFunction);