xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

优化函数名称

Browse Source
streaming
Matthew 4 months ago
parent e0ed5615c3
commit 3d3a02158e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -1500,7 +1500,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
SetStaticIp(); SetStaticIp();
std::this_thread::sleep_for(std::chrono::milliseconds(256)); std::this_thread::sleep_for(std::chrono::milliseconds(256));
net_handle_t netHandle = GetNetHandle(); net_handle_t netHandle = GetEthnetHandle();
if (netHandle == 0) if (netHandle == 0)
{ {
@ -1508,7 +1508,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
for (int idx = 0; idx < 84; idx++) for (int idx = 0; idx < 84; idx++)
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(128)); std::this_thread::sleep_for(std::chrono::milliseconds(128));
netHandle = GetNetHandle(); netHandle = GetEthnetHandle();
if (netHandle != 0) if (netHandle != 0)
{ {
@ -1584,7 +1584,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
bool netCaptureResult = false; bool netCaptureResult = false;
for (int idx = 0; idx < 3; idx++) for (int idx = 0; idx < 3; idx++)
{ {
netHandle = GetNetHandle(); netHandle = GetEthnetHandle();
netPhotoInfo.netHandle = netHandle; netPhotoInfo.netHandle = netHandle;
XYLOG(XYLOG_SEVERITY_INFO, "NetCapture %d NetHandle=%lld PHOTOID=%u", idx, netHandle, localPhotoInfo.photoId); 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); 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; net_handle_t nethandle = NETWORK_UNSPECIFIED;
m_devLocker.lock(); m_devLocker.lock();

2
app/src/main/cpp/PhoneDevice.h
Unescape Escape View File

@ -262,7 +262,7 @@ public:
void UpdateSimcard(const std::string& simcard); void UpdateSimcard(const std::string& simcard);
void UpdateEthernet(net_handle_t nethandle, bool available); void UpdateEthernet(net_handle_t nethandle, bool available);
net_handle_t GetNetHandle() const; net_handle_t GetEthnetHandle() const;
protected: protected:

Write Preview
Loading…
Cancel
Save