调整重拍机制

失败后等待数秒再重拍

app/src/main/cpp/PhoneDevice.cpp

@@ -596,12 +596,12 @@ void CPhoneDevice::handleTimerImpl(CPhoneDevice::TIMER_CONTEXT* context)
     {
         if (m_listener != NULL)
         {
-            m_listener->OnTimeout(context->uid, context->timerType, context->times);
+            m_listener->OnTimeout(context->uid, context->timerType, context->data, context->times);
         }
     }
 }
 
-IDevice::timer_uid_t CPhoneDevice::RegisterTimer(unsigned int timerType, unsigned int timeout, unsigned long times/* = 0*/)
+IDevice::timer_uid_t CPhoneDevice::RegisterTimer(unsigned int timerType, unsigned int timeout, void* data, unsigned long times/* = 0*/)
 {
     struct sigevent evp = { 0 };
     struct itimerspec ts = { 0 };
@@ -610,6 +610,7 @@ IDevice::timer_uid_t CPhoneDevice::RegisterTimer(unsigned int timerType, unsigne
 
     TIMER_CONTEXT* context = new TIMER_CONTEXT();
     context->device = this;
+    context->data = data;
     context->timerType = timerType;
     context->expectedTimes = times;
 

app/src/main/cpp/PhoneDevice.h

@@ -168,6 +168,7 @@ public:
         CPhoneDevice* device;
         unsigned int timerType;
         unsigned long times;
+		void* data;
 		unsigned long expectedTimes;
         unsigned long uid;
     };
@@ -187,7 +188,7 @@ public:
     virtual timer_uid_t RegisterHeartbeat(unsigned int timerType, unsigned int timeout);
 	virtual bool TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<OSD_INFO>& osds, const std::string& path);
 	virtual bool CloseCamera();
-    virtual timer_uid_t RegisterTimer(unsigned int timerType, unsigned int timeout, unsigned long times = 0);
+    virtual timer_uid_t RegisterTimer(unsigned int timerType, unsigned int timeout, void* data, unsigned long times = 0);
     virtual bool UnregisterTimer(timer_uid_t uid);
     virtual unsigned long RequestWakelock(unsigned long timeout);
     virtual bool ReleaseWakelock(unsigned long wakelock);

app/src/main/cpp/PhoneDevice2.cpp

@@ -225,7 +225,7 @@ bool CPhoneDevice2::FireTimer(timer_uid_t uid)
         return false;
     }
 
-    m_listener->OnTimeout(uid, timerType, times);
+    m_listener->OnTimeout(uid, timerType, NULL, times);
 
     return true;
 }

app/src/main/java/com/xypower/mpapp/MainActivity.java

@@ -483,6 +483,8 @@ public class MainActivity extends AppCompatActivity {
 
                 String cameraInfo = CameraUtils.getAllCameraInfo(view.getContext());
 
+                Log.d(TAG, cameraInfo);
+
                 SysApi.setCam3V3Enable(false);
                 SysApi.setOtgState(false);