From ab9ba337dca3f5b941dc5d45a431111b7cd452f5 Mon Sep 17 00:00:00 2001
From: "XI.CHEN" <2311041011@qq.com>
Date: Thu, 19 Dec 2024 09:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E5=8F=B0=E5=91=BD=E4=BB=A4=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E5=85=B3=E7=B3=BB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/PhoneDevice.cpp | 65 ++------------------------------
 1 file changed, 4 insertions(+), 61 deletions(-)

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();
     }