tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup entity creation

Browse Source
This commit is contained in:
michal.szwaj 2018-04-06 20:33:27 +02:00
parent 24bbe66954
commit 675e6cfcf6
2 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/f1x/openauto/autoapp/App.hpp
View File

@ -48,7 +48,6 @@ public:
private: private:
using std::enable_shared_from_this<App>::shared_from_this; using std::enable_shared_from_this<App>::shared_from_this;
void enumerateDevices(); void enumerateDevices();
void waitForDevice(); void waitForDevice();
void aoapDeviceHandler(aasdk::usb::DeviceHandle deviceHandle); void aoapDeviceHandler(aasdk::usb::DeviceHandle deviceHandle);

77
src/autoapp/App.cpp
View File

@ -54,29 +54,28 @@ void App::waitForUSBDevice()
void App::start(aasdk::tcp::ITCPEndpoint::SocketPointer socket) void App::start(aasdk::tcp::ITCPEndpoint::SocketPointer socket)
{ {
strand_.dispatch([this, self = this->shared_from_this(), socket = std::move(socket)]() mutable { strand_.dispatch([this, self = this->shared_from_this(), socket = std::move(socket)]() mutable {
if(androidAutoEntity_ == nullptr) if(androidAutoEntity_ != nullptr)
{
try
{
usbHub_->cancel();
connectedAccessoriesEnumerator_->cancel();
auto tcpEndpoint(std::make_shared<aasdk::tcp::TCPEndpoint>(tcpWrapper_, std::move(socket)));
androidAutoEntity_ = androidAutoEntityFactory_.create(std::move(tcpEndpoint));
androidAutoEntity_->start(*this);
}
catch(const aasdk::error::Error& error)
{
OPENAUTO_LOG(error) << "[App] TCP AndroidAutoEntity create error: " << error.what();
androidAutoEntity_.reset();
this->waitForDevice();
}
}
else
{ {
tcpWrapper_.close(*socket); tcpWrapper_.close(*socket);
OPENAUTO_LOG(warning) << "[App] android auto entity is still running."; OPENAUTO_LOG(warning) << "[App] android auto entity is still running.";
return;
}
try
{
usbHub_->cancel();
connectedAccessoriesEnumerator_->cancel();
auto tcpEndpoint(std::make_shared<aasdk::tcp::TCPEndpoint>(tcpWrapper_, std::move(socket)));
androidAutoEntity_ = androidAutoEntityFactory_.create(std::move(tcpEndpoint));
androidAutoEntity_->start(*this);
}
catch(const aasdk::error::Error& error)
{
OPENAUTO_LOG(error) << "[App] TCP AndroidAutoEntity create error: " << error.what();
androidAutoEntity_.reset();
this->waitForDevice();
} }
}); });
} }
@ -91,6 +90,7 @@ void App::stop()
if(androidAutoEntity_ != nullptr) if(androidAutoEntity_ != nullptr)
{ {
androidAutoEntity_->stop(); androidAutoEntity_->stop();
androidAutoEntity_.reset();
} }
}); });
} }
@ -99,27 +99,26 @@ void App::aoapDeviceHandler(aasdk::usb::DeviceHandle deviceHandle)
{ {
OPENAUTO_LOG(info) << "[App] Device connected."; OPENAUTO_LOG(info) << "[App] Device connected.";
if(androidAutoEntity_ == nullptr) if(androidAutoEntity_ != nullptr)
{
try
{
connectedAccessoriesEnumerator_->cancel();
auto aoapDevice(aasdk::usb::AOAPDevice::create(usbWrapper_, ioService_, deviceHandle));
androidAutoEntity_ = androidAutoEntityFactory_.create(std::move(aoapDevice));
androidAutoEntity_->start(*this);
}
catch(const aasdk::error::Error& error)
{
OPENAUTO_LOG(error) << "[App] USB AndroidAutoEntity create error: " << error.what();
androidAutoEntity_.reset();
this->waitForDevice();
}
}
else
{ {
OPENAUTO_LOG(warning) << "[App] android auto entity is still running."; OPENAUTO_LOG(warning) << "[App] android auto entity is still running.";
return;
}
try
{
connectedAccessoriesEnumerator_->cancel();
auto aoapDevice(aasdk::usb::AOAPDevice::create(usbWrapper_, ioService_, deviceHandle));
androidAutoEntity_ = androidAutoEntityFactory_.create(std::move(aoapDevice));
androidAutoEntity_->start(*this);
}
catch(const aasdk::error::Error& error)
{
OPENAUTO_LOG(error) << "[App] USB AndroidAutoEntity create error: " << error.what();
androidAutoEntity_.reset();
this->waitForDevice();
} }
} }