mirror of
https://github.com/x-tools-author/x-tools.git
synced 2025-09-15 15:28:40 +08:00
chore: enable code
This commit is contained in:
parent
b3be8012ea
commit
1c53e637ea
@ -15,46 +15,38 @@ xToolsBleDeviceInfoComboBox::xToolsBleDeviceInfoComboBox(QWidget* parent)
|
|||||||
: xToolsComboBox(parent)
|
: xToolsComboBox(parent)
|
||||||
, mScanner(Q_NULLPTR)
|
, mScanner(Q_NULLPTR)
|
||||||
{
|
{
|
||||||
#if 0
|
mScanner = new xToolsBleScanner(this);
|
||||||
mScanner = new SAKBleScanner(this);
|
connect(mScanner, &xToolsBleScanner::finished, this, &xToolsBleDeviceInfoComboBox::onFinished);
|
||||||
connect(mScanner, &SAKBleScanner::finished,
|
connect(mScanner, &xToolsBleScanner::started, this, &xToolsBleDeviceInfoComboBox::started);
|
||||||
this, &SAKBluetoothDeviceInfoComboBox::onFinished);
|
connect(mScanner,
|
||||||
connect(mScanner, &SAKBleScanner::started,
|
&xToolsBleScanner::deviceDiscovered,
|
||||||
this, &SAKBluetoothDeviceInfoComboBox::started);
|
this,
|
||||||
connect(mScanner, &SAKBleScanner::deviceDiscovered,
|
&xToolsBleDeviceInfoComboBox::onDeviceDiscovered);
|
||||||
this, &SAKBluetoothDeviceInfoComboBox::onDeviceDiscovered);
|
connect(mScanner,
|
||||||
connect(mScanner, &SAKBleScanner::errorOccurred,
|
&xToolsBleScanner::errorOccurred,
|
||||||
this, &SAKBluetoothDeviceInfoComboBox::onErrorOccurred);
|
this,
|
||||||
#endif
|
&xToolsBleDeviceInfoComboBox::onErrorOccurred);
|
||||||
}
|
}
|
||||||
|
|
||||||
xToolsBleDeviceInfoComboBox::~xToolsBleDeviceInfoComboBox()
|
xToolsBleDeviceInfoComboBox::~xToolsBleDeviceInfoComboBox()
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
mScanner->stopDiscover();
|
mScanner->stopDiscover();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void xToolsBleDeviceInfoComboBox::startDiscover()
|
void xToolsBleDeviceInfoComboBox::startDiscover()
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
clear();
|
clear();
|
||||||
mScanner->startDiscover();
|
mScanner->startDiscover();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void xToolsBleDeviceInfoComboBox::stopDiscover()
|
void xToolsBleDeviceInfoComboBox::stopDiscover()
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
mScanner->stopDiscover();
|
mScanner->stopDiscover();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool xToolsBleDeviceInfoComboBox::isActive()
|
bool xToolsBleDeviceInfoComboBox::isActive()
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
return mScanner->isActive();
|
return mScanner->isActive();
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,7 +59,7 @@ void xToolsBleDeviceInfoComboBox::setTimeoutInterval(int interval)
|
|||||||
|
|
||||||
void xToolsBleDeviceInfoComboBox::setNameFiltter(const QString& filtter)
|
void xToolsBleDeviceInfoComboBox::setNameFiltter(const QString& filtter)
|
||||||
{
|
{
|
||||||
// mScanner->setNameFiltter(filtter);
|
mScanner->setNameFiltter(filtter);
|
||||||
}
|
}
|
||||||
|
|
||||||
void xToolsBleDeviceInfoComboBox::changeEvent(QEvent* event)
|
void xToolsBleDeviceInfoComboBox::changeEvent(QEvent* event)
|
||||||
@ -80,18 +72,18 @@ void xToolsBleDeviceInfoComboBox::changeEvent(QEvent* event)
|
|||||||
|
|
||||||
void xToolsBleDeviceInfoComboBox::onFinished()
|
void xToolsBleDeviceInfoComboBox::onFinished()
|
||||||
{
|
{
|
||||||
// if (!isEnabled()) {
|
if (!isEnabled()) {
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
|
|
||||||
// clear();
|
clear();
|
||||||
// auto infos = mScanner->devicesInfoList();
|
auto infos = mScanner->devicesInfoList();
|
||||||
// for (auto &info : infos) {
|
for (auto& info : infos) {
|
||||||
// QString name = mScanner->deviceName(info);
|
QString name = mScanner->deviceName(info);
|
||||||
// addItem(name, info);
|
addItem(name, info);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// emit finished();
|
emit finished();
|
||||||
}
|
}
|
||||||
|
|
||||||
void xToolsBleDeviceInfoComboBox::onDeviceDiscovered(const QBluetoothDeviceInfo& info)
|
void xToolsBleDeviceInfoComboBox::onDeviceDiscovered(const QBluetoothDeviceInfo& info)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user