云台拍摄短视频、推流网络处理

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<PowerControl> ethernetPowerCtrl = std::make_shared<EthernetPowerCtrl>(1);
     // std::shared_ptr<PowerControl> 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<PowerControl> ethernetPowerCtrl = std::make_shared<EthernetPowerCtrl>(1);
         // std::shared_ptr<PowerControl> 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<uint8_t, STREAMING_CONTEXT>::iterator it = m_streamings.find(photoInfo.channel);