chore: login ui optimization

Log: login ui changed
Change-Id: I29b60f367aaa68f66f9fc4f4c4ed6c70546e4c36

src/common/CMakeLists.txt

@@ -68,6 +68,7 @@ set(CXX_H
     toolchain/toolchain.h
     actionmanager/actionmanager.h
     actionmanager/command.h
+    unilog.h
     )
 
 set(CXX_CPP

src/common/lsp/client/client.cpp

@@ -6,6 +6,7 @@
 #include "private/client_p.h"
 #include "common/util/custompaths.h"
 #include "common/util/processutil.h"
+#include "common/unilog.h"
 
 #include <QMetaType>
 #include <QDebug>
@@ -291,7 +292,7 @@ void ClientPrivate::callNotification(const QString &method, const QJsonObject &p
 
 void ClientPrivate::writeLspData(const QByteArray &jsonObj)
 {
-    qInfo() << "\nclient->server:\n{\n" << jsonObj << "\n}";
+    uniDebug() << "\nclient->server:\n{\n" << jsonObj << "\n}";
     q->write(jsonObj);
     q->waitForBytesWritten();
 }
@@ -1058,18 +1059,18 @@ void ClientPrivate::doReadStdoutLine()
 void ClientPrivate::identifyJsonObject(const QJsonObject &jsonObj)
 {
     if (calledError(jsonObj)) {
-        qWarning() << "\nclient <- server:\n{\n" << jsonObj << "\n}";
+        uniCritical() << "\nclient <- server:\n{\n" << jsonObj << "\n}";
         return;
     }
 
 
     if (calledResult(jsonObj)) {
-        qInfo() << "\nclient <- server:\n{\n" << jsonObj << "\n}";
+        uniWarning() << "\nclient <- server:\n{\n" << jsonObj << "\n}";
         return;
     }
 
     if (serverCalled(jsonObj)) {
-        qInfo() << "\nclient <- server:\n{\n" << jsonObj << "\n}";
+        uniWarning() << "\nclient <- server:\n{\n" << jsonObj << "\n}";
         return;
     }
 }
@@ -1096,13 +1097,13 @@ ClientPrivate::ClientPrivate(Client * const q)
     QObject::connect(q, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                      this, [&](int exitCode, QProcess::ExitStatus status)
     {
-        qCritical() << "\nclient <- server\n{\n" << "lspServerProc finished:\n" << exitCode << status << "\n}";
+        uniInfo() << "\nclient <- server\n{\n" << "lspServerProc finished:\n" << exitCode << status << "\n}";
     });
 
     QObject::connect(q, &QProcess::readyReadStandardError,
                      this, [=]()
     {
-        qCritical() << "\nclient <- server\n{\n" <<q->readAllStandardError() << "\n}";
+        uniCritical() << "\nclient <- server\n{\n" <<q->readAllStandardError() << "\n}";
     });
 
     QObject::connect(q, &QProcess::readyReadStandardOutput,

src/common/unilog.h

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2022 - 2023 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+#ifndef UNILOG_H
+#define UNILOG_H
+
+#include <QDebug>
+
+#ifdef QT_DEBUG
+#define UNI_DEBUG
+#endif
+#ifdef UNI_DEBUG
+#define uniDebug(...) qDebug(__VA_ARGS__)
+#define uniInfo(...) qInfo(__VA_ARGS__)
+#define uniWarning(...) qWarning(__VA_ARGS__)
+#define uniCritical(...) qCritical(__VA_ARGS__)
+#else    
+#define NO_DEBUG(LOG) QMessageLogger().noDebug(LOG)
+#define uniDebug(...) NO_DEBUG(__VA_ARGS__)
+#define uniInfo(...) NO_DEBUG(__VA_ARGS__)
+#define uniWarning(...) NO_DEBUG(__VA_ARGS__)
+#define uniCritical(...) NO_DEBUG(__VA_ARGS__)
+#endif
+
+#endif // UNILOG_H

src/plugins/codegeex/codegeexmanager.cpp

@@ -143,6 +143,8 @@ void CodeGeeXManager::recevieLoginState(AskApi::LoginState loginState)
     } else if (loginState == AskApi::LoginState::kLoginSuccess) {
         Q_EMIT loginSuccessed();
         // switch to ask page.
+        queryTimer->stop();
+        queryTimer->deleteLater();
     }
 }
 
@@ -151,6 +153,7 @@ CodeGeeXManager::CodeGeeXManager(QObject *parent)
 {
     initConnections();
     loadConfig();
+    queryLoginState();
 }
 
 void CodeGeeXManager::initConnections()
@@ -164,8 +167,6 @@ void CodeGeeXManager::queryLoginState()
 {
     if (!queryTimer) {
         queryTimer = new QTimer(this);
-        queryTimer->setSingleShot(true);
-
         connect(queryTimer, &QTimer::timeout, this, [ = ] {
             if (!sessionId.isEmpty())
                 askApi.sendQueryRequest(sessionId);

src/plugins/codegeex/copilot.cpp

@@ -9,11 +9,11 @@
 #include <QDebug>
 #include <QTimer>
 
-static const char *kUrlGenerateOneLine = "https://tianqi.aminer.cn/api/v2/multilingual_code_generate";
+//static const char *kUrlGenerateOneLine = "https://tianqi.aminer.cn/api/v2/multilingual_code_generate";
 static const char *kUrlGenerateMultiLine = "https://tianqi.aminer.cn/api/v2/multilingual_code_generate_adapt";
 static const char *kUrlComment = "https://tianqi.aminer.cn/api/v2/multilingual_code_explain";
 static const char *kUrlTranslate = "https://tianqi.aminer.cn/api/v2/multilingual_code_translate";
-static const char *kUrlBugfix = "https://tianqi.aminer.cn/api/v2/multilingual_code_bugfix";
+//static const char *kUrlBugfix = "https://tianqi.aminer.cn/api/v2/multilingual_code_bugfix";
 
 using namespace CodeGeeX;
 using namespace dpfservice;

src/plugins/codegeex/widgets/codegeexwidget.cpp

@@ -19,16 +19,17 @@ CodeGeeXWidget::CodeGeeXWidget(QWidget *parent)
 {
     initUI();
     initConnection();
-    CodeGeeXManager::instance()->queryLoginState();
 }
 
 void CodeGeeXWidget::onLoginSuccessed()
 {
-    if (loginBtn) {
-        auto mainLayout = qobject_cast<QVBoxLayout*>(layout());
-        mainLayout->removeWidget(loginBtn);
-        delete loginBtn;
-        loginBtn = nullptr;
+    auto mainLayout = qobject_cast<QVBoxLayout*>(layout());
+    if (mainLayout) {
+        QLayoutItem* item = nullptr;
+        while ((item = mainLayout->takeAt(0)) != nullptr) {
+            delete item->widget();
+            delete item;
+        }
     }
 
     initAskWidget();
@@ -63,16 +64,46 @@ void CodeGeeXWidget::onCreateNewBtnClicked()
 void CodeGeeXWidget::initUI()
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
 
-    loginBtn = new QPushButton(this);
-    loginBtn->setText(tr("Login"));
+    auto initLoginUI = [this](){
+        auto verticalLayout = new QVBoxLayout(this);
+        verticalLayout->setAlignment(Qt::AlignCenter);
+        auto verticalSpacer_top = new QSpacerItem(20, 200, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        verticalLayout->addItem(verticalSpacer_top);
+
+        auto label_icon = new QLabel();
+        QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        label_icon->setSizePolicy(sizePolicy);
+        label_icon->setPixmap(QPixmap(":/resoures/images/logo-codegeex.png").scaledToWidth(80));
+        label_icon->setAlignment(Qt::AlignCenter);
+
+        verticalLayout->addWidget(label_icon, Qt::AlignCenter);
+
+        auto label_text = new QLabel();
+        label_text->setSizePolicy(sizePolicy);
+        label_text->setText(tr("Welcome to CodeGeeX\nA must-have all-round AI tool for developers"));
+        label_text->setAlignment(Qt::AlignCenter);
+
+        verticalLayout->addWidget(label_text, Qt::AlignCenter);
+
+        auto loginBtn = new QPushButton();
+        loginBtn->setSizePolicy(sizePolicy);
+        loginBtn->setText(tr("Go to login"));
+        connect(loginBtn, &QPushButton::clicked, this, [ = ]{
+            qInfo() << "on login clicked";
+            CodeGeeXManager::instance()->login();
+        });
+
+        verticalLayout->addWidget(loginBtn);
+
+        auto verticalSpacer_bottom = new QSpacerItem(20, 500, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        verticalLayout->addItem(verticalSpacer_bottom);
+    };
+    initLoginUI();
 }
 
 void CodeGeeXWidget::initConnection()
 {
-    connect(loginBtn, &QPushButton::clicked, CodeGeeXManager::instance(), &CodeGeeXManager::login);
     connect(CodeGeeXManager::instance(), &CodeGeeXManager::loginSuccessed, this, &CodeGeeXWidget::onLoginSuccessed);
     connect(CodeGeeXManager::instance(), &CodeGeeXManager::createdNewSession, this, &CodeGeeXWidget::onNewSessionCreated);
 }

src/plugins/codegeex/widgets/codegeexwidget.h

@@ -45,7 +45,6 @@ public Q_SLOTS:
 
     void resetHeaderBtns();
 
-    QPushButton *loginBtn { nullptr };
     QTabBar *tabBar { nullptr };
     QStackedWidget *stackWidget { nullptr };
     QPushButton *deleteBtn { nullptr };

src/plugins/cxx/cxxplugin.cpp

@@ -93,7 +93,6 @@ bool CxxPlugin::start()
 
 dpf::Plugin::ShutdownFlag CxxPlugin::stop()
 {
-    qInfo() << __FUNCTION__;
     return Sync;
 }