重改播放

This commit is contained in:
hm
2020-08-20 17:48:09 +08:00
parent 5c5ef643e1
commit 8ca8016d55
14 changed files with 199 additions and 220 deletions
+12 -11
View File
@@ -18,17 +18,17 @@ void MissionProcess::setRunFrq(uint32_t frq)
void MissionProcess::start()
{
if(Missionthread == nullptr)
if(thread == nullptr)
{
Missionthread = new QThread();
this->moveToThread(Missionthread);
connect(Missionthread, &QThread::started, this, &MissionProcess::process);
thread = new QThread();
this->moveToThread(thread);
connect(thread, &QThread::started, this, &MissionProcess::process);
}
if(!Missionthread->isRunning())
if(!thread->isRunning())
{
running_flag = true;
Missionthread->start();
thread->start();
qDebug() << "thread start" << running_flag;
}
else
@@ -39,7 +39,7 @@ void MissionProcess::start()
void MissionProcess::stop()
{
if(Missionthread->isRunning())
if(thread->isRunning())
{
running_flag = false;
qDebug() << "thread stop" << running_flag;
@@ -80,10 +80,11 @@ void MissionProcess::process()//线程函数
//qDebug() << count;
}
//退出线程
Missionthread->quit();
Missionthread->wait(200);//等待结束
Missionthread->deleteLater();
Missionthread = nullptr;
disconnect(thread, nullptr, nullptr, nullptr);
thread->quit();
thread->wait();//等待结束
thread->deleteLater();
thread = nullptr;
}
void MissionProcess::setID(int m_sysid,int m_compid)