From ba557576d960281d774ac1e3c83f2e29786ed682 Mon Sep 17 00:00:00 2001
From: 李太白3028 <2410382594@qq.com>
Date: 星期三, 30 七月 2025 09:21:41 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719
---
Server/付林涛/code/tianKai/vcsmainwindow.cpp | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.cpp" "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.cpp"
index 60f1d41..288f764 100644
--- "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.cpp"
+++ "b/Server/\344\273\230\346\236\227\346\266\233/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);
+}
+
--
Gitblit v1.8.0