From 3d3a02158ed320747ac9a7b5702d5faa7a79db8b Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 19 Feb 2025 10:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BD=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 8 ++++---- app/src/main/cpp/PhoneDevice.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index f3d9328e..bfa69e76 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1500,7 +1500,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c SetStaticIp(); std::this_thread::sleep_for(std::chrono::milliseconds(256)); - net_handle_t netHandle = GetNetHandle(); + net_handle_t netHandle = GetEthnetHandle(); if (netHandle == 0) { @@ -1508,7 +1508,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c for (int idx = 0; idx < 84; idx++) { std::this_thread::sleep_for(std::chrono::milliseconds(128)); - netHandle = GetNetHandle(); + netHandle = GetEthnetHandle(); if (netHandle != 0) { @@ -1584,7 +1584,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c bool netCaptureResult = false; for (int idx = 0; idx < 3; idx++) { - netHandle = GetNetHandle(); + netHandle = GetEthnetHandle(); netPhotoInfo.netHandle = netHandle; XYLOG(XYLOG_SEVERITY_INFO, "NetCapture %d NetHandle=%lld PHOTOID=%u", idx, netHandle, localPhotoInfo.photoId); @@ -3754,7 +3754,7 @@ void CPhoneDevice::UpdateEthernet(net_handle_t nethandle, bool available) XYLOG(XYLOG_SEVERITY_WARNING, "NET Handle: %lld", available ? (uint64_t)nethandle : 0); } -net_handle_t CPhoneDevice::GetNetHandle() const +net_handle_t CPhoneDevice::GetEthnetHandle() const { net_handle_t nethandle = NETWORK_UNSPECIFIED; m_devLocker.lock(); diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index ec07c831..fa9e9fed 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -262,7 +262,7 @@ public: void UpdateSimcard(const std::string& simcard); void UpdateEthernet(net_handle_t nethandle, bool available); - net_handle_t GetNetHandle() const; + net_handle_t GetEthnetHandle() const; protected: