chengma/cmautobuy
2
0
Fork 0
Code Issues 89 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 Wi-Fi ADB 拔线后刷新丢失 (#27)

Browse Source
This commit is contained in:
chengma
2026-08-07 15:12:32 +08:00
parent ffaeb55a25
commit 57503978bd
4 changed files with 212 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/test/test_android_device_service.py
+39 -48
View File
@@ -101,6 +101,33 @@ USB-002 unauthorized usb:1-2 transport_id:3
["adb", "connect", "192.168.0.173:5555"],
)
def test_restore_saved_wifi_waits_for_authorization_handshake(self):
device_list_count = 0
sleeps = []
def runner(command, _timeout):
nonlocal device_list_count
command = list(command)
if command[:2] == ["adb", "connect"]:
return completed(command, "connected to 192.168.0.173:5555\n")
if command == ["adb", "devices", "-l"]:
device_list_count += 1
status = "unauthorized" if device_list_count == 1 else "device"
return completed(
command,
"List of devices attached\n"
f"192.168.0.173:5555 {status} model:Phone\n",
)
return completed(command, "14\n")
devices = AndroidDeviceService(
runner,
sleeper=sleeps.append,
).restore_saved_device("192.168.0.173:5555")
self.assertEqual(devices[0].status, "device")
self.assertEqual(sleeps, [0.25])
def test_restore_saved_usb_only_searches(self):
commands = []
@@ -175,12 +202,10 @@ USB-002 unauthorized usb:1-2 transport_id:3
with self.assertRaisesRegex(AndroidDeviceSearchError, "didn't ACK"):
AndroidDeviceService(runner).search()
def test_convert_usb_to_wifi_reconnects_after_usb_is_removed(self):
def test_convert_usb_to_wifi_connects_while_usb_is_attached(self):
commands = []
device_list_count = 0
def runner(command, _timeout):
nonlocal device_list_count
command = list(command)
commands.append(command)
if command[-3:] == ["shell", "ip", "route"]:
@@ -192,16 +217,10 @@ USB-002 unauthorized usb:1-2 transport_id:3
if command[:2] == ["adb", "connect"]:
return completed(command, "connected to 192.168.0.173:5555\n")
if command == ["adb", "devices", "-l"]:
device_list_count += 1
usb_line = (
"USB-001 device model:Phone\n"
if device_list_count == 1
else ""
)
return completed(
command,
"List of devices attached\n"
f"{usb_line}"
"USB-001 device model:Phone\n"
"192.168.0.173:5555 device model:Phone\n",
)
if command[-1] == "ro.build.version.release":
@@ -209,12 +228,7 @@ USB-002 unauthorized usb:1-2 transport_id:3
return completed(command, "restarting in TCP mode port: 5555\n")
progress = []
service = AndroidDeviceService(
runner,
usb_disconnect_timeout_seconds=0.03,
usb_poll_interval_seconds=0.01,
sleeper=lambda _seconds: None,
)
service = AndroidDeviceService(runner)
result = service.convert_usb_to_wifi(
"USB-001",
@@ -222,41 +236,23 @@ USB-002 unauthorized usb:1-2 transport_id:3
)
self.assertEqual(result.wifi_serial, "192.168.0.173:5555")
self.assertEqual(result.devices[0].connection_type, "Wi-Fi")
self.assertEqual(
[device.serial for device in result.devices],
["USB-001", "192.168.0.173:5555"],
)
self.assertIn(
["adb", "-s", "USB-001", "tcpip", "5555"],
commands,
)
self.assertEqual(
commands.count(["adb", "connect", "192.168.0.173:5555"]),
2,
1,
)
self.assertTrue(any("拔掉 USB" in message for message in progress))
def test_convert_usb_to_wifi_times_out_without_unplug(self):
def runner(command, _timeout):
command = list(command)
if command[-3:] == ["shell", "ip", "route"]:
return completed(command, "local src 192.168.0.173\n")
if command[:2] == ["adb", "connect"]:
return completed(command, "connected to 192.168.0.173:5555\n")
if command == ["adb", "devices", "-l"]:
return completed(
command,
"List of devices attached\nUSB-001 device\n",
)
return completed(command, "restarting in TCP mode port: 5555\n")
service = AndroidDeviceService(
runner,
usb_disconnect_timeout_seconds=0.03,
usb_poll_interval_seconds=0.01,
sleeper=lambda _seconds: None,
self.assertEqual(commands.count(["adb", "devices", "-l"]), 3)
self.assertTrue(
any("保存后拔掉 USB" in message for message in progress)
)
with self.assertRaisesRegex(AndroidDeviceSearchError, "拔出 USB 超时"):
service.convert_usb_to_wifi("USB-001")
def test_convert_usb_to_wifi_rejects_wifi_serial(self):
with self.assertRaisesRegex(AndroidDeviceSearchError, "已经是 Wi-Fi"):
AndroidDeviceService().convert_usb_to_wifi(
@@ -278,12 +274,7 @@ USB-002 unauthorized usb:1-2 transport_id:3
)
return completed(command, "restarting in TCP mode port: 5555\n")
service = AndroidDeviceService(
runner,
usb_disconnect_timeout_seconds=0.03,
usb_poll_interval_seconds=0.01,
sleeper=lambda _seconds: None,
)
service = AndroidDeviceService(runner, sleeper=lambda _seconds: None)
with self.assertRaisesRegex(AndroidDeviceSearchError, "状态为 offline"):
service.convert_usb_to_wifi("USB-001")
client/test/test_settings_ui_event.py
+98 -3
View File
@@ -88,7 +88,7 @@ class ControlledWifiConversionService:
):
self.call_count += 1
if on_progress is not None:
on_progress("已开启 192.168.0.173:5555，请拔掉 USB 数据线…")
on_progress("正在连接 Wi-Fi 设备 192.168.0.173:5555…")
if self.delay:
time.sleep(self.delay)
if is_cancelled is not None and is_cancelled():
@@ -99,7 +99,10 @@ class ControlledWifiConversionService:
wifi_serial = "192.168.0.173:5555"
return AndroidWifiConversionResult(
wifi_serial,
[AndroidDevice(wifi_serial, "Wi-Fi", "Phone", "14")],
[
AndroidDevice(usb_serial, "USB", "Phone", "14"),
AndroidDevice(wifi_serial, "Wi-Fi", "Phone", "14"),
],
)
@@ -479,6 +482,64 @@ class SettingsPageEventTest(unittest.TestCase):
page.eventBinder.shutdown()
page.deleteLater()
def test_manual_search_reconnects_saved_wifi_before_refresh(self):
wifi_serial = "192.168.0.173:5555"
self.repository.set(SELECTED_ANDROID_SERIAL_KEY, wifi_serial)
service = SequenceAndroidDeviceService(
[
[AndroidDevice(wifi_serial, "Wi-Fi", "Phone", "14")],
[AndroidDevice(wifi_serial, "Wi-Fi", "Phone", "14")],
]
)
page = SettingsPage(
settings_repository=self.repository,
admin_gateway=MockAdminGateway(),
android_device_service=service,
)
self._wait_until(lambda: service.call_count == 1)
self._wait_until(lambda: page.eventBinder._search_thread is None)
page.searchButton.click()
self._wait_until(lambda: service.call_count == 2)
self._wait_until(lambda: page.eventBinder._search_thread is None)
self.assertEqual(service.restore_serials, [wifi_serial, wifi_serial])
self.assertEqual(page.deviceTableModel.checked_serial, wifi_serial)
self.assertIn("搜索完成", page.deviceStatusLabel.text())
page.eventBinder.shutdown()
page.deleteLater()
def test_manual_wifi_reconnect_failure_keeps_saved_device(self):
wifi_serial = "192.168.0.173:5555"
self.repository.set(SELECTED_ANDROID_SERIAL_KEY, wifi_serial)
service = SequenceAndroidDeviceService(
[
[AndroidDevice(wifi_serial, "Wi-Fi", "Phone", "14")],
AndroidDeviceSearchError("目标设备拒绝连接"),
]
)
page = SettingsPage(
settings_repository=self.repository,
admin_gateway=MockAdminGateway(),
android_device_service=service,
)
self._wait_until(lambda: service.call_count == 1)
self._wait_until(lambda: page.eventBinder._search_thread is None)
page.searchButton.click()
self._wait_until(lambda: service.call_count == 2)
self._wait_until(lambda: page.eventBinder._search_thread is None)
self.assertEqual(
self.repository.get(SELECTED_ANDROID_SERIAL_KEY),
wifi_serial,
)
self.assertEqual(page.deviceTableModel.checked_serial, wifi_serial)
self.assertIn("无法重新连接", page.deviceStatusLabel.text())
self.assertIn("已保存配置未更改", page.deviceStatusLabel.text())
page.eventBinder.shutdown()
page.deleteLater()
def test_startup_restore_failure_keeps_saved_configuration(self):
wifi_serial = "192.168.0.173:5555"
self.repository.set(SELECTED_ANDROID_SERIAL_KEY, wifi_serial)
@@ -504,6 +565,31 @@ class SettingsPageEventTest(unittest.TestCase):
page.eventBinder.shutdown()
page.deleteLater()
def test_saved_wifi_waiting_for_authorization_has_clear_message(self):
wifi_serial = "192.168.0.173:5555"
self.repository.set(SELECTED_ANDROID_SERIAL_KEY, wifi_serial)
service = SequenceAndroidDeviceService(
[[AndroidDevice(wifi_serial, "Wi-Fi", status="unauthorized")]]
)
page = SettingsPage(
settings_repository=self.repository,
admin_gateway=MockAdminGateway(),
android_device_service=service,
)
self._wait_until(lambda: service.call_count == 1)
self._wait_until(lambda: page.eventBinder._search_thread is None)
self.assertEqual(page.deviceTableModel.checked_serial, "")
self.assertIn("尚未授权", page.deviceStatusLabel.text())
self.assertIn("请在手机上允许调试", page.deviceStatusLabel.text())
self.assertEqual(
self.repository.get(SELECTED_ANDROID_SERIAL_KEY),
wifi_serial,
)
page.eventBinder.shutdown()
page.deleteLater()
def test_slow_startup_restore_keeps_main_thread_responsive(self):
self.repository.set(SELECTED_ANDROID_SERIAL_KEY, "USB-001")
service = SlowAndroidDeviceService()
@@ -729,11 +815,20 @@ class SettingsPageEventTest(unittest.TestCase):
page.deviceTableModel.checked_serial,
"192.168.0.173:5555",
)
self.assertIsNotNone(
page.deviceTableModel.device_for_serial("USB-001")
)
self.assertIsNotNone(
page.deviceTableModel.device_for_serial(
"192.168.0.173:5555"
)
)
self.assertEqual(
self.repository.get(SELECTED_ANDROID_SERIAL_KEY),
"USB-OLD",
)
self.assertIn("已连接并勾选", page.deviceStatusLabel.text())
self.assertIn("保存，再拔掉 USB", page.deviceStatusLabel.text())
self.assertTrue(page.saveButton.isEnabled())
self.assertFalse(page.convertWifiButton.isEnabled())
page.eventBinder.shutdown()
@@ -741,7 +836,7 @@ class SettingsPageEventTest(unittest.TestCase):
def test_convert_wifi_failure_preserves_list_and_saved_configuration(self):
service = ControlledWifiConversionService(
error=AndroidDeviceSearchError("等待拔出 USB 超时")
error=AndroidDeviceSearchError("Wi-Fi 连接验证失败")
)
self.repository.set(SELECTED_ANDROID_SERIAL_KEY, "USB-OLD")
page = SettingsPage(