From 7561975a03d0d0e4f9489fae03c6e04f81915bcb Mon Sep 17 00:00:00 2001 From: laixingyu Date: Fri, 15 Dec 2023 14:18:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=BA=E5=8D=95=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mainwindow.cpp | 3 ++- mainwindow.h | 2 +- userdata.cpp | 17 +++++++++++++++++ userdata.h | 9 +++++++-- widget/addtradedialog.cpp | 2 ++ widget/logindialog.cpp | 6 +++--- widget/logindialog.h | 2 +- widget/trends.cpp | 2 +- widget/trends.h | 2 +- widget/trendwidget.cpp | 4 ++-- widget/trendwidget.h | 2 +- 11 files changed, 38 insertions(+), 13 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 3a05ece..a3c0fa6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -17,7 +17,8 @@ MainWindow::MainWindow(QWidget *parent) InitStyle(); this->installEventFilter(this); InitTradeTable(); - m_UserData.SetManagerType(ManagerType::Ruoyi); +// m_UserData.SetManagerType(ManagerType::Ruoyi); + m_UserData = UserData::Instanse(); } MainWindow::~MainWindow() diff --git a/mainwindow.h b/mainwindow.h index 00d62d2..134362c 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -48,7 +48,7 @@ private slots: private: Ui::MainWindow *ui; UserInfo m_UserInfo; - UserData m_UserData; + UserData* m_UserData; // TradeTableModel* m_pTradesModel; QStandardItemModel* m_pTradeStandardModel; diff --git a/userdata.cpp b/userdata.cpp index 03627fc..829d98b 100644 --- a/userdata.cpp +++ b/userdata.cpp @@ -1,11 +1,23 @@ #include "userdata.h" #include "ruoyi/ruoyidatamanager.h" +UserData* UserData::g_UserData = nullptr; + UserData::UserData() { m_pDataManager = nullptr; } +UserData *UserData::Instanse() +{ + if(g_UserData == nullptr) + { + g_UserData = new UserData; + g_UserData->SetManagerType(Ruoyi); + } + return g_UserData; +} + UserData::~UserData() { if(m_pDataManager) @@ -49,3 +61,8 @@ QList > UserData::GetTrends(const TrendsRequestParam& requestPara return m_pDataManager->GetTrends(requestParam); return QList >(); } + +void UserData::AddTradeRecord() +{ + +} diff --git a/userdata.h b/userdata.h index 7e5f3ba..f147f16 100644 --- a/userdata.h +++ b/userdata.h @@ -10,8 +10,7 @@ class UserData : public QObject { Q_OBJECT public: - UserData(); - ~UserData(); + static UserData* Instanse(); void SetManagerType(ManagerType type); //获取验证码图片;可选 QPixmap GetVerificationCode(); @@ -19,8 +18,14 @@ public: UserInfo Login(const QString& userName,const QString& password,const QString& code); //获取trends QList > GetTrends(const TrendsRequestParam& requestParam); + //添加交易记录 + void AddTradeRecord(); private: + UserData(); + ~UserData(); +private: + static UserData* g_UserData; BaseDataManager* m_pDataManager; }; diff --git a/widget/addtradedialog.cpp b/widget/addtradedialog.cpp index 5c99ee3..60f88ac 100644 --- a/widget/addtradedialog.cpp +++ b/widget/addtradedialog.cpp @@ -2,6 +2,7 @@ #include "ui_addtradedialog.h" #include #include +#include "userdata.h" AddTradeDialog::AddTradeDialog(QWidget *parent) : QDialog(parent), @@ -17,6 +18,7 @@ AddTradeDialog::~AddTradeDialog() void AddTradeDialog::on_pushButton_OK_clicked() { + UserData::Instanse()->AddTradeRecord(); this->accept(); } diff --git a/widget/logindialog.cpp b/widget/logindialog.cpp index 2699aa3..5ee43bb 100644 --- a/widget/logindialog.cpp +++ b/widget/logindialog.cpp @@ -19,7 +19,7 @@ LoginDialog::LoginDialog(QWidget *parent) : Init(); InitStyle(); this->installEventFilter(this); - m_UserData.SetManagerType(ManagerType::Ruoyi); + m_UserData = UserData::Instanse(); GetVerificationCode(); } @@ -127,13 +127,13 @@ void LoginDialog::on_btnMenu_Close_clicked() void LoginDialog::GetVerificationCode() { - QPixmap pix = m_UserData.GetVerificationCode(); + QPixmap pix = m_UserData->GetVerificationCode(); ui->label_code->setPixmap(pix.scaledToHeight(34)); } void LoginDialog::on_pushButton_login_clicked() { - m_UserInfo = m_UserData.Login(ui->username->text(),ui->password->text(),ui->code->text()); + m_UserInfo = m_UserData->Login(ui->username->text(),ui->password->text(),ui->code->text()); qDebug() << __FUNCTION__ << " login finished: "<< m_UserInfo.userName << m_UserInfo.token << m_UserInfo.uuid; if(m_UserInfo.token.isEmpty()) { diff --git a/widget/logindialog.h b/widget/logindialog.h index c45c07d..01c874e 100644 --- a/widget/logindialog.h +++ b/widget/logindialog.h @@ -43,7 +43,7 @@ private: QString &highColor); private: Ui::LoginDialog *ui; - UserData m_UserData; + UserData* m_UserData; UserInfo m_UserInfo; //根据QSS样式获取对应颜色值 diff --git a/widget/trends.cpp b/widget/trends.cpp index 6b4d28a..9e77c73 100644 --- a/widget/trends.cpp +++ b/widget/trends.cpp @@ -10,7 +10,7 @@ Trends::Trends(QWidget *parent) : ui(new Ui::Trends) { ui->setupUi(this); - m_UserData.SetManagerType(ManagerType::Ruoyi); + m_UserData = UserData::Instanse(); ui->periodCombo->addItems(QStringList() << "1" << "3" << "5" << "10" << "15" << "20" << "30"); ui->periodCombo->setCurrentText("20"); this->LoadTrendsData(); diff --git a/widget/trends.h b/widget/trends.h index 2e63bfe..c1f887c 100644 --- a/widget/trends.h +++ b/widget/trends.h @@ -25,7 +25,7 @@ private slots: private: Ui::Trends *ui; - UserData m_UserData; + UserData* m_UserData; UserInfo m_UserInfo; QMap trendsMap;// }; diff --git a/widget/trendwidget.cpp b/widget/trendwidget.cpp index e8532f2..7a69f4a 100644 --- a/widget/trendwidget.cpp +++ b/widget/trendwidget.cpp @@ -7,7 +7,7 @@ TrendWidget::TrendWidget(QWidget *parent) : ui(new Ui::TrendWidget) { ui->setupUi(this); - m_UserData.SetManagerType(ManagerType::Ruoyi); + m_UserData = UserData::Instanse(); } TrendWidget::~TrendWidget() @@ -32,7 +32,7 @@ void TrendWidget::LoadTrendsData(const TrendsRequestParam ¶m) } ui->tableWidget->clear(); m_TrendParam = param; - QList > trends = m_UserData.GetTrends(param); + QList > trends = m_UserData->GetTrends(param); int rowCount = trends.count(); int columnCount = 0; //更新到tableview中 diff --git a/widget/trendwidget.h b/widget/trendwidget.h index 50c700b..3f7e016 100644 --- a/widget/trendwidget.h +++ b/widget/trendwidget.h @@ -20,7 +20,7 @@ public: private: Ui::TrendWidget *ui; - UserData m_UserData; + UserData* m_UserData; UserInfo m_UserInfo; TrendsRequestParam m_TrendParam; };