1. 弹窗设为置顶。 2. 日志打印加锁。 3.提示消息加标志。

FMVip/fmvipdispatcher.cpp

@@ -213,7 +213,7 @@ void FMVipDispatcher::onServerResponsed(const QJsonObject &rspObj)
             else if(isPayLogin) {
                 if(canPay != 1) {
                     _vindow->resetWnd();
-                    FMMsgWnd::FailureWnd("请使用支付码付款");
+                    FMMsgWnd::FailureWnd("fmv:请使用支付码付款");
                     return;
                 }
                 isPayLogin = false;

FMVip/fmvipdispatcher.h

@@ -8,8 +8,8 @@
 #include <QMutex>
 #include <QWaitCondition>
 
-#define Err_WindowClose "{\"statusCode\":1001, \"prompt\":0, \"msg\":\"窗口异常关闭\"}"
-#define Err_ErrorFMCMD "{\"statusCode\":1002, \"prompt\":1, \"msg\":\"无法识别的请求类型\"}"
+#define Err_WindowClose "{\"statusCode\":1001, \"prompt\":0, \"msg\":\"fmv:窗口异常关闭\"}"
+#define Err_ErrorFMCMD "{\"statusCode\":1002, \"prompt\":1, \"msg\":\"fmv:无法识别的请求类型\"}"
 
 #define _DEBUG
 

FMVip/fmvipforward.cpp

@@ -148,7 +148,7 @@ void FMVipForward::onServerFinished(QNetworkReply *reply, bool isTimeOut)
             QJsonDocument jdoc(_needBackupReqJob);
             FMBackup::instance()->updateReqData(newId, _req.url().toString(), jdoc.toJson(QJsonDocument::Compact));
             posObj["statusCode"] = 100;
-            posObj["msg"] = "结算成功";
+            posObj["msg"] = "fmv:结算成功";
             posObj["fm_id"] = uuid;
             posObj["prompt"] = 1;
             posObj["print1"] = "";
@@ -156,7 +156,7 @@ void FMVipForward::onServerFinished(QNetworkReply *reply, bool isTimeOut)
         } else {
             posObj["statusCode"] = 404;
             QString errCode = QString::number(int(reply->error()));
-            QString errMsg = "网络连接错误(%1): %2";
+            QString errMsg = "fmv:网络连接错误(%1): %2";
             // 获取错误提示
             QSettings setting(qApp->applicationDirPath()+"/config.ini", QSettings::IniFormat);
             setting.setIniCodec("GBK");
@@ -168,7 +168,7 @@ void FMVipForward::onServerFinished(QNetworkReply *reply, bool isTimeOut)
             posObj["msg"] = errMsg.arg(errCode).arg(errInfo);
             setting.endGroup();
             if (isTimeOut) {
-                posObj["msg"] = "向非码服务器请求超时";
+                posObj["msg"] = "fmv:向非码服务器请求超时";
             }
         }
 
@@ -181,7 +181,7 @@ void FMVipForward::onServerFinished(QNetworkReply *reply, bool isTimeOut)
 
         if(err.error != QJsonParseError::NoError || !jdoc.isObject()) {
             posObj["statusCode"] = 1000;
-            posObj["msg"] = "服务器返回数据异常";
+            posObj["msg"] = "fmv:服务器返回数据异常";
         } else {
             QJsonObject serverObj = jdoc.object();
 

FMVip/fmvipwnd.cpp

@@ -13,7 +13,7 @@ FMVipWnd::FMVipWnd(QDialog *parent) :
     QDialog(parent),
     loadingWindow(new FMLoading(parent))
 {
-    setWindowFlags(Qt::FramelessWindowHint);
+    setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
     setAttribute(Qt::WA_QuitOnClose, false);
     setIsBusy(false);
 }
@@ -76,7 +76,7 @@ int FMVipWnd::exec()
     ::SetForegroundWindow((HWND)effectiveWinId());
 
     ::SetWindowPos( (HWND)effectiveWinId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
-    ::SetWindowPos( (HWND)effectiveWinId(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
+//    ::SetWindowPos( (HWND)effectiveWinId(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 
     showNormal();
     ::SetForegroundWindow((HWND)effectiveWinId());

FMVipDC/include/fmutils/fmutils.hpp

@@ -147,7 +147,7 @@ public:
                 WideCharToMultiByte(CP_ACP, 0, msg, -1, buff, str_size, NULL, NULL);
 
                 {
-                    //FMAutoLock auto_lock(_logger_cs);
+                    FMAutoLock auto_lock(_logger_cs);
                     _Log(buff);
                 }
 
@@ -186,6 +186,7 @@ public:
             memset((void*)msg, 0, size);
             vsprintf(msg, format, arg_ptr);
 
+            FMAutoLock auto_lock(_logger_cs);
             _Log(msg);
             delete []msg;
         }