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

app/src/main/cpp/GPIOControl.cpp

@@ -356,9 +356,9 @@ bool GpioControl::GetSelftestStatus(time_t wait_time)
     std::vector<ITEM>::iterator it;
     for (it = m_items.begin(); it != m_items.end(); ++it)
     {
-        if (it->cmd == cmd && (now - it->openTime >= wait_time))
+        if (it->cmd == cmd && it->openTime!=0 && (now - it->openTime >= wait_time))
         {
-            return true;
+            return true;//自检完成
         }
     }
     return false;

app/src/main/cpp/PhoneDevice.cpp

@@ -1900,6 +1900,15 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
 
         std::thread t([localPhotoInfo, param, pThis, path, osds, wid_serial, powerCtrlPtr]() mutable
         {
+            uint32_t waitTime = localPhotoInfo.selfTestingTime;
+            if(!GpioControl::GetSelftestStatus(waitTime))
+            {
+                XYLOG(XYLOG_SEVERITY_INFO, "Camera is SeltTesting, selfTestingtime=%u", waitTime);
+                waitTime = (waitTime != 0) ? (waitTime * 1024) : 10240;
+                std::this_thread::sleep_for(std::chrono::milliseconds(waitTime));
+                XYLOG(XYLOG_SEVERITY_INFO, "Camera SeltTesting is over");
+            }
+
             if (localPhotoInfo.preset != 0 && localPhotoInfo.preset != 0xFF)
             {
                 XYLOG(XYLOG_SEVERITY_INFO,"Recv CameraCtrl Command, action= MOVE_PRESETNO, preset = %u", localPhotoInfo.preset);