From 4bddca2cd2cc2888b93b3ba7c543bfc074edfa93 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 2 Dec 2024 15:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/GPIOControl.h | 6 +++++- app/src/main/cpp/PhoneDevice.cpp | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h index 5bc283ad..d6d72b93 100644 --- a/app/src/main/cpp/GPIOControl.h +++ b/app/src/main/cpp/GPIOControl.h @@ -178,7 +178,11 @@ public: static bool getOtgState() { - return getInt(CMD_SET_OTG_STATE) != 0; +#ifndef USING_N938 + return getInt(CMD_GET_OTG_STATE) != 0; +#else + return false; +#endif } static void setCam3V3Enable(bool enabled) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 764af250..811dd501 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1549,8 +1549,9 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< std::thread t([localPhotoInfo, path, pThis, osds]() mutable { // AutoEnv autoEnv(pThis->m_vm); - - std::this_thread::sleep_for(std::chrono::milliseconds(10240)); + uint32_t waitTime = localPhotoInfo.selfTestingTime; + waitTime = (waitTime!= 0) ? (waitTime * 1024) : 10240; + std::this_thread::sleep_for(std::chrono::milliseconds(waitTime)); net_handle_t netHandle = pThis->GetNetHandle();