From 56b9f1faf3ae66c4bb080c62acd4a580ecdc59ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=B8=80=E9=B8=A3?= <1000000008@qq.com> Date: Thu, 29 Oct 2026 14:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=20Moonlight=20=E5=8D=8F=E8=AE=AE=E5=B9=B6=E7=A7=BB=E9=99=A4=20?= =?UTF-8?q?RDP=20=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 变更详情：协议统一 Moonlight，移除 RDP 选项 - 三张桌面默认协议全部 Moonlight（Ubuntu/麒麟装 Sunshine 后即可直连） - 设置对话框移除协议选择行，保存时固定 Moonlight - RDP 内嵌代码保留作网关备用，不再从本地配置暴露 --- terminal/kiosk-shell/src/desktop_settings_dialog.cpp | 12 +++--------- terminal/kiosk-shell/src/desktop_settings_dialog.h | 1 - terminal/kiosk-shell/src/desktop_store.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/terminal/kiosk-shell/src/desktop_settings_dialog.cpp b/terminal/kiosk-shell/src/desktop_settings_dialog.cpp index 6d93244..a74d4cd 100644 --- a/terminal/kiosk-shell/src/desktop_settings_dialog.cpp +++ b/terminal/kiosk-shell/src/desktop_settings_dialog.cpp @@ -43,10 +43,7 @@ DesktopSettingsDialog::DesktopSettingsDialog(std::vector desktops, } form->addRow(QStringLiteral("桌面"), comboDesktop_); - comboProtocol_ = new QComboBox(this); - comboProtocol_->addItem(QStringLiteral("Moonlight"), QStringLiteral("moonlight")); - comboProtocol_->addItem(QStringLiteral("RDP"), QStringLiteral("rdp")); - form->addRow(QStringLiteral("协议"), comboProtocol_); + // 协议统一 Moonlight（RDP 渲染实测差，已不提供选项；代码保留作网关备用） editEndpoint_ = new QLineEdit(this); editEndpoint_->setPlaceholderText(QStringLiteral("例如 192.168.1.70 或 VPN 隧道地址")); @@ -54,7 +51,7 @@ DesktopSettingsDialog::DesktopSettingsDialog(std::vector desktops, editApp_ = new QLineEdit(this); editApp_->setPlaceholderText(QStringLiteral("Sunshine 应用名，通常为 Desktop")); - form->addRow(QStringLiteral("应用名（Moonlight）"), editApp_); + form->addRow(QStringLiteral("应用名"), editApp_); comboResolution_ = new QComboBox(this); const char* resolutions[] = {"1920x1080", "2560x1440", "1920x1440", "3840x2160", "1280x720"}; @@ -106,7 +103,6 @@ void DesktopSettingsDialog::loadCurrent() { continue; } loading_ = true; - comboProtocol_->setCurrentIndex(d.protocol == Protocol::kRdp ? 1 : 0); editEndpoint_->setText(d.endpoint); editApp_->setText(d.app); int resIndex = comboResolution_->findData( @@ -125,9 +121,7 @@ void DesktopSettingsDialog::onAccepted() { if (d.id != id) { continue; } - d.protocol = comboProtocol_->currentData().toString() == QStringLiteral("rdp") - ? Protocol::kRdp - : Protocol::kMoonlight; + d.protocol = Protocol::kMoonlight; d.endpoint = editEndpoint_->text().trimmed(); d.app = editApp_->text().trimmed(); const QString res = comboResolution_->currentData().toString(); diff --git a/terminal/kiosk-shell/src/desktop_settings_dialog.h b/terminal/kiosk-shell/src/desktop_settings_dialog.h index d85e77d..eb22565 100644 --- a/terminal/kiosk-shell/src/desktop_settings_dialog.h +++ b/terminal/kiosk-shell/src/desktop_settings_dialog.h @@ -39,7 +39,6 @@ private: std::vector desktops_; QComboBox* comboDesktop_ = nullptr; - QComboBox* comboProtocol_ = nullptr; QLineEdit* editEndpoint_ = nullptr; QLineEdit* editApp_ = nullptr; QComboBox* comboResolution_ = nullptr; diff --git a/terminal/kiosk-shell/src/desktop_store.cpp b/terminal/kiosk-shell/src/desktop_store.cpp index 824b382..2e2c248 100644 --- a/terminal/kiosk-shell/src/desktop_store.cpp +++ b/terminal/kiosk-shell/src/desktop_store.cpp @@ -33,14 +33,14 @@ std::vector defaultDesktops(const QString& migratedServer) { ubuntu.id = QStringLiteral("desk-ubuntu-01"); ubuntu.name = QStringLiteral("Ubuntu"); ubuntu.os = QStringLiteral("Ubuntu 桌面"); - ubuntu.protocol = Protocol::kRdp; + ubuntu.protocol = Protocol::kMoonlight; list.push_back(ubuntu); DesktopInfo kylin; kylin.id = QStringLiteral("desk-kylin-01"); kylin.name = QStringLiteral("麒麟"); kylin.os = QStringLiteral("银河麒麟桌面"); - kylin.protocol = Protocol::kRdp; + kylin.protocol = Protocol::kMoonlight; list.push_back(kylin); return list; @@ -51,9 +51,9 @@ DesktopInfo fromJson(const QJsonObject& obj) { d.id = obj.value(QStringLiteral("id")).toString(); d.name = obj.value(QStringLiteral("name")).toString(); d.os = obj.value(QStringLiteral("os")).toString(); - d.protocol = obj.value(QStringLiteral("protocol")).toString() == QStringLiteral("rdp") - ? Protocol::kRdp - : Protocol::kMoonlight; + // 协议统一 Moonlight：RDP 渲染路径实测差（CPU 高、卷帘），本地配置不再提供 + // RDP 选项；RDP 代码保留作网关备用，协议字段仅在平台票据层区分。 + d.protocol = Protocol::kMoonlight; d.endpoint = obj.value(QStringLiteral("endpoint")).toString(); d.app = obj.value(QStringLiteral("app")).toString(); d.width = obj.value(QStringLiteral("width")).toInt(1920);