From fa7dbfbd50239388daa604c4589153904bd1056d Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 12 May 2024 00:26:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=BC=96=E8=AF=91=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/MicroPhoto.cpp | 4 +++- app/src/main/cpp/PhoneDevice.cpp | 3 +++ app/src/main/cpp/PhoneDevice.h | 5 +++++ app/src/main/java/com/xypower/mpapp/MicroPhotoService.java | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/cpp/MicroPhoto.cpp b/app/src/main/cpp/MicroPhoto.cpp index 5a307ab8..6145f523 100644 --- a/app/src/main/cpp/MicroPhoto.cpp +++ b/app/src/main/cpp/MicroPhoto.cpp @@ -273,7 +273,8 @@ Java_com_xypower_mpapp_MicroPhotoService_init( JNIEnv* env, jobject pThis, jstring appPath, jstring ip, jint port, jstring cmdid, jint protocol, - jint networkProtocol, jint encryptData, jlong netHandle, jint signalLevel, jint versionCode, jstring simcard) { + jint networkProtocol, jint encryptData, jlong netHandle, jint signalLevel, + jint versionCode, jlong buildTime, jstring simcard) { /* google_breakpad::MinidumpDescriptor descriptor("."); @@ -315,6 +316,7 @@ Java_com_xypower_mpapp_MicroPhotoService_init( CPhoneDevice* device = new CPhoneDevice(vm, pThis, appPathStr, NETID_UNSET, versionCode); device->SetListener(pTerminal); device->UpdateSignalLevel(signalLevel); + device->SetBuildTime(buildTime / 1000); device->UpdateSimcard(simcardStr); pTerminal->InitServerInfo(appPathStr, cmdidStr, ipStr, port, udpOrTcp, encryptData); diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index b6e21b00..6e7f0fe3 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -175,6 +175,7 @@ CPhoneDevice::CPhoneDevice(JavaVM* vm, jobject service, const std::string& appPa m_signalLevel = 0; m_signalLevelUpdateTime = time(NULL); + mBuildTime = 0; RegisterHandlerForSignal(SIGUSR2); @@ -367,6 +368,8 @@ bool CPhoneDevice::QuerySystemProperties(std::map& pro version += std::to_string((mVersionCode % 100000) / 1000); version += "."; version += std::to_string(mVersionCode % 1000); + + version += " " + FormatLocalTime(mBuildTime); it->second = version; } else if (it->first == PROP_PROD_DATE) diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index e05a10f2..49515801 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -202,6 +202,10 @@ public: void UpdatePosition(double lon, double lat, double radius, time_t ts); bool OnVideoReady(bool result, const char* path, unsigned int photoId); void UpdateSignalLevel(int signalLevel); + void SetBuildTime(time_t buildTime) + { + mBuildTime = buildTime; + } void UpdateSimcard(const std::string& simcard); protected: @@ -282,6 +286,7 @@ protected: const CFG_RECOGNIZATION* m_pRecognizationCfg; unsigned int mNetId; unsigned int mVersionCode; + time_t mBuildTime; atomic_ulong m_timerUidFeed; atomic_ulong m_wakelockIdFeed; diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index 4ba53444..1d8d6304 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -675,7 +675,7 @@ public class MicroPhotoService extends Service { simcard = ""; } - service.mNativeHandle = init(appPath, server, port, cmdid, protocol, networkProtocol, encryptData, 0, service.getSignalLevel(), versionCode, simcard); + service.mNativeHandle = init(appPath, server, port, cmdid, protocol, networkProtocol, encryptData, 0, service.getSignalLevel(), versionCode, BuildConfig.BUILD_TIMESTAMP, simcard); if (service.mNativeHandle != 0) { isRunning = true; @@ -1127,7 +1127,7 @@ CellSignalStrengthGsm cellSignalStrengthGsm = cellInfoGsm.getCellSignalStrength( cellSignalStrengthGsm.getDbm(); */ - protected native long init(String appPath, String ip, int port, String cmdid, int protocol, int networkProtocl, int encryptData, long netHandle, int signalLevel, int versionCode, String simcard); + protected native long init(String appPath, String ip, int port, String cmdid, int protocol, int networkProtocl, int encryptData, long netHandle, int signalLevel, int versionCode, long buildTime, String simcard); protected native long getHeartbeatDuration(long handler); protected native long[] getPhotoTimeData(long handler, long startTime); protected native long[] getPhotoTimeData2(long handler);