Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

app/build.gradle

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

app/src/main/cpp/PhoneDevice.cpp

@@ -1618,9 +1618,14 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
         }
         if (localPhotoInfo.remedy != 0)
         {
-            if ((takingTime - localPhotoInfo.scheduleTime) > 30)
+            time_t scheduleTime = localPhotoInfo.scheduleTime;
+            if (scheduleTime == 0)
             {
-                takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2;
+                scheduleTime = localPhotoInfo.requestTime;
+            }
+            if ((takingTime - scheduleTime) > 30)
+            {
+                takingTime = scheduleTime + localPhotoInfo.channel * 2;
             }
         }
 
@@ -1857,9 +1862,14 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
                           time_t takingTime = ts;
                           if (localPhotoInfo.remedy != 0)
                           {
-                              if ((takingTime - localPhotoInfo.scheduleTime) > 30)
+                              time_t scheduleTime = localPhotoInfo.scheduleTime;
+                              if (scheduleTime == 0)
+                              {
+                                  scheduleTime = localPhotoInfo.requestTime;
+                              }
+                              if ((takingTime - scheduleTime) > 30)
                               {
-                                  takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2;
+                                  takingTime = scheduleTime + localPhotoInfo.channel * 2;
                               }
                           }
                           IMAGE_DEF photo = { 0 };
@@ -2164,9 +2174,14 @@ bool CPhoneDevice::onOneCapture(std::shared_ptr<ACameraMetadata> characteristics
     time_t takingTime = time(NULL);
     if (mPhotoInfo.remedy != 0)
     {
-        if ((takingTime - mPhotoInfo.scheduleTime) > 30)
+        time_t scheduleTime = mPhotoInfo.scheduleTime;
+        if (scheduleTime == 0)
+        {
+            scheduleTime = mPhotoInfo.requestTime;
+        }
+        if ((takingTime - scheduleTime) > 30)
         {
-            takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
+            takingTime = scheduleTime + mPhotoInfo.channel * 2;
         }
     }
     mPhotoInfo.photoTime = takingTime;
@@ -2295,9 +2310,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
     time_t takingTime = time(NULL);
     if (mPhotoInfo.remedy != 0)
     {
-        if ((takingTime - mPhotoInfo.scheduleTime) > 30)
+        time_t scheduleTime = mPhotoInfo.scheduleTime;
+        if (scheduleTime == 0)
         {
-            takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
+            scheduleTime = mPhotoInfo.requestTime;
+        }
+        if ((takingTime - scheduleTime) > 30)
+        {
+            takingTime = scheduleTime + mPhotoInfo.channel * 2;
         }
     }
     mPhotoInfo.photoTime = takingTime;
@@ -2667,9 +2687,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
     time_t takingTime = time(NULL);
     if (mPhotoInfo.remedy != 0)
     {
-        if ((takingTime - mPhotoInfo.scheduleTime) > 30)
+        time_t scheduleTime = mPhotoInfo.scheduleTime;
+        if (scheduleTime == 0)
+        {
+            scheduleTime = mPhotoInfo.requestTime;
+        }
+        if ((takingTime - scheduleTime) > 30)
         {
-            takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
+            takingTime = scheduleTime + mPhotoInfo.channel * 2;
         }
     }
     mPhotoInfo.photoTime = takingTime;
@@ -3006,9 +3031,14 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
     time_t takingTime = time(NULL);
     if (mPhotoInfo.remedy != 0)
     {
-        if ((takingTime - mPhotoInfo.scheduleTime) > 30)
+        time_t scheduleTime = mPhotoInfo.scheduleTime;
+        if (scheduleTime == 0)
+        {
+            scheduleTime = mPhotoInfo.requestTime;
+        }
+        if ((takingTime - scheduleTime) > 30)
         {
-            takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
+            takingTime = scheduleTime + mPhotoInfo.channel * 2;
         }
     }
     mPhotoInfo.photoTime = takingTime;
@@ -4537,8 +4567,8 @@ void CPhoneDevice::SetStaticIp()
         }
 
         SetStaticIp(m_network->iface, ipStr, m_network->netmask, m_network->gateway);
-        XYLOG(XYLOG_SEVERITY_INFO, "Set Static IP on %s: %s", m_network->iface.c_str(),
-              m_network->ip.c_str());
+        XYLOG(XYLOG_SEVERITY_INFO, "Set Static IP on %s: %s(%s)", m_network->iface.c_str(),
+              m_network->ip.c_str(), ipStr.c_str());
     }
     else
     {