5.0.5

client/CLiveViodeProc.cpp

@@ -92,7 +92,7 @@ void CLiveViodeProc::startTest(HWND hwnd)
 
 int CLiveViodeProc::getCameraCount()
 {
-    if(m_nCameraCount == 0)
+//    if(m_nCameraCount == 0)
     {
         m_nCameraCount = m_pTRTCSDK->getDeviceManager()->getDevicesList(TXMediaDeviceTypeCamera)->getCount();
     }

client/answerWidget.cpp

@@ -352,14 +352,14 @@ void answerWidget::checkRemoteBreach()
 		QString sCheckStr = "";
 		if (CCommonTools::isUseRDP())
 		{
-			sCheckStr = QString::fromLocal8Bit("检测是否开启远程桌面");
+            sCheckStr = QString::fromLocal8Bit("请关闭远程桌面");
 			qDebug() << QString::fromLocal8Bit("开启远程桌面");
 			bExit = true;
 		}
 		
 		if (m_MonitorEnumeratorPtr->getMontorNumber() > 1)
 		{
-			sCheckStr = QString::fromLocal8Bit("请检测是否开启分屏");
+            sCheckStr = QString::fromLocal8Bit("请关闭分屏");
 			qDebug() << QString::fromLocal8Bit("开启双屏");
 			bExit = true;
 		}
@@ -376,7 +376,7 @@ void answerWidget::checkRemoteBreach()
                 {
                     if (sCheckStr.isEmpty())
                     {
-                        sCheckStr = QString::fromLocal8Bit("请检测是否开启%1").arg(appList[i]);
+                        sCheckStr = QString::fromLocal8Bit("请关闭%1").arg(appList[i]);
                     }
                     else
                     {
@@ -1313,6 +1313,12 @@ void answerWidget::onExamHeartbeat(CExamHeartbeat examHeartbeat)
                 connect(g_inProcessFace.get(), &CInprogressFace::compareFailed, this, [&](QString sErrorMsg){
                     ShowMsg(sErrorMsg, g_appInfoPtr->m_pAnsBgWidget);
                 });	
+
+
+                connect(g_inProcessFace.get(), &CInprogressFace::reAddImage, this, [&](){
+                    m_bReAddFaceImage = true;
+                });
+
 				startCapture();
             }  
             m_nNextFaceCountSecond = m_nLeftSeconds - CCommonTools::genRandomNumber(1, 10);
@@ -1793,6 +1799,38 @@ void answerWidget::onRenderVideoFrame(const char* userId, TRTCVideoStreamType st
     }
 }
 
+void answerWidget::cameraCheckFiled()
+{
+    if(!m_bIsExitLogin)
+    {
+        m_bIsExitLogin = true;
+        awTimeLeftTips *wExitExam = new awTimeLeftTips(MASK_POP_WIDGET_TYPE::wt_exitExam, (QWidget*)(this->parent()));
+        wExitExam->setText(QString::fromLocal8Bit("未检测到有效摄像头信息，请调整后重试"), QString::fromLocal8Bit("退出考试"));
+        connect(wExitExam, &awTimeLeftTips::timeLeftConfirm, this, [this, wExitExam]() {
+            if (m_pNetWorkErrorTimerPtr)
+            {
+                m_pNetWorkErrorTimerPtr->stop();
+            }
+            delete wExitExam;
+            emit gobackLogin();
+        });
+        wExitExam->show();
+
+        if (m_pNetWorkErrorTimerPtr == nullptr)
+        {
+            m_pNetWorkErrorTimerPtr = std::make_shared<QTimer>();
+            m_pNetWorkErrorTimerPtr->setInterval(30 * 1000);
+            connect(m_pNetWorkErrorTimerPtr.get(), &QTimer::timeout, [this, wExitExam]() {
+                m_pNetWorkErrorTimerPtr->stop();
+                delete wExitExam;
+                emit gobackLogin();
+            });
+        }
+        m_pNetWorkErrorTimerPtr->start();
+    }
+    return;
+}
+
 void answerWidget::startCapture()
 {
 //    if(m_pinitTimer == nullptr)
@@ -1826,6 +1864,9 @@ void answerWidget::startCapture()
         m_nLastCaptureSecond = m_nLeftSeconds;
 
         connect(m_pVideoTimer.get(), &QTimer::timeout, this, [&](){
+            int nCameraCount = g_clientVideoProcPtr->getCameraCount();
+            QString sCameraInfo = g_clientVideoProcPtr->getCurrentCamera();
+
 
             cv::Mat frame;
             {
@@ -1835,14 +1876,56 @@ void answerWidget::startCapture()
 
             if(frame.empty())
             {
-                qDebug()<<"widgetCameraTest frame is empty";
-                return;
+                myServerLog()<<"widgetCameraTest frame is empty";
+                myServerLog()<<"nCameraCount:"<<nCameraCount<<",sCameraInfo:"<<sCameraInfo;
+//                return;
+            }
+
+            bool bCameraCheckField = false;
+            if(nCameraCount == 0 || frame.empty())
+            {
+                if(m_nCheckCameraTime == 0)
+                {
+                    m_nCheckCameraTime = QDateTime::currentDateTime().toSecsSinceEpoch();
+                }
+                bCameraCheckField = true;
+            }
+            else
+            {
+                m_nCheckCameraTime = 0;
+            }
+//            myServerLog()<<"m_nCheckCameraTime:"<<m_nCheckCameraTime;
+
+            if(m_bReAddFaceImage)
+            {
+                if(bCameraCheckField)
+                {
+                    if(m_nCheckCameraTime != 0 && QDateTime::currentDateTime().toSecsSinceEpoch() - m_nCheckCameraTime > 20)
+                    {
+                        cameraCheckFiled();
+                    }
+                    return ;
+                }
+
+                m_bReAddFaceImage = false;
+                if (g_inProcessFace != nullptr)
+                {
+                    g_inProcessFace->addImage(frame);
+                }
             }
 
             if (g_inProcessFace != nullptr &&
                     g_appInfoPtr->m_oExamInfo.bIsExamInProgress &&
                     !m_bExamInpressFaceCaptured)
             {
+                if(bCameraCheckField)
+                {
+                    if(m_nCheckCameraTime != 0 && QDateTime::currentDateTime().toSecsSinceEpoch() - m_nCheckCameraTime > 20)
+                    {
+                        cameraCheckFiled();
+                    }
+                    return ;
+                }
                 m_bExamInpressFaceCaptured = true;
                 g_inProcessFace->addImage(frame);
             }
@@ -1850,6 +1933,14 @@ void answerWidget::startCapture()
             if (g_inProcessFace != nullptr &&
                 m_nLastCaptureSecond - m_nLeftSeconds > g_appInfoPtr->m_oExamInfo.nSnapshotInterval*60)
             {
+                if(bCameraCheckField)
+                {
+                    if(m_nCheckCameraTime != 0 && QDateTime::currentDateTime().toSecsSinceEpoch() - m_nCheckCameraTime > 20)
+                    {
+                        cameraCheckFiled();
+                    }
+                    return ;
+                }
                 m_nLastCaptureSecond = m_nLeftSeconds;
                 g_inProcessFace->addImage(frame);
             }
@@ -1857,6 +1948,14 @@ void answerWidget::startCapture()
             if(g_inProcessFace != nullptr &&
                     m_nNextFaceCountSecond > m_nLeftSeconds)
             {
+                if(bCameraCheckField)
+                {
+                    if(m_nCheckCameraTime != 0 && QDateTime::currentDateTime().toSecsSinceEpoch() - m_nCheckCameraTime > 20)
+                    {
+                        cameraCheckFiled();
+                    }
+                    return ;
+                }
 				m_nNextFaceCountSecond = m_nLeftSeconds - CCommonTools::genRandomNumber(1, 10);
                 g_inProcessFace->addFaceCountImage(frame);
             }

client/answerWidget.h

@@ -93,6 +93,9 @@ private:
 	void checkRemoteBreach();
     void setChecked(QPushButton *btn, bool bChecked);
     bool allMutipleQuestionHas2Answers();
+    void cameraCheckFiled();
+
+    int m_nCheckCameraTime = 0;
 
     Ui::answerWidget *ui;
 	
@@ -134,8 +137,10 @@ private:
 	QStringList m_sRemoteTipList;
 
 
+    bool m_bReAddFaceImage = false;
     bool m_bExamInpressFaceCaptured = false;
     int m_nRetryCount = 0;
+    bool m_bIsExitLogin = false;
 };
 
 #endif // ANSWERWIDGET_H

client/awTimeLeftTips.cpp

@@ -71,7 +71,7 @@ void awTimeLeftTips::initUI()
     setGeometry(0, 0, dekwiget->width(), dekwiget->height());
 	ui->widget_mask->setGeometry(0, 0, width(), height());
 	ui->widget_awtlt_bg->setGeometry((width() - g_appInfoPtr->m_fRate*420)/2,
-		g_appInfoPtr->m_fRate * 190, g_appInfoPtr->m_fRate*420, g_appInfoPtr->m_fRate*190);
+        g_appInfoPtr->m_fRate * 190, g_appInfoPtr->m_fRate*420, g_appInfoPtr->m_fRate*190);
 	ui->label_awtlt_title->adjustSize();
 	ui->label_awtlt_title->setGeometry(g_appInfoPtr->m_fRate *20, g_appInfoPtr->m_fRate *20,
 		ui->label_awtlt_title->width(), ui->label_awtlt_title->height());	

common/CCommonTools.cpp

@@ -849,13 +849,13 @@ namespace CCommonTools
             }
             else
             {
-                myDebug()<<"Mat to Image error";
+                myServerLog()<<"Mat to Image error";
                 return QImage();
             }
         }
         catch(std::exception &e)
         {
-            myDebug()<<"Mat2QImage"<<e.what();
+            myServerLog()<<"Mat2QImage"<<e.what();
             return QImage();
         }
     }

common/CHttpBll.cpp

@@ -1167,6 +1167,22 @@ void CHttpBll::requestProc(CHttpRequestPackage requestPkg)
         }
         break;
 
+        case RequestType::rtGetWXUploadedFile:
+        {
+            CGetWXUploadedFile res;
+            res.nCode = nCode;
+            if (sErrorMsg != "" || nCode != 200)
+            {
+                res.sMessage = sErrorMsg;
+            }
+            else
+            {
+                genGetWXUploadedFile(&res, sResponse);
+            }
+            emit sgnGetWXUploadedFile(res);
+        }
+        break;
+
         default:
         break;
     }
@@ -2725,3 +2741,27 @@ void CHttpBll::genSkipFaceCheckParam(CSkipFaceCheckParam *pSkipFaceCheckParam, c
         myServerLog()<<sResponse.c_str()<<",exception error"<<e.what();
     }
 }
+
+void CHttpBll::genGetWXUploadedFile(CGetWXUploadedFile *pGetWXUploadedFile, const std::string &sResponse)
+{
+    try
+    {
+        Json::Reader reader;
+        Json::Value jsonRoot = Json::Value::null;
+        if (!reader.parse(sResponse, jsonRoot))
+        {
+            pGetWXUploadedFile->sMessage = QString::fromLocal8Bit("数据请求失败，请检查网络是否正常！");
+            myDebug() << pGetWXUploadedFile->sMessage << sResponse.c_str();
+        }
+
+        pGetWXUploadedFile->nExamRecordDataId = jsonRoot["examRecordDataId"].asInt64();
+        pGetWXUploadedFile->nQuestionOrder = jsonRoot["questionOrder"].asInt();
+        pGetWXUploadedFile->sFilePath = jsonRoot["filePath"].asString().c_str();
+        pGetWXUploadedFile->sStatus = jsonRoot["status"].asString().c_str();
+        pGetWXUploadedFile->sTransferFileType = jsonRoot["transferFileType"].asString().c_str();
+    }
+    catch (const std::exception &e)
+    {
+        myServerLog()<<sResponse.c_str()<<",exception error"<<e.what();
+    }
+}

common/CHttpBll.h

@@ -75,6 +75,7 @@ signals:
     void sgnUploadFileToAliyun(CUploadFileToAliyun uploadFileToAliyun);
     void sgnExamControlCheckTime(CBaseResponsePackage res);
     void sgnSkipFaceCheckParam(CSkipFaceCheckParam skipFaceCheckParam);
+    void sgnGetWXUploadedFile(CGetWXUploadedFile getWXUploadedFile);
 public:
     CHttpBll();
 
@@ -140,6 +141,7 @@ private:
 
 	void genExamCourseInfo(const Json::Value &jExamItem, CExamCourseInfo &eci);
     void genSkipFaceCheckParam(CSkipFaceCheckParam *pSkipFaceCheckParam, const std::string &sResponse);
+    void genGetWXUploadedFile(CGetWXUploadedFile *pGetWXUploadedFile, const std::string &sResponse);
 
 	QString sKey;
     QString sToken;

common/httpDataDef.h

@@ -89,7 +89,8 @@ enum class RequestType
     rtClientExamProcessUploadSign,//文件上传签名信息
     rtUploadFileToAliyun,
     rtExamControlCheckTime, //交卷冻结时间检查
-    rtSkipFaceCheckParam//检查当前考生是否跳过人脸识别接口
+    rtSkipFaceCheckParam,//检查当前考生是否跳过人脸识别接口
+    rtGetWXUploadedFile //查询小程序端已上传的文件结果接口
 };
 
 class CHttpRequestPackage
@@ -1462,4 +1463,15 @@ class CSkipFaceCheckParam : public CBaseResponsePackage
 public:
     bool bSkipFaceCheck = false;
 };
+
+class CGetWXUploadedFile : public CBaseResponsePackage
+{
+public:
+    __int64 nExamRecordDataId = 0;
+    int nQuestionOrder = 0;
+    QString sFilePath = "";
+    QString sStatus = "";
+    QString sTransferFileType = "";
+};
+
 #endif // HTTPDATADEF_H

face/inprogressFace.cpp

@@ -5,6 +5,7 @@
 #include "CFaceRecProc.h"
 #include "CAppInfo.h"
 #include "json/json.h"
+#include <QFileInfo>
 
 std::shared_ptr<CInprogressFace> g_inProcessFace = nullptr;
 
@@ -163,7 +164,7 @@ void CInprogressFace::threadProc()
 
                 if(matImage.empty())
                 {
-                    myDebug()<<"matImage.empty";
+                    myServerLog()<<"matImage.empty";
                     continue;
                 }
 
@@ -171,12 +172,12 @@ void CInprogressFace::threadProc()
                 float fScore = 0;
                 bool bRealness = false;
                 int nTime = 0;
-                if(!g_faceRecProcPtr->getMaxFaceScoreWithBase(matImage, nFaceCount, fScore, bRealness, nTime))
+                if(!g_faceRecProcPtr->getMaxFaceScoreWithBase(matImage.clone(), nFaceCount, fScore, bRealness, nTime))
                 {
                     //比对失败
                     QString sErrorMsg = g_faceRecProcPtr->errorMsg();
                     myDebug()<<QString::fromLocal8Bit("人脸检测失败:")<<sErrorMsg;
-                    uploadFile(matImage, nFaceCount, fScore, bRealness);
+                    uploadFile(matImage.clone(), nFaceCount, fScore, bRealness);
                     emit compareFailed(sErrorMsg);
                 }
                 else
@@ -184,18 +185,18 @@ void CInprogressFace::threadProc()
                     if(nFaceCount == 0)
                     {
                         //无人脸
-                        uploadFile(matImage, nFaceCount, fScore, bRealness);
+                        uploadFile(matImage.clone(), nFaceCount, fScore, bRealness);
                         emit compareFailed(QString::fromLocal8Bit("请让我看到您的正脸"));
                     }
                     else if(nFaceCount > 1 && g_appInfoPtr->m_oExamInfo.bIsStrangerEnable)
                     {
                         //陌生人
-                        uploadFile(matImage, nFaceCount, fScore, bRealness);
+                        uploadFile(matImage.clone(), nFaceCount, fScore, bRealness);
                         emit compareFailed(QString::fromLocal8Bit("检测到陌生人"));
                     }
 					else
 					{
-						uploadFile(matImage, nFaceCount, fScore, bRealness);
+                        uploadFile(matImage.clone(), nFaceCount, fScore, bRealness);
 					}
                 }
 
@@ -212,10 +213,49 @@ void CInprogressFace::uploadFile(cv::Mat faceMat, int nFaceCount, float fScore,
 {
     QString sFileName = QString("temp/photo/%1.png").arg(CCommonTools::getUuid());
     QImage imgCompare = CCommonTools::Mat2QImage(faceMat);
-    imgCompare.save(sFileName, "PNG");
+    if(imgCompare.isNull() || !imgCompare.save(sFileName, "PNG"))
+    {
+        myServerLog()<<"imgCompare is null:"<<imgCompare.isNull();
+        try
+        {
+            QFileInfo file(sFileName);
+            cv::imwrite(file.absoluteFilePath().toStdString(), faceMat);
+        }
+        catch (std::exception &e)
+        {
+            emit reAddImage();
+            myServerLog()<<"cv::imwrite failed reAddImage";
+            return;
+        }
+    }
+
+    QFile file(sFileName);
+    if(!file.exists())
+    {
+        emit reAddImage();
+        myServerLog()<<sFileName<<" is not exists reAddImage";
+        return;
+    }
+
+    if(!file.open(QIODevice::ReadOnly))
+    {
+        emit reAddImage();
+        myServerLog()<<"open file failed reAddImage";
+        return;
+    }
+
+    if(file.size() < 1024)
+    {
+        emit reAddImage();
+        myServerLog()<<"reAddImage, filesize < 1kb";
+        return;
+    }
+
+
 
     CHttpRequestPackage hrp;
     hrp.sUri = "/api/ecs_oe_student/client/exam/process/upload/sign";
+    hrp.nRetryCount = 10;
     hrp.nRequestType = RequestType::rtClientExamProcessUploadSign;
     hrp.sParamList.push_back(QString("fileSuffix,%1").arg(".png"));
     hrp.sParamList.push_back(QString("fileMd5,%1").arg(CCommonTools::fileMd5(sFileName)));
@@ -241,6 +281,7 @@ void CInprogressFace::onClientExamProcessUploadSign(CClientExamProcessUploadSign
 			if (processUpload.nCode == 200)
 			{
                 CHttpRequestPackage hrp;
+                hrp.nRetryCount = 10;
                 hrp.sUri = processUpload.sFormUrl;
                 hrp.nRequestType = RequestType::rtUploadFileToAliyun;
                 hrp.sCommonStr = QString("%1,%2,%3,%4").arg(__FILE__).arg(nFaceCount).arg(fScore).arg(nRealness);;
@@ -258,7 +299,7 @@ void CInprogressFace::onClientExamProcessUploadSign(CClientExamProcessUploadSign
 			}
 			else
 			{
-
+                emit reAddImage();
 			}
         }
     }   
@@ -279,6 +320,7 @@ void CInprogressFace::onUploadFileToAliyun(CUploadFileToAliyun uploadFileToAliyu
             if (uploadFileToAliyun.nCode == 200)
             {
                 CHttpRequestPackage hrp;
+                hrp.nRetryCount = 10;
                 hrp.sUri = "/api/ecs_oe_student/client/exam/process/saveFaceCaptureResult";
                 hrp.nRequestType = RequestType::rtSaveFaceCaptureResult;
                 Json::Value jBody = Json::Value::null;
@@ -297,7 +339,7 @@ void CInprogressFace::onUploadFileToAliyun(CUploadFileToAliyun uploadFileToAliyu
             }
             else
             {
-
+                emit reAddImage();
             }
         }
     }
@@ -312,6 +354,6 @@ void CInprogressFace::onSaveFaceCaptureResult(CBaseResponsePackage res)
     }
     else
     {
-
+        emit reAddImage();
     }
 }

face/inprogressFace.h

@@ -13,6 +13,7 @@ class CInprogressFace : public QObject
 
 signals:
     void compareFailed(QString sErrorMsg);
+    void reAddImage();
 public:
     CInprogressFace();
     ~CInprogressFace();

launcher/envCheck.cpp

@@ -223,7 +223,7 @@ void envCheck::checkProc()
 
         if(CCommonTools::isUseRDP())
         {
-            sCheckStr = QString::fromLocal8Bit("请检测是否开启远程桌面");
+            sCheckStr = QString::fromLocal8Bit("请关闭远程桌面");
             qDebug()<<QString::fromLocal8Bit("环境检测异常,")<<sCheckStr;
         }
 
@@ -233,7 +233,7 @@ void envCheck::checkProc()
         {
             if(sCheckStr.isEmpty())
             {
-                sCheckStr = QString::fromLocal8Bit("请检测是否开启分屏");
+                sCheckStr = QString::fromLocal8Bit("请关闭分屏");
             }
             else
             {
@@ -259,7 +259,7 @@ void envCheck::checkProc()
                 {
                     if(sCheckStr.isEmpty())
                     {
-                        sCheckStr = QString::fromLocal8Bit("请检测是否存在虚拟摄像头%1").arg(ci.name);
+                        sCheckStr = QString::fromLocal8Bit("请关闭虚拟摄像头%1").arg(ci.name);
                     }
                     else
                     {
@@ -293,7 +293,7 @@ void envCheck::checkProc()
             {
 //                if(sCheckStr.isEmpty())
 //                {
-                    sCheckStr = QString::fromLocal8Bit("请检测是否开启%1").arg(appList[i]);
+                    sCheckStr = QString::fromLocal8Bit("请关闭%1").arg(appList[i]);
                     m_unpasslist.push_back(sCheckStr);
 //                }
 //                else

question/wxAnswer.cpp

@@ -26,6 +26,8 @@ wxAnswer::wxAnswer(QString sAnswerType, int nOrder, QWidget *parent) :
     connect(g_httpBllPtr.get(), &CHttpBll::sgnSaveUploadedFileAcknowledgeStatus, this, &wxAnswer::onSaveUploadedFileAcknowledgeStatus);
     qRegisterMetaType<CDownLoadFileInfo>("CDownLoadFileInfo");
     connect(g_httpBllPtr.get(), &CHttpBll::sgnDownLoadFile, this, &wxAnswer::onDownLoadFile);
+    qRegisterMetaType<CGetWXUploadedFile>("CGetWXUploadedFile");
+    connect(g_httpBllPtr.get(), &CHttpBll::sgnGetWXUploadedFile, this, &wxAnswer::onGetWXUploadedFile);
 
     if (g_websocketPtr == nullptr)
     {
@@ -129,6 +131,21 @@ wxAnswer::wxAnswer(QString sAnswerType, int nOrder, QWidget *parent) :
         }
 
     });
+
+    m_pRefreshTimer = std::make_shared<QTimer>();
+    m_pRefreshTimer->setInterval(1000);
+    connect(m_pRefreshTimer.get(), &QTimer::timeout, this, [&]() {
+        --m_nRefreshSeconds;
+        ui->btn_refresh->setText(QString::fromLocal8Bit("倒计时%1s").arg(m_nRefreshSeconds));
+
+
+        if(m_nRefreshSeconds <= 0)
+        {
+            m_pRefreshTimer->stop();
+            ui->btn_refresh->setEnabled(true);
+            ui->btn_refresh->setText(QString::fromLocal8Bit("刷新"));
+        }
+    });
 	
 }
 
@@ -305,6 +322,11 @@ int wxAnswer::setUI(const int nWidth)
         ui->label_wxa_status->setGeometry(ui->label_wxa_statusIcon->x() + ui->label_wxa_statusIcon->width() + g_appInfoPtr->m_fRate*10,
                                           ui->label_wxa_statusIcon->y() + (ui->label_wxa_statusIcon->height() - ui->label_wxa_status->height())/2,
                                           ui->label_wxa_status->width(), ui->label_wxa_status->height());
+        ui->btn_refresh->setGeometry(g_appInfoPtr->m_fRate*20, ui->widget_wxa->height() - g_appInfoPtr->m_fRate*(30 + 30),
+                                     g_appInfoPtr->m_fRate*80, g_appInfoPtr->m_fRate*30);
+        ui->label_refreshTip->adjustSize();
+        ui->label_refreshTip->setGeometry(ui->btn_refresh->x() + ui->btn_refresh->width() + g_appInfoPtr->m_fRate*10, ui->btn_refresh->y() + ui->btn_refresh->height()/2 - ui->label_refreshTip->height()/2,
+                                          ui->label_refreshTip->width(), ui->label_refreshTip->height());
         ui->btn_wxa_comfirm->setGeometry((ui->widget_wxa->width() - g_appInfoPtr->m_fRate*120)/2, ui->widget_wxa->height() - g_appInfoPtr->m_fRate*(30 + 40),
                                          g_appInfoPtr->m_fRate*120, g_appInfoPtr->m_fRate*40);
     }
@@ -624,3 +646,115 @@ void wxAnswer::on_btn_etvt_volume_clicked()
     }
     m_bMute = !m_bMute;
 }
+
+void wxAnswer::on_btn_refresh_clicked()
+{
+    ui->btn_refresh->setEnabled(false);
+
+    CHttpRequestPackage hrp;
+    hrp.sUri = "/api/ecs_oe_student/examControl/getUploadedFile";
+    hrp.nRequestType = RequestType::rtGetWXUploadedFile;
+    hrp.sParamList.push_back(QString("examRecordDataId,%1").arg(g_appInfoPtr->m_oExamInfo.nExamRecordDataId));
+    hrp.sParamList.push_back(QString("questionOrder,%1").arg(m_nOrder));
+    hrp.eParamType = HttpParamType::hptUrl;
+    g_httpBllPtr->post(hrp);
+
+    m_pRefreshTimer->start();
+    m_nRefreshSeconds = 20;
+    ui->btn_refresh->setText(QString::fromLocal8Bit("倒计时%1s").arg(m_nRefreshSeconds));
+}
+
+void wxAnswer::onGetWXUploadedFile(CGetWXUploadedFile getWXUploadedFile)
+{
+    if(getWXUploadedFile.nCode == 200)
+    {
+        if(getWXUploadedFile.sStatus == "UNCONFIRMED")
+        {
+            CHttpRequestPackage hrp;
+            hrp.sUri = "/api/ecs_oe_student/examControl/saveUploadedFileAcknowledgeStatus";
+            hrp.nRequestType = RequestType::rtSaveUploadedFileAcknowledgeStatus;
+            Json::Value jBody = Json::Value::null;
+            jBody["examRecordDataId"] = g_appInfoPtr->m_oExamInfo.nExamRecordDataId;
+            jBody["order"] = m_nOrder;
+            jBody["filePath"] = getWXUploadedFile.sFilePath.toStdString();
+            jBody["acknowledgeStatus"] = "CONFIRMED";
+            hrp.sParamList.push_back(QString("CustomBody,%1").arg(jBody.toStyledString().c_str()));
+            hrp.sCommonStr = getWXUploadedFile.sFilePath;
+            hrp.eParamType = HttpParamType::hptCustomBody;
+            g_httpBllPtr->post(hrp);
+
+
+            QString sFileUrl = getWXUploadedFile.sFilePath;
+            if(m_sAnswerType == "SINGLE_AUDIO")
+            {
+                m_sFileUrl = sFileUrl;
+                {
+                    QString sFileName = sFileUrl.right(sFileUrl.length() - sFileUrl.lastIndexOf("/") - 1);
+                    sFileName = g_appInfoPtr->m_sCacheFileDir + sFileName;
+                    CHttpRequestPackage hrp;
+                    hrp.sUri = sFileUrl;
+                    hrp.sCommonStr = sFileName;
+                    hrp.sCommonStr1 = __FILE__;
+                    hrp.nRequestType = RequestType::rtDownLoadFile;
+                    hrp.nRetryCount = 3;
+                    g_httpBllPtr->downLoad(hrp);
+                }
+            }
+            else
+            {
+                if(m_picList == nullptr)
+                {
+                    m_picList = std::make_shared<wPictureList>(g_appInfoPtr->m_fRate*108, g_appInfoPtr->m_fRate*10, ui->widget_wxa);
+                }
+
+                QStringList answerList = m_picList->getFileUrls().split(",");
+
+                QStringList fileList;
+                if(!sFileUrl.isEmpty())
+                {
+                    fileList = sFileUrl.split(",");
+                    for (QString sFile : fileList)
+                    {
+                        if(answerList.indexOf(sFile) < 0)
+                        {
+                            m_picList->AddPic(sFile);
+                        }
+                    }
+                }
+
+                if(m_picList->itemCount() > 5)
+                {
+                    ui->label_wxa_qrcode->setVisible(false);
+                }
+
+                int nHeight = m_picList->setUI(g_appInfoPtr->m_fRate*30, ui->label_wxa_qrcode->y() + ui->label_wxa_qrcode->height() + g_appInfoPtr->m_fRate*20,
+                                       ui->widget_wxa->width() - g_appInfoPtr->m_fRate*30*2);
+                ui->btn_refresh->setGeometry(g_appInfoPtr->m_fRate*20, ui->widget_wxa->height() - g_appInfoPtr->m_fRate*(30 + 30),
+                                             g_appInfoPtr->m_fRate*80, g_appInfoPtr->m_fRate*30);
+                ui->label_refreshTip->adjustSize();
+                ui->label_refreshTip->setGeometry(ui->btn_refresh->x() + ui->btn_refresh->width() + g_appInfoPtr->m_fRate*10, ui->btn_refresh->y() + ui->btn_refresh->height()/2 - ui->label_refreshTip->height()/2,
+                                                  ui->label_refreshTip->width(), ui->label_refreshTip->height());
+                ui->btn_wxa_comfirm->setGeometry((ui->widget_wxa->width() - g_appInfoPtr->m_fRate*120)/2, m_picList->y() + m_picList->height() + g_appInfoPtr->m_fRate*30,
+                                                 g_appInfoPtr->m_fRate*120, g_appInfoPtr->m_fRate*40);
+                ui->widget_wxa->setGeometry((width() - g_appInfoPtr->m_fRate*760)/2, (height() - (ui->btn_wxa_comfirm->y() + ui->btn_wxa_comfirm->height() + g_appInfoPtr->m_fRate*30))/2,
+                                            g_appInfoPtr->m_fRate*760, ui->btn_wxa_comfirm->y() + ui->btn_wxa_comfirm->height() + g_appInfoPtr->m_fRate*30);
+
+
+                m_picList->show();
+            }
+            ui->label_wxa_status->setText(QString::fromLocal8Bit("已上传"));
+            ShowMsg(QString::fromLocal8Bit("小程序作答已更新"), g_appInfoPtr->m_pAnsBgWidget, MSG_ICON_TYPE::mit_information);
+        }
+    }
+    else
+    {
+        if(getWXUploadedFile.sMessage.isEmpty())
+        {
+            ShowMsg(QString::fromLocal8Bit("同步拍照作答失败"), g_appInfoPtr->m_pAnsBgWidget, MSG_ICON_TYPE::mit_error);
+        }
+        else
+        {
+            ShowMsg(getWXUploadedFile.sMessage, g_appInfoPtr->m_pAnsBgWidget, MSG_ICON_TYPE::mit_error);
+        }
+    }
+}

question/wxAnswer.h

@@ -35,6 +35,7 @@ private slots:
     void onFileAnswer(__int64 nExamRecordDataId, int nOrder, QString sFileType, QString sFileUrl);
     void onSaveUploadedFileAcknowledgeStatus(CSaveUploadedFileAcknowledgeStatus saveUploadedFileAcknowledgeStatus);
     void onDownLoadFile(CDownLoadFileInfo downLoadFileInfo);
+    void onGetWXUploadedFile(CGetWXUploadedFile getWXUploadedFile);
 
 
     void on_btn_wxa_close_clicked();
@@ -49,12 +50,16 @@ private slots:
 
     void on_btn_etvt_volume_clicked();
 
+    void on_btn_refresh_clicked();
+
 private:
     Ui::wxAnswer *ui;
     int m_nOrder;
     QString m_sAnswerType;
     QString m_sFileUrl;
     std::shared_ptr<wPictureList> m_picList;
+    std::shared_ptr<QTimer> m_pRefreshTimer;
+    int m_nRefreshSeconds = 20;
 
     int m_nPlayVol;
 

question/wxAnswer.ui

@@ -234,6 +234,32 @@
       </property>
      </widget>
     </widget>
+    <widget class="QPushButton" name="btn_refresh">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>360</y>
+       <width>93</width>
+       <height>28</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>刷新</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_refreshTip">
+     <property name="geometry">
+      <rect>
+       <x>100</x>
+       <y>370</y>
+       <width>72</width>
+       <height>15</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>同步拍照作答</string>
+     </property>
+    </widget>
    </widget>
   </widget>
  </widget>