From f670556fd4eeae7d46b9b95418e93b4fd05a3e42 Mon Sep 17 00:00:00 2001 From: renbin Date: Wed, 9 Apr 2025 18:06:55 +0800 Subject: [PATCH] fix: support url Convert url to local path. Pick from master c44cc7a0881768095e222bf3d0e814cd724187b5 Log: support url. Bug: https://pms.uniontech.com/bug-view-312013.html --- reader/MainWindow.cpp | 10 ++++++++-- reader/app/DBusObject.cpp | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/reader/MainWindow.cpp b/reader/MainWindow.cpp index 70e7088c..110c48f7 100755 --- a/reader/MainWindow.cpp +++ b/reader/MainWindow.cpp @@ -50,11 +50,17 @@ MainWindow::MainWindow(QStringList filePathList, DMainWindow *parent) initBase(); initUI(); - if (!filePathList.isEmpty()) - foreach (const QString &filePath, m_initFilePathList) { + if (!filePathList.isEmpty()) { + for (QString &filePath : m_initFilePathList) { + QUrl url(filePath); + if (url.isLocalFile()) { + filePath = url.toLocalFile(); + } + if (QFile(filePath).exists()) //过滤不存在的文件,需求中不含有提示文件不存在的文案 addFile(filePath); } + } } MainWindow::MainWindow(DocSheet *sheet, DMainWindow *parent) diff --git a/reader/app/DBusObject.cpp b/reader/app/DBusObject.cpp index a7988d5a..17f6050d 100644 --- a/reader/app/DBusObject.cpp +++ b/reader/app/DBusObject.cpp @@ -9,6 +9,7 @@ #include "Global.h" #include +#include #include // gesture 触控板手势 @@ -121,6 +122,11 @@ void DBusObject::handleFiles(QStringList filePathList) MainWindow *mainwindow = MainWindow::m_list.count() > 0 ? MainWindow::m_list[0] : MainWindow::createWindow(); mainwindow->setProperty("loading", true); foreach (QString filePath, filePathList) { + QUrl url(filePath); + if (url.isLocalFile()) { + filePath = url.toLocalFile(); + } + if (mainwindow->property("windowClosed").toBool()) break;