|
@@ -113,32 +113,36 @@ export function closeWsWithoutReconnect() {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-export function getQRCode(order, transferFileType, testEnv) {
|
|
|
|
- if (ws.readyState === ws.OPEN) {
|
|
|
|
- ws.send(
|
|
|
|
- JSON.stringify({
|
|
|
|
- eventType: "GET_QR_CODE",
|
|
|
|
- order,
|
|
|
|
- transferFileType: transferFileType,
|
|
|
|
- ...testEnv,
|
|
|
|
- })
|
|
|
|
- );
|
|
|
|
- return true;
|
|
|
|
- } else {
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
|
|
+// export function getQRCode(order, transferFileType, testEnv) {
|
|
|
|
+// if (ws.readyState === ws.OPEN) {
|
|
|
|
+// ws.send(
|
|
|
|
+// JSON.stringify({
|
|
|
|
+// eventType: "GET_QR_CODE",
|
|
|
|
+// order,
|
|
|
|
+// transferFileType: transferFileType,
|
|
|
|
+// ...testEnv,
|
|
|
|
+// })
|
|
|
|
+// );
|
|
|
|
+// return true;
|
|
|
|
+// } else {
|
|
|
|
+// return false;
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
|
|
function processWSMessage(event) {
|
|
function processWSMessage(event) {
|
|
- // console.log("get ws msg: ", event);
|
|
|
|
|
|
+ console.log("get ws msg: ", event);
|
|
let res;
|
|
let res;
|
|
try {
|
|
try {
|
|
- res = JSON.parse(event.data);
|
|
|
|
|
|
+ res = JSON.parse(event.data).content;
|
|
} catch (error) {
|
|
} catch (error) {
|
|
window._hmt.push(["_trackEvent", "websocket", "JSON.parse出错" + error]);
|
|
window._hmt.push(["_trackEvent", "websocket", "JSON.parse出错" + error]);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (res.eventType !== "HEARTBEAT" && !res.isSuccess) {
|
|
|
|
|
|
+ if (!res) {
|
|
|
|
+ console.log("ws message format error", event);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if (res.eventType && res.eventType !== "HEARTBEAT" && !res.isSuccess) {
|
|
Message.error({
|
|
Message.error({
|
|
content: res.errorMessage,
|
|
content: res.errorMessage,
|
|
duration: 10,
|
|
duration: 10,
|
|
@@ -150,14 +154,14 @@ function processWSMessage(event) {
|
|
case "HEARTBEAT":
|
|
case "HEARTBEAT":
|
|
// console.log("ws heartbeat response from server");
|
|
// console.log("ws heartbeat response from server");
|
|
break;
|
|
break;
|
|
- case "GET_QR_CODE":
|
|
|
|
- console.log("get qrcode", res);
|
|
|
|
- window._hmt.push(["_trackEvent", "websocket", "获得二维码"]);
|
|
|
|
- store.commit("examingHomeModule/setQuestionQrCode", {
|
|
|
|
- qrCode: res.data.qrCode,
|
|
|
|
- order: res.data.order,
|
|
|
|
- });
|
|
|
|
- break;
|
|
|
|
|
|
+ // case "GET_QR_CODE":
|
|
|
|
+ // console.log("get qrcode", res);
|
|
|
|
+ // window._hmt.push(["_trackEvent", "websocket", "获得二维码"]);
|
|
|
|
+ // store.commit("examingHomeModule/setQuestionQrCode", {
|
|
|
|
+ // qrCode: res.data.qrCode,
|
|
|
|
+ // order: res.data.order,
|
|
|
|
+ // });
|
|
|
|
+ // break;
|
|
case "SCAN_QR_CODE":
|
|
case "SCAN_QR_CODE":
|
|
console.log("wx scanned qrcode", res);
|
|
console.log("wx scanned qrcode", res);
|
|
window._hmt.push(["_trackEvent", "websocket", "二维码被扫描"]);
|
|
window._hmt.push(["_trackEvent", "websocket", "二维码被扫描"]);
|