openkylin
/
kylin-connectivity
mirror of https://gitee.com/openkylin/kylin-connectivity.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

🐞 fix(连接): 修复usb设备连接问题 

调整usb连接以及wifi连接时对于adb device的处理逻辑
This commit is contained in:
huheng@kylinos.cn 2023-07-14 15:41:16 +08:00
parent 52c959f8de
commit 2429fe8ecd
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
connectmanage/connectionservice.cpp
View File

@ -616,11 +616,31 @@ void ConnectionService::onAdbExec(AdbProcess::ADB_EXEC_RESULT processResult)
if (m_deviceSerialList.size() > 1) { if (m_deviceSerialList.size() > 1) {
qInfo() << "There are currently multiple wired devices!"; qInfo() << "There are currently multiple wired devices!";
if (m_messageTcpSocket != nullptr) { if (m_messageTcpSocket != nullptr) {
QString serials = "";
for (auto &item : m_deviceSerialList) {
if (item.contains(":5555")) {
serials = item;
break;
}
}
if (!serials.isEmpty()) {
qInfo() << "There are currently WiFi adb devices present!";
// 存在wifiadb
if (isSameDevice(serials)) {
// 同一设备
m_isSupportADB = true;
m_androidConnType = AndroidConnType::WIFIADB;
} else {
m_isSupportADB = false;
m_androidConnType = AndroidConnType::CONNECTWIFI;
}
} else {
// 已存在连接，说明为WiFi连接 // 已存在连接，说明为WiFi连接
qInfo() qInfo()
<< "Currently, there are multiple wired devices, and WiFi anti control is not supported " << "Currently, there are multiple wired devices, and WiFi anti control is not supported "
"temporarily!"; "temporarily!";
m_androidConnType = AndroidConnType::CONNECTWIFI; m_androidConnType = AndroidConnType::CONNECTWIFI;
}
handleConnected(); handleConnected();
} else { } else {
// 不存在连接，当前有多个adb设备连接，暂时不处理 // 不存在连接，当前有多个adb设备连接，暂时不处理