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

[android] Added java DiscoveryManager that will be called from JNI

Browse source
This commit is contained in:
Александр Зацепин 2017-11-23 17:18:12 +03:00 • committed by Roman Kuznetsov
parent 9d8432c63d
commit 7705267929
5 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/jni/com/mapswithme/maps/locals/Locals.cpp
View file

@ -21,22 +21,22 @@ void PrepareClassRefs(JNIEnv * env)
if (g_localsClass != nullptr)
return;
g_localsClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/locals/Locals");
g_localsClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/Locals");
static jfieldID const localsInstanceField = jni::GetStaticFieldID(env, g_localsClass, "INSTANCE",
"Lcom/mapswithme/maps/locals/Locals;");
"Lcom/mapswithme/maps/discovery/Locals;");
g_localsInstance = env->GetStaticObjectField(g_localsClass, localsInstanceField);
g_onLocalsReceivedMethod = jni::GetMethodID(env, g_localsInstance, "onLocalsReceived",
"([Lcom/mapswithme/maps/locals/LocalExpert;)V");
"([Lcom/mapswithme/maps/discovery/LocalExpert;)V");
g_onLocalsErrorReceivedMethod = jni::GetMethodID(env, g_localsInstance,
"onLocalsErrorReceived",
"(Lcom/mapswithme/maps/locals/LocalsError;)V");
"(Lcom/mapswithme/maps/discovery/LocalsError;)V");
// int id, @NonNull String name, @NonNull String country,
// @NonNull String city, double rating, int reviewCount,
// double price, @NonNull String currency, @NonNull String motto,
// @NonNull String about, @NonNull String offer, @NonNull String pageUrl,
// @NonNull String photoUrl
g_localExpertClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/locals/LocalExpert");
g_localExpertClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/LocalExpert");
g_localExpertConstructor =
jni::GetConstructorID(env, g_localExpertClass,
"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;DID"
@ -44,7 +44,7 @@ void PrepareClassRefs(JNIEnv * env)
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
// @ErrorCode int code, @NonNull String message
g_localErrorClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/locals/LocalError");
g_localErrorClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/LocalError");
g_localErrorConstructor = jni::GetConstructorID(env, g_localErrorClass,
"(ILjava/lang/String;)V");
}

40
android/src/com/mapswithme/maps/discovery/DiscoveryManager.java Normal file
View file

@ -0,0 +1,40 @@
package com.mapswithme.maps.discovery;
import android.support.annotation.MainThread;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.search.SearchResult;
import com.mapswithme.maps.viator.ViatorProduct;
enum DiscoveryManager
{
INSTANCE;
public void discover(@NonNull DiscoveryParams params)
{
Framework.nativeDiscover(params);
}
// Called from JNI.
@MainThread
private void onResultReceived(@Nullable SearchResult[] results, @DiscoveryParams.ItemType int type)
{
// TODO: not implemented yet.
}
// Called from JNI.
@MainThread
private void onViatorProductsReceived(@Nullable ViatorProduct[] products)
{
// TODO: not implemented yet.
}
// Called from JNI.
@MainThread
private void onLocalExpertsReceived(@Nullable LocalExpert[] experts)
{
// TODO: not implemented yet.
}
}

2
android/src/com/mapswithme/maps/locals/LocalExpert.java → android/src/com/mapswithme/maps/discovery/LocalExpert.java
View file

@ -1,4 +1,4 @@
package com.mapswithme.maps.locals;
package com.mapswithme.maps.discovery;
import android.os.Parcel;
import android.os.Parcelable;

2
android/src/com/mapswithme/maps/locals/Locals.java → android/src/com/mapswithme/maps/discovery/Locals.java
View file

@ -1,4 +1,4 @@
package com.mapswithme.maps.locals;
package com.mapswithme.maps.discovery;
import android.support.annotation.MainThread;
import android.support.annotation.NonNull;

2
android/src/com/mapswithme/maps/locals/LocalsError.java → android/src/com/mapswithme/maps/discovery/LocalsError.java
View file

@ -1,4 +1,4 @@
package com.mapswithme.maps.locals;
package com.mapswithme.maps.discovery;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;