Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 1
-def AppBuildNumber = 30
+def AppBuildNumber = 31
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/PhoneDevice.cpp

@@ -1639,6 +1639,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
         std::thread t([localPhotoInfo, path, pThis, osds, powerCtrlPtr]() mutable
         {
             // AutoEnv autoEnv(pThis->m_vm);
+            time_t ts = time(NULL);
             uint32_t waitTime = localPhotoInfo.selfTestingTime;
             waitTime = (waitTime!= 0) ? (waitTime * 1024) : 10240;
             std::this_thread::sleep_for(std::chrono::milliseconds(waitTime));
@@ -1744,7 +1745,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
 
             if (netCaptureResult)
             {
-                time_t takingTime = time(NULL);
+                time_t takingTime = ts;
                 if (localPhotoInfo.remedy != 0)
                 {
                     if ((takingTime - localPhotoInfo.scheduleTime) > 30)