diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index ac43c561..a50cf7fc 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -3692,68 +3692,11 @@ void CPhoneDevice::CameraCtrl(unsigned char waitTime, unsigned char delayTime, u
         CPhoneDevice *pThis = this;
         std::thread ctrlThread([pThis, waitTime, delayTime, cmdidx, channel, preset, serfile, 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, serfile, baud,
+                           addr);
+            pThis->ClosePTZSensors(delayTime);
         });
         ctrlThread.detach();
     }