games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

fix datetime format (android)

Browse Source
This commit is contained in:
Laserlicht 2023-09-23 17:27:00 +02:00 committed by GitHub
parent 952c740c73
commit 455ead7b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/vcmi-app/src/main/java/eu/vcmi/vcmi/NativeMethods.java
View File

@ -153,6 +153,15 @@ public class NativeMethods
}
}
@SuppressWarnings(Const.JNI_METHOD_SUPPRESS)
public static String getFormattedDateTime()
{
String currentDate = new SimpleDateFormat((new SimpleDateFormat()).toLocalizedPattern(), Locale.getDefault()).format(new Date());
String currentTime = new SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(new Date());
return currentDate + " " + currentTime;
}
private static void internalProgressDisplay(final boolean show)
{
final Context ctx = SDL.getContext();

9
lib/vstd/DateUtils.cpp
View File

@ -1,6 +1,10 @@
#include "StdInc.h"
#include <vstd/DateUtils.h>
#if defined(VCMI_ANDROID)
#include "../CAndroidVMHelper.h"
#endif
VCMI_LIB_NAMESPACE_BEGIN
namespace vstd
@ -8,6 +12,11 @@ namespace vstd
DLL_LINKAGE std::string getFormattedDateTime(std::time_t dt)
{
#if defined(VCMI_ANDROID)
CAndroidVMHelper vmHelper;
return vmHelper.callStaticStringMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "getFormattedDateTime");
#endif
std::tm tm = *std::localtime(&dt);
std::stringstream s;
try