Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 调整相机初始化和修复剪贴板无数据问题 #483

Merged
merged 2 commits into from
May 9, 2024
Merged

fix: 调整相机初始化和修复剪贴板无数据问题 #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57d9859
fix: 调整相机初始化时机
rb-union May 8, 2024
f2ae8e2
fix: 修复截图后剪贴板无记录
rb-union May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions src/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2010,13 +2010,19 @@ void MainWindow::save2Clipboard(const QPixmap &pix)
}
qInfo() << __FUNCTION__ << __LINE__ << "1s延时完成" << time(nullptr);
} else {
t_imageData->setImageData(pix);
// 图片数据过大时，可能影响后端剪贴板处理，调整为保存 PNG 图片
QByteArray bytes;
QBuffer buffer(&bytes);
buffer.open(QIODevice::WriteOnly);
pix.save(&buffer, "PNG");
t_imageData->setData("image/png", bytes);

QClipboard *cb = qApp->clipboard();
qInfo() << __FUNCTION__ << __LINE__ << "将数据传递到剪贴板！";
cb->setMimeData(t_imageData, QClipboard::Clipboard);
qDebug() << "Whether the data passed to the clipboard is empty? " << t_imageData->imageData().isNull();

}

if(DSysInfo::minorVersion().toInt() >= 1070){
if (!Utils::isWaylandMode) {
this->hide(); //隐藏主界面
Expand Down Expand Up @@ -2271,6 +2277,13 @@ void MainWindow::updateToolBarPos()
// connect(m_pCameraWatcher, SIGNAL(sigCameraState(bool)), this, SLOT(on_CheckVideoCouldUse(bool)));

initDynamicLibPath();

//检测是否是锁频状态下再打开截图
checkIsLockScreen();
}

// 延迟初始化相机，仅在切换到录屏界面时执行初始化
if (status::record == m_functionType && !m_devnumMonitor) {
qInfo() << "正在初始化v4l2core...";
v4l2core_init();
qInfo() << "初始化v4l2core已完成";
Expand All @@ -2280,9 +2293,6 @@ void MainWindow::updateToolBarPos()
m_devnumMonitor->setObjectName("DevMonitorThread");
m_devnumMonitor->setWatch(true); //取消之前的线程方式，采用定时器监测
connect(m_devnumMonitor, SIGNAL(existDevice(bool)), this, SLOT(on_CheckVideoCouldUse(bool)));

//检测是否是锁频状态下再打开截图
checkIsLockScreen();
}

QPoint toolbarPoint;
Expand Down Expand Up @@ -2817,11 +2827,14 @@ void MainWindow::changeCameraSelectEvent(bool checked)
m_cameraWidget->resize(cameraWidgetWidth, cameraWidgetHeight);
m_cameraWidget->showAt(QPoint(x, y));
m_cameraWidget->cameraStart();
m_devnumMonitor->setCanUse(false);
} else {
m_cameraWidget->cameraStop();
m_cameraWidget->hide();
m_devnumMonitor->setCanUse(true);
}

if (m_devnumMonitor) {
// 使用摄像头时不进行判断
m_devnumMonitor->setCanUse(!checked);
}
}
/*
Expand Down Expand Up @@ -5907,7 +5920,10 @@ void MainWindow::startCountdown()
}
m_pVoiceVolumeWatcher->setWatch(false);
m_pCameraWatcher->setWatch(false);
m_devnumMonitor->setWatch(false); //取消之前的线程方式，采用定时器监测

if (m_devnumMonitor) {
m_devnumMonitor->setWatch(false); //取消之前的线程方式，采用定时器监测
}
}

//先隐藏，再显示
Expand Down
7 changes: 6 additions & 1 deletion src/pin_screenshots/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,12 @@ void MainWindow::saveImg()

// 保存到剪贴板
QMimeData *t_imageData = new QMimeData;
t_imageData->setImageData(m_image);
// 图片数据过大时，可能影响后端剪贴板处理，调整为保存 PNG 图片
QByteArray bytes;
QBuffer buffer(&bytes);
buffer.open(QIODevice::WriteOnly);
m_image.save(&buffer, "PNG");
t_imageData->setData("image/png", bytes);
QClipboard *cb = qApp->clipboard();
cb->setMimeData(t_imageData, QClipboard::Clipboard);

Expand Down
Loading