Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719

李太白3028

2025-07-30 ba557576d960281d774ac1e3c83f2e29786ed682

 Server/¸¶ÁÖÌÎ/code/tianKai/vcsmainwindow.cpp

@@ -1,6 +1,12 @@
#include "vcsmainwindow.h"
#include "ui_vcsmainwindow.h"

#include <QFileInfo>
#include <QMessageBox>
#include "struct_data.h"
std::mutex _mutex;
std::condition_variable _conv;
int g_flag = 1;
VCSMainWindow::VCSMainWindow(QWidget *parent) :
    QMainWindow(parent),
    ui(new Ui::VCSMainWindow)
@@ -10,13 +16,20 @@
    m_release = new Release(this);
    m_rollBack = new RollBack(this);
    m_readLog = new ReadLog(this);
    m_upLoad = new UpLoador(this);
    m_msg = new QMessageBox(this);

    ui->stackedWidget->addWidget(m_addFile);
    ui->stackedWidget->addWidget(m_release);
    ui->stackedWidget->addWidget(m_rollBack);
    ui->stackedWidget->addWidget(m_readLog);

    ui->stackedWidget->setCurrentWidget(m_addFile);


    connect(m_addFile,SIGNAL(addFileSignal(std::shared_ptr<char>,int)),this,SLOT(addFileSlot(std::shared_ptr<char>,int)));
    connect(this,SIGNAL(releaseSignal()),m_release,SLOT(releaseSlot()));
    connect(m_addFile,SIGNAL(addFileMsg(QString)),this,SLOT(msgSlot(QString)));
    connect(m_release,SIGNAL(releaseSignal(std::shared_ptr<char>,int)),this,SLOT(addFileSlot(std::shared_ptr<char>,int)));
}

VCSMainWindow::~VCSMainWindow()
@@ -29,9 +42,11 @@
    ui->stackedWidget->setCurrentWidget(m_addFile);
}

// ä¸Šä¼ 
void VCSMainWindow::on_pushButton_2_clicked()
{
    ui->stackedWidget->setCurrentWidget(m_release);
    emit releaseSignal();
}

void VCSMainWindow::on_pushButton_4_clicked()
@@ -43,3 +58,22 @@
{
    ui->stackedWidget->setCurrentWidget(m_readLog);
}

void VCSMainWindow::addFileSlot(std::shared_ptr<char> buf, int len)
{
        if (!buf || len <= 0) {

            return;
        }
        int ret = m_upLoad->upfile(buf, len);  // å¤„理数据
        if(ret < len){
            qDebug()<<"传输有问题";
        }

}

void VCSMainWindow::msgSlot(QString msg)
{
    m_msg->information(this,"提示",msg);
}