fix(installer): 保留现场固定热点约定并说明连接要求
安装完成页默认展示现场统一的 SSID 与密码,便于裁判系统连接和现场调试;本地覆盖配置继续用于其他部署。 - fix(installer): 使用共享热点默认值,并修正本地覆盖配置的包含路径 - docs(network): 明确设备按固件中的固定热点参数连接,客户端电脑需接入同一网络,更换热点后需重新编译烧录 - docs(agents): 区分现场统一热点约定与个人 Wi-Fi 配置,保留前者及对应安装说明 验证:无本地配置与带本地覆盖两种 NSIS 配置均编译通过;预处理检查确认热点名称和密码按预期显示;git diff --check。未连接或烧录设备。
This commit is contained in:
@@ -14,15 +14,12 @@
|
||||
!define MUI_DIRECTORYPAGE_TEXT_TOP "软件仅为当前 Windows 用户安装。请选择有写入权限的文件夹。"
|
||||
!define MUI_FINISHPAGE_TITLE "安装完成"
|
||||
; MUI reserves 60 dialog units above the two checkboxes: keep six short lines.
|
||||
; Optional local guidance is excluded from version control.
|
||||
!if /FileExists "${__FILEDIR__}/network.local.nsh"
|
||||
!include "${__FILEDIR__}/network.local.nsh"
|
||||
; Local overrides are optional; shared event defaults are always available.
|
||||
!if /FileExists "${__FILEDIR__}\network.local.nsh"
|
||||
!include "${__FILEDIR__}\network.local.nsh"
|
||||
!endif
|
||||
!ifdef RMIC_INSTALLER_WIFI_SSID & RMIC_INSTALLER_WIFI_PASS
|
||||
!include "${__FILEDIR__}\network.nsh"
|
||||
!define MUI_FINISHPAGE_TEXT "裁判系统客户端已安装完成。$\r$\n首次启动请选择模式并绑定裁判系统。$\r$\n裁判系统会自动连接以下热点;请将$\r$\n本机也连接到同一网络。$\r$\n名称(SSID):${RMIC_INSTALLER_WIFI_SSID}$\r$\n密码:${RMIC_INSTALLER_WIFI_PASS}"
|
||||
!else
|
||||
!define MUI_FINISHPAGE_TEXT "裁判系统客户端已安装完成。$\r$\n首次启动请选择模式并绑定裁判系统。$\r$\n请让本机与裁判系统连接到同一网络。$\r$\n网络名称和密码请向现场工作人员确认。"
|
||||
!endif
|
||||
!define MUI_FINISHPAGE_TEXT_LARGE
|
||||
!define MUI_FINISHPAGE_RUN_TEXT "启动裁判系统客户端"
|
||||
!define MUI_INSTFILESPAGE_COLORS "E7ECF5 080B13"
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
; Shared event hotspot contract, intentionally kept with the installer.
|
||||
; The firmware must be built with matching WIFI_SSID / WIFI_PASS values.
|
||||
!ifndef RMIC_INSTALLER_NETWORK
|
||||
!define RMIC_INSTALLER_NETWORK
|
||||
!ifndef RMIC_INSTALLER_WIFI_SSID
|
||||
!define RMIC_INSTALLER_WIFI_SSID "SR-602-2G4"
|
||||
!endif
|
||||
!ifndef RMIC_INSTALLER_WIFI_PASS
|
||||
!define RMIC_INSTALLER_WIFI_PASS "12345678"
|
||||
!endif
|
||||
!endif
|
||||
@@ -11,7 +11,7 @@ export const BUILD = {
|
||||
minor: 2,
|
||||
patch: 2,
|
||||
/** git 提交数,单调递增。 */
|
||||
build: 39,
|
||||
build: 40,
|
||||
/** 线路协议版本。与固件自报的那个数直接比对。 */
|
||||
protocol: 1,
|
||||
/** 生成时的提交日期(`YYYY-MM-DD`)。 */
|
||||
|
||||
Reference in New Issue
Block a user