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 = 25
+def AppBuildNumber = 26
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/PhoneDevice.cpp

@@ -1920,7 +1920,6 @@ bool CPhoneDevice::OpenPTZSensors(uint32_t sec)
         std::lock_guard<std::mutex> lock(m_cameraLocker);
         if(time_now < localDelayTime-1000)
         {
-            std::lock_guard<std::mutex> lock(m_cameraLocker);
             m_sensorsStatus = true;
             m_cameraStatus = true;
             OpenSensors(MAIN_POWER_OPEN);
@@ -3690,70 +3689,14 @@ void CPhoneDevice::CameraCtrl(unsigned char waitTime, unsigned char delayTime, u
 {
     if(!(m_sensorsStatus && !m_cameraStatus)) {
         CPhoneDevice *pThis = this;
-        std::thread ctrlThread([pThis, waitTime, delayTime, cmdidx, channel, preset, serfile, baud,
+        string serfileStr(serfile);
+        std::thread ctrlThread([pThis, waitTime, delayTime, cmdidx, channel, preset, serfileStr, baud,
                                        addr]() mutable {
-            switch (cmdidx) {
-                case 2: {
-//				if(GetCameraStatus())
-
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(time(NULL), channel, MOVE_PRESETNO, 0, preset, serfile, baud,
-                                   addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 3: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(0, channel, MOVE_UP, 0, 0, serfile, baud, addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 4: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(0, channel, MOVE_DOWN, 0, 0, serfile, baud, addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 5: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(0, channel, MOVE_LEFT, 0, 0, serfile, baud, addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 6: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(0, channel, MOVE_RIGHT, 0, 0, serfile, baud, addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 7: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(0, channel, ZOOM_WIDE, 0, 0, serfile, baud, addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 8: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(0, channel, ZOOM_TELE, 0, 0, serfile, baud, addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
-                case 9: {
-//				if(GetCameraStatus())
-                    pThis->OpenPTZSensors(waitTime);
-                    CameraPhotoCmd(time(NULL), channel, SAVE_PRESETNO, 0, preset, serfile, baud,
-                                   addr);
-                    pThis->ClosePTZSensors(delayTime);
-                    break;
-                }
 
-            }
+            pThis->OpenPTZSensors(waitTime);
+            CameraPhotoCmd(time(NULL), channel, cmdidx, 0, preset, serfileStr.c_str(), baud,
+                           addr);
+            pThis->ClosePTZSensors(delayTime);
         });
         ctrlThread.detach();
     }