huangxiaojing 4 years ago
parent
commit
f2901a5f16
3 changed files with 7 additions and 37 deletions
  1. 4 1
      screenIos/WXtrialInterface.html
  2. 0 5
      screenIos/decoder.js
  3. 3 31
      screenIos/websocket.js

+ 4 - 1
screenIos/WXtrialInterface.html

@@ -455,10 +455,13 @@
 			var input = event.data;
 			if (input[0] == 0xff) {
 				decodeAAC(input);
+				$('.weui-mask_transparent').hide()
+				$('.weui-toast').hide()
+				$('.loading').hide()
 			}
 		}
 
-		function Close() { //webworker 关闭,清理
+		function Close() { // webworker 关闭,清理
 			var cmd = {
 				cmd: 0
 			};

+ 0 - 5
screenIos/decoder.js

@@ -13,14 +13,9 @@ self.Module = {
 };
 
 self.importScripts("ffmpeghelper.js");
-self.importScripts("workerFakeDom.js");
-self.importScripts("jquery-1.11.0.min.js");
 
 self.addEventListener('message', function (e) {
 	h264Queue.push(e.data);
-	$('.leftmains').hide()
-	$('.bottommains').hide()
-	$('#btnMuted').hide()
 }, false);
 
 function PrintfLog(str) {

+ 3 - 31
screenIos/websocket.js

@@ -1,7 +1,4 @@
 self.importScripts("helper.js");
-self.importScripts("workerFakeDom.js");
-self.importScripts("jquery-1.11.0.min.js");
-self.importScripts("jquery-weui.min.js");
 var parameters = GetRequest();
 var ip = parameters["ip"];
 var socketURL = "ws://192.168.198.82:9100/card?cardIp=" + ip;
@@ -13,36 +10,11 @@ function doConnect() {
 	ws.binaryType = 'arraybuffer';
 
 	ws.onclose = function (e) {
-		$.confirm({
-			title: '提示',
-			text: '连接断开,是否准备重连?',
-			onOK: function () {
-				doConnect();
-			},
-			onCancel: function () {
-				wx.miniProgram.switchTab({
-					url: '/pages/home/home'
-				})
-			}
-		});
+		alert("websocket连接断开,准备重连");
+		doConnect();
 	}
 
-	ws.addEventListener('error', function () {
-		$.confirm({
-			title: '提示',
-			text: '连接失败,是否准备重连?',
-			onOK: function () {
-				doConnect();
-			},
-			onCancel: function () {
-				wx.miniProgram.switchTab({
-					url: '/pages/home/home'
-				})
-			}
-		});
-	});
-
-	ws.addEventListener('open', function () {
+	ws.addEventListener('open', function (event) {
 		ws.send(ConfigChannel("RK3923C1201900139"));
 		var buffer = RequestIFrame();
 		ws.send(buffer);