Browse Source

修改页面异常提示语

huangxiaojing 3 years ago
parent
commit
a6a88003b8
3 changed files with 11 additions and 6 deletions
  1. 5 1
      screenAndroid/WXtrialInterface.html
  2. 2 1
      screenIos/WXtrialInterface.html
  3. 4 4
      screenIos/websocket.js

+ 5 - 1
screenAndroid/WXtrialInterface.html

@@ -202,6 +202,8 @@
         if (ws.readyState === 1) {
           ws.send("ping");
         } else {
+					clearInterval(intervaler);
+					$.toast("画面异常,请重新进入", "text");
           wx.miniProgram.switchTab({
 						url: '/pages/home/home'
 					});
@@ -220,6 +222,8 @@
 				clearInterval(intervaler);
 				throttle(doConnect, 100);
 				if (errorTime > 1000) {
+					$.toast("画面异常,请重新进入", "text");
+					wsss.close();
 					wx.miniProgram.switchTab({
 						url: '/pages/home/home'
 					})
@@ -344,7 +348,7 @@
 						ws.send(checkBuffer);
 					}
 					else {
-						$.toast("音视频鉴权失败", "text");
+						$.toast("画面异常,请重新进入", "text");
 						clearInterval(intervaler);
 						ws.close();
 						wsss.close();

+ 2 - 1
screenIos/WXtrialInterface.html

@@ -692,7 +692,7 @@
 						decodeWoker.postMessage(checkBuffer);
 					}
 					else {
-						$.toast("音视频鉴权失败", "text");
+						$.toast("画面异常,请重新进入", "text");
 						decodeWoker.postMessage('close');
 						decodeWoker.terminate();
 						webSocketWorker.terminate();
@@ -719,6 +719,7 @@
 				}
 			}
 			if (event.data === 'close') {
+				$.toast("画面异常,请重新进入", "text");
 				decodeWoker.postMessage('close');
 				decodeWoker.terminate();
 				webSocketWorker.terminate();

+ 4 - 4
screenIos/websocket.js

@@ -30,9 +30,8 @@ function doConnect() {
 		if (ws.readyState === 1) {
 			ws.send("ping");
 		} else {
-			wx.miniProgram.switchTab({
-				url: '/pages/home/home'
-			});
+			clearInterval(intervaler);
+			self.postMessage('close');
 		}
 	}, 3000);
 	ws.onerror = function () {
@@ -60,7 +59,8 @@ function doConnect() {
 
 	self.addEventListener('message', function (e) {
 		if (e === 'close') {
-			ws.close()
+			clearInterval(intervaler);
+			ws.close();
 		} else {
 			ws.send(e.data);
 		}