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

Added total time to java.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-11-28 15:14:08 +03:00 • committed by Alex Zolotarev
parent 8f7d0b649a
commit 1043f4e8de
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1291,15 +1291,16 @@ extern "C"
{
jclass klass = env->FindClass("com/mapswithme/maps/LocationState$RoutingInfo");
jmethodID methodID = env->GetMethodID(klass, "<init>", "(Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;I)V");
"Ljava/lang/String;Ljava/lang/String;II)V");
return env->NewObject(klass, methodID,
jni::ToJavaString(env, info.m_distToTarget),
jni::ToJavaString(env, info.m_targetUnitsSuffix),
jni::ToJavaString(env, info.m_distToTurn),
jni::ToJavaString(env, info.m_turnUnitsSuffix),
static_cast<jint>(info.m_turn));
}
static_cast<jint>(info.m_turn),
info.m_time);
}
}
return 0;

4
android/src/com/mapswithme/maps/LocationState.java
View file

@ -28,6 +28,7 @@ public enum LocationState
{
public String mDistToTarget;
public String mUnits;
public int mTotalTimeInSeconds;
public String mDistToTurn;
public String mTurnUnitsSuffix;
@ -72,12 +73,13 @@ public enum LocationState
}
}
public RoutingInfo(String distToTarget, String units, String distTurn, String turnSuffix, int direction)
public RoutingInfo(String distToTarget, String units, String distTurn, String turnSuffix, int direction, int totalTime)
{
mDistToTarget = distToTarget;
mUnits = units;
mTurnUnitsSuffix = turnSuffix;
mDistToTurn = distTurn;
mTotalTimeInSeconds = totalTime;
mTurnDirection = TurnDirection.values()[direction];
}
}