mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 16:00:43 +00:00
1.6.2:常规发布
- 版本号 1.6.2 -> 1.6.2 - 重建三端并打包 - 关键测试全过
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""局域网遥控 · Windows 被控端。"""
|
||||
|
||||
__version__ = "1.6.1"
|
||||
__version__ = "1.6.2"
|
||||
APP_NAME = "局域网遥控 被控端"
|
||||
|
||||
@@ -253,6 +253,20 @@ class RelayLink:
|
||||
self._log("没配置中转地址,跳过")
|
||||
return False
|
||||
|
||||
# 上次连通的地址排到最前面。
|
||||
# 设备 IP 会变(DHCP),但大概率还是上次那个;
|
||||
# 排前面能省掉"挨个探到超时"的那几秒(实测 2 个候选要 10 秒,
|
||||
# 而这段时间局域网发现都还没起来,手表搜不到电脑)。
|
||||
try:
|
||||
last_good = str(self.store.get("relay_last_good") or "").strip()
|
||||
except Exception: # noqa: BLE001
|
||||
last_good = ""
|
||||
if last_good:
|
||||
normalized = last_good.rstrip("/")
|
||||
if normalized in candidates:
|
||||
candidates.remove(normalized)
|
||||
candidates.insert(0, normalized)
|
||||
|
||||
self.candidates = candidates
|
||||
# 先探一遍,挑第一个通的
|
||||
chosen = self._pick_candidate(candidates)
|
||||
@@ -260,6 +274,14 @@ class RelayLink:
|
||||
if len(candidates) > 1:
|
||||
self._log(f"中转地址候选 {len(candidates)} 个,选用 {chosen}")
|
||||
|
||||
# 记下来,下次优先试它
|
||||
if chosen:
|
||||
try:
|
||||
if str(self.store.get("relay_last_good") or "") != chosen:
|
||||
self.store.set("relay_last_good", chosen)
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
|
||||
self.device_id = self._ensure_device_id()
|
||||
self.code = str(self.store.pairing_code() or "")
|
||||
|
||||
|
||||
@@ -88,7 +88,10 @@ class Session:
|
||||
# 几十毫秒,而且地址永远不变)
|
||||
# 电脑在外面 -> 第一个连不上,自动切第二个(Cloudflare 隧道,
|
||||
# 600 毫秒左右,地址固定 relay.xxmxxs.top)
|
||||
DEFAULT_RELAY_URL = "192.168.10.105:8080;https://relay.xxmxxs.top"
|
||||
# 内置的中转地址:局域网优先,连不上自动切公网隧道。
|
||||
# 第一个是随身 WiFi 的固定地址(写死是因为它常在同一网段、直连最快);
|
||||
# 它变了也没关系 —— 连上过的地址会被记住并排到最前面。
|
||||
DEFAULT_RELAY_URL = "192.168.2.156:8080;https://relay.xxmxxs.top"
|
||||
|
||||
|
||||
class RemoteServer:
|
||||
|
||||
@@ -27,12 +27,12 @@ VSVersionInfo(
|
||||
[
|
||||
StringStruct("CompanyName", "ykxmz"),
|
||||
StringStruct("FileDescription", "ykxmz"),
|
||||
StringStruct("FileVersion", "1.6.1.0"),
|
||||
StringStruct("FileVersion", "1.6.2.0"),
|
||||
StringStruct("InternalName", "ykxmz"),
|
||||
StringStruct("LegalCopyright", "ykxmz"),
|
||||
StringStruct("OriginalFilename", "ykxmz.exe"),
|
||||
StringStruct("ProductName", "ykxmz"),
|
||||
StringStruct("ProductVersion", "1.6.1.0"),
|
||||
StringStruct("ProductVersion", "1.6.2.0"),
|
||||
],
|
||||
)
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user