fix: [optimization] Optimize user experience

src/ipc/proto/comstruct.h

@@ -190,16 +190,19 @@ struct SearchDevice {
 
 struct SearchDeviceResult {
     bool result;
+    fastring ip;
     fastring msg;
 
     void from_json(const co::Json& _x_) {
         result = _x_.get("result").as_bool();
+        ip = _x_.get("ip").as_c_str();
         msg = _x_.get("msg").as_c_str();
     }
 
     co::Json as_json() const {
         co::Json _x_;
         _x_.add_member("result", result);
+        _x_.add_member("ip", ip);
         _x_.add_member("msg", msg);
         return _x_;
     }

src/plugins/cooperation/core/cooperation/cooperationmanager.cpp

@@ -577,8 +577,11 @@ void CooperationManager::handleNetworkDismiss(const QString &msg)
     }
 }
 
-void CooperationManager::handleSearchDeviceResult(bool res)
+void CooperationManager::handleSearchDeviceResult(bool res, const QString &ip)
 {
     if (!res)
         emit MainController::instance()->discoveryFinished(false);
+    else {
+        ConfigManager::instance()->setAppAttribute(AppSettings::CacheGroup, AppSettings::SearchIPKey, ip);
+    }
 }

src/plugins/cooperation/core/cooperation/cooperationmanager.h

@@ -34,7 +34,7 @@ public Q_SLOTS:
     void onVerifyTimeout();
     void handleCancelCooperApply();
     void handleNetworkDismiss(const QString &msg);
-    void handleSearchDeviceResult(bool res);
+    void handleSearchDeviceResult(bool res, const QString &ip);
 
 private:
     explicit CooperationManager(QObject *parent = nullptr);

src/plugins/cooperation/core/discover/discovercontroller.cpp

@@ -34,7 +34,7 @@ DiscoverController::DiscoverController(QObject *parent)
         return;
     }
 
-    openZeroConfDaemonDailog();
+    //openZeroConfDaemonDailog();
     //    QTimer *timer = new QTimer(this);
     //    connect(timer, &QTimer::timeout, this, [timer, this] {
     //        if (isZeroConfDaemonActive()) {
@@ -187,6 +187,7 @@ bool DiscoverController::isZeroConfDaemonActive()
             return false;
         }
     } else {
+        WLOG << "Avahi service is not running";
         //ELOG << "Error: " << error.toStdString();
         return false;
     }

src/plugins/cooperation/core/global_defines.h

@@ -104,6 +104,8 @@ inline constexpr char CooperationEnabled[] { "CooperationEnabled" };
 inline constexpr char CacheGroup[] { "Cache" };
 inline constexpr char TransHistoryKey[] { "TransHistory" };
 inline constexpr char ConnectHistoryKey[] { "ConnectHistory" };
+inline constexpr char CloseOptionKey[] { "CloseOption" };
+inline constexpr char SearchIPKey[] { "SearchIP" };
 }
 
 // 组策略

src/plugins/cooperation/core/gui/mainwindow.cpp

@@ -7,13 +7,25 @@
 #include "dialogs/settingdialog.h"
 #include "maincontroller/maincontroller.h"
 
+#include <utils/cooperationutil.h>
 #include <QScreen>
 #include <QUrl>
 #include <QApplication>
 #include <QDesktopServices>
+#include <QCheckBox>
+#include <QSystemTrayIcon>
+#include <QMenu>
+#include <QVBoxLayout>
 
 using namespace cooperation_core;
 
+#ifdef __linux__
+DWIDGET_USE_NAMESPACE
+const char *Kicon = "dde-cooperation";
+#else
+const char *Kicon = ":/icons/deepin/builtin/icons/dde-cooperation_128px.svg";
+#endif
+
 MainWindowPrivate::MainWindowPrivate(MainWindow *qq)
     : q(qq)
 {
@@ -160,9 +172,103 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
 {
     d->mousePressEvent(event);
 }
+#endif
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-    QApplication::quit();
+    if (qApp->property("onlyTransfer").toBool())
+        QApplication::quit();
+
+    showCloseDialog();
+    event->ignore();
 }
+
+void MainWindow::showCloseDialog()
+{
+    QString option = CooperationUtil::closeOption();
+    if (option == "Minimise") {
+        minimizedAPP();
+        return;
+    }
+    if (option == "Exit")
+        QApplication::quit();
+
+    CooperationDialog dlg;
+
+    QVBoxLayout *layout = new QVBoxLayout();
+    QCheckBox *op1 = new QCheckBox(tr("Minimise to system tray"));
+    op1->setChecked(true);
+    QCheckBox *op2 = new QCheckBox(tr("Exit"));
+
+    connect(op1, &QCheckBox::stateChanged, op1, [op2](int state) {
+        op2->setChecked(state != Qt::Checked);
+    });
+    connect(op2, &QCheckBox::stateChanged, op2, [op1](int state) {
+        op1->setChecked(state != Qt::Checked);
+    });
+
+    QCheckBox *op3 = new QCheckBox(tr("No more enquiries"));
+
+    layout->addWidget(op1);
+    layout->addWidget(op2);
+    layout->addWidget(op3);
+
+#ifdef __linux__
+    dlg.setIcon(QIcon::fromTheme("dde-cooperation"));
+    dlg.addButton(tr("Cancel"));
+    dlg.addButton(tr("Confirm"), true, DDialog::ButtonWarning);
+    dlg.setTitle(tr("Please select your operation"));
+    QWidget *content = new QWidget();
+
+    content->setLayout(layout);
+    dlg.addContent(content);
+#else
+    dlg.setWindowIcon(QIcon::fromTheme(Kicon));
+    dlg.setWindowTitle(tr("Please select your operation"));
+    QPushButton *okButton = new QPushButton(tr("Confirm"));
+    QPushButton *cancelButton = new QPushButton(tr("Cancel"));
+
+    QObject::connect(okButton, &QPushButton::clicked, &dlg, &QDialog::accept);
+    QObject::connect(cancelButton, &QPushButton::clicked, &dlg, &QDialog::reject);
+
+    layout->addWidget(okButton);
+    layout->addWidget(cancelButton);
+    dlg.setLayout(layout);
+    dlg.setFixedSize(400, 200);
 #endif
+
+    int code = dlg.exec();
+    if (code == QDialog::Accepted) {
+        bool isExit = op2->checkState() == Qt::Checked;
+        if (op3->checkState() == Qt::Checked) {
+            CooperationUtil::saveOption(isExit);
+        }
+
+        if (isExit)
+            QApplication::quit();
+        else
+            minimizedAPP();
+    }
+}
+
+void MainWindow::minimizedAPP()
+{
+    this->hide();
+    if (d->trayIcon)
+        return;
+    d->trayIcon = new QSystemTrayIcon(QIcon::fromTheme(Kicon), this);
+
+    QMenu *trayMenu = new QMenu(this);
+    QAction *restoreAction = trayMenu->addAction(tr("Restore"));
+    QAction *quitAction = trayMenu->addAction(tr("Quit"));
+
+    d->trayIcon->setContextMenu(trayMenu);
+    d->trayIcon->show();
+
+    QObject::connect(restoreAction, &QAction::triggered, this, &QMainWindow::show);
+    QObject::connect(quitAction, &QAction::triggered, qApp, &QApplication::quit);
+    QObject::connect(d->trayIcon, &QSystemTrayIcon::activated, this, [this](QSystemTrayIcon::ActivationReason reason) {
+        if (reason == QSystemTrayIcon::Trigger)
+            this->show();
+    });
+}

src/plugins/cooperation/core/gui/mainwindow.h

@@ -27,9 +27,11 @@ class MainWindow : public CooperationMainWindow
     void mouseMoveEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
-    void closeEvent(QCloseEvent *event) override;
 #endif
+    void closeEvent(QCloseEvent *event) override;
 
+    void showCloseDialog();
+    void minimizedAPP();
 public Q_SLOTS:
     void setFirstTipVisible();
     void onlineStateChanged(bool isOnline);

src/plugins/cooperation/core/gui/mainwindow_p.h

@@ -11,6 +11,7 @@
 #include <QPainter>
 #include <QMouseEvent>
 
+class QSystemTrayIcon;
 namespace cooperation_core {
 
 class MainWindow;
@@ -39,6 +40,7 @@ class MainWindowPrivate : public QObject
     WorkspaceWidget *workspaceWidget { nullptr };
     bool leftButtonPressed { false };
     QPoint lastPosition;
+    QSystemTrayIcon *trayIcon { nullptr };
 };
 
 }   // namespace cooperation_core

src/plugins/cooperation/core/maincontroller/maincontroller.cpp

@@ -17,6 +17,8 @@
 #include <QHostInfo>
 #include <QDir>
 
+#include <transfer/transferhelper.h>
+
 using ConnectHistory = QMap<QString, QString>;
 Q_GLOBAL_STATIC(ConnectHistory, connectHistory)
 
@@ -157,5 +159,8 @@ void MainController::discoveryDevice()
     if (!offlineDevList.isEmpty())
         deviceOnline(offlineDevList);
 
+    QString searchIP = CooperationUtil::searchIPHistory();
+    if (!searchIP.isEmpty())
+        TransferHelper::instance()->searchDevice(searchIP);
     CooperationUtil::instance()->asyncDiscoveryDevice();
 }

src/plugins/cooperation/core/utils/cooperationutil.cpp

@@ -264,7 +264,8 @@ void CooperationUtilPrivate::localIPCStart()
                 q->metaObject()->invokeMethod(CooperationManager::instance(),
                                               "handleSearchDeviceResult",
                                               Qt::QueuedConnection,
-                                              Q_ARG(bool, param.result));
+                                              Q_ARG(bool, param.result),
+                                              Q_ARG(QString, QString(param.ip.c_str())));
             } break;
             default:
                 break;
@@ -525,6 +526,23 @@ QString CooperationUtil::localIPAddress()
     return ip;
 }
 
+QString CooperationUtil::closeOption()
+{
+    QString option = ConfigManager::instance()->appAttribute(AppSettings::CacheGroup, AppSettings::CloseOptionKey).toString();
+    return option;
+}
+
+QString CooperationUtil::searchIPHistory()
+{
+    return ConfigManager::instance()->appAttribute(AppSettings::CacheGroup, AppSettings::SearchIPKey).toString();
+}
+
+void CooperationUtil::saveOption(bool exit)
+{
+    ConfigManager::instance()->setAppAttribute(AppSettings::CacheGroup, AppSettings::CloseOptionKey,
+                                               exit ? "Exit" : "Minimise");
+}
+
 void CooperationUtil::showFeatureDisplayDialog(QDialog *dlg1)
 {
 #ifdef linux

src/plugins/cooperation/core/utils/cooperationutil.h

@@ -33,6 +33,9 @@ class CooperationUtil : public QObject
 
     static QVariantMap deviceInfo();
     static QString localIPAddress();
+    static QString closeOption();
+    static void saveOption(bool exit);
+    static QString searchIPHistory();
 
     void showFeatureDisplayDialog(QDialog *dlg);
 

src/plugins/daemon/core/service/discoveryjob.cpp

@@ -246,6 +246,7 @@ void DiscoveryJob::searchDeviceByIp(const QString &ip, const bool remove)
     emit sigNodeChanged(true, result.data.c_str());
     ev.result = true;
     ev.msg = result.data;
+    ev.ip = ip.toStdString();
     auto req = ev.as_json();
     // 通知前端
     req.add_member("api", "Frontend.searchDeviceRes");