fix: 修改数据操作为单例

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()

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;
 

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<QList<QString> > UserData::GetTrends(const TrendsRequestParam& requestPara
         return m_pDataManager->GetTrends(requestParam);
     return QList<QList<QString> >();
 }
+
+void UserData::AddTradeRecord()
+{
+
+}

userdata.h

@@ -10,8 +10,7 @@ class UserData : public QObject
 {
     Q_OBJECT
 public:
-    UserData();
+    static UserData* Instanse();
-    ~UserData();
     void SetManagerType(ManagerType type);
     //获取验证码图片;可选
     QPixmap GetVerificationCode();
@@ -19,8 +18,14 @@ public:
     UserInfo Login(const QString& userName,const QString& password,const QString& code);
     //获取trends
     QList<QList<QString> > GetTrends(const TrendsRequestParam& requestParam);
+    //添加交易记录
+    void AddTradeRecord();
 
 private:
+    UserData();
+    ~UserData();
+private:
+    static UserData* g_UserData;
     BaseDataManager* m_pDataManager;
 };
 

widget/addtradedialog.cpp

@@ -2,6 +2,7 @@
 #include "ui_addtradedialog.h"
 #include <QMessageBox>
 #include <QDebug>
+#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();
 }
 

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())
     {

widget/logindialog.h

@@ -43,7 +43,7 @@ private:
                      QString &highColor);
 private:
     Ui::LoginDialog *ui;
-    UserData m_UserData;
+    UserData* m_UserData;
     UserInfo m_UserInfo;
 
     //根据QSS样式获取对应颜色值

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();

widget/trends.h

@@ -25,7 +25,7 @@ private slots:
 
 private:
     Ui::Trends *ui;
-    UserData m_UserData;
+    UserData* m_UserData;
     UserInfo m_UserInfo;
     QMap<QString,TrendWidget*> trendsMap;//<period,widget>
 };

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 &param)
     }
     ui->tableWidget->clear();
     m_TrendParam = param;
-    QList<QList<QString> > trends = m_UserData.GetTrends(param);
+    QList<QList<QString> > trends = m_UserData->GetTrends(param);
     int rowCount = trends.count();
     int columnCount = 0;
     //更新到tableview中

widget/trendwidget.h

@@ -20,7 +20,7 @@ public:
 
 private:
     Ui::TrendWidget *ui;
-    UserData m_UserData;
+    UserData* m_UserData;
     UserInfo m_UserInfo;
     TrendsRequestParam m_TrendParam;
 };