From 4bc9005ebb740b12b66f42991562675d35aeb32a Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 20 May 2025 14:17:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E5=8F=B0=E6=8B=8D=E6=91=84=E7=9F=AD?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E3=80=81=E6=8E=A8=E6=B5=81=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 02f66d76..2e477757 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1816,7 +1816,7 @@ bool CPhoneDevice::TakeVideoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c XYLOG(XYLOG_SEVERITY_DEBUG, "Ethernet Power ON"); std::shared_ptr ethernetPowerCtrl = std::make_shared(1); // std::shared_ptr ethernetPowerCtrl; - +#if ((!defined USING_N938) && (!defined USING_PTZ)) net_handle_t netHandle = GetEthnetHandle(); if (netHandle == 0) { @@ -1846,8 +1846,9 @@ bool CPhoneDevice::TakeVideoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c { XYLOG(XYLOG_SEVERITY_INFO, "Ethernet is Available CH=%u PR=%X PHOTOID=%u", (uint32_t)localPhotoInfo.channel, (uint32_t)localPhotoInfo.preset, localPhotoInfo.photoId); } +#endif - // SetStaticIp(); + SetStaticIp(); std::this_thread::sleep_for(std::chrono::milliseconds(256)); std::string ip = GetIpStr(localPhotoInfo.ip); @@ -1938,7 +1939,7 @@ bool CPhoneDevice::StartPushStreaming(IDevice::PHOTO_INFO& photoInfo, const std: XYLOG(XYLOG_SEVERITY_DEBUG, "Ethernet Power ON"); std::shared_ptr ethernetPowerCtrl = std::make_shared(1); // std::shared_ptr ethernetPowerCtrl; - +#if ((!defined USING_N938) && (!defined USING_PTZ)) net_handle_t netHandle = GetEthnetHandle(); if (netHandle == 0) { @@ -1968,8 +1969,9 @@ bool CPhoneDevice::StartPushStreaming(IDevice::PHOTO_INFO& photoInfo, const std: { XYLOG(XYLOG_SEVERITY_INFO, "Ethernet is Available CH=%u PR=%X PHOTOID=%u", (uint32_t)photoInfo.channel, (uint32_t)photoInfo.preset, photoInfo.photoId); } +#endif - // SetStaticIp(); + SetStaticIp(); std::this_thread::sleep_for(std::chrono::milliseconds(256)); std::map::iterator it = m_streamings.find(photoInfo.channel);