From f3b036fd5290dba8a462ba3071c3c712e39bbbd7 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sat, 13 Jan 2024 13:59:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0websocket=E4=BF=9D?=
 =?UTF-8?q?=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/page/cmd_line.html    | 49 +++++++------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/sec-beidou/src/main/resources/templates/page/cmd_line.html b/sec-beidou/src/main/resources/templates/page/cmd_line.html
index 51e81549..0311bac4 100644
--- a/sec-beidou/src/main/resources/templates/page/cmd_line.html
+++ b/sec-beidou/src/main/resources/templates/page/cmd_line.html
@@ -68,21 +68,21 @@
 </div>
 <script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
-	layui.use(['form'], function () {
-		var form = layui.form
-				, $ = layui.$;
+    layui.use(['form'], function () {
+        var form = layui.form
+            , $ = layui.$;
 		var rxWin = $("#rx_win");
 
 
 		/**
-		 * 初始化表单，要加上，不然刷新部分组件可能会不加载
-		 */
-		form.render();
+         * 初始化表单，要加上，不然刷新部分组件可能会不加载
+         */
+        form.render();
 
-		//监听提交
-		form.on('submit(send_btn)', function (data) {
+        //监听提交
+        form.on('submit(send_btn)', function (data) {
 			//console.log((data.field));
-			$.ajax({
+            $.ajax({
 				type:"POST",
 				url:"/gnss/config_cmd",
 				data: data.field,
@@ -104,24 +104,19 @@
 					console.log("ajax error");
 				}
 			});
-			return false;
-		});
+            return false;
+        });
 
 		form.on('submit(clear_btn)', function (data) {
 			rxWin.val("");
 			return false;
 		});
-	});
+    });
 </script>
 
 <!-- Web socket operations-->
 <script type="text/javascript">
-	var websocket;
-	var intervalId;
-	var rxWin;
-
 	layui.$(function(){
-		rxWin = layui.$('#rx_win');
 		if(typeof(WebSocket) == "undefined"){
 			console.log("WebSocket not support for this WebBrowser!")
 		}
@@ -134,8 +129,10 @@
 	function connectWebSocket() {
 		//获取当前网址，如： http://localhost:8080/ems/Pages/Basic/Person.jsp
 		var curPath = window.document.location.href;
+		console.log(curPath);
 		//获取主机地址之后的目录，如： /ems/Pages/Basic/Person.jsp
 		var pathName = window.document.location.pathname;
+		console.log(pathName);
 		var pos = curPath.indexOf(pathName);
 		//获取主机地址，如： http://localhost:8080
 		var basePath = curPath.substring(0, pos);
@@ -143,34 +140,24 @@
 		//建立webSocket连接
 		var webSocktPath;
 		webSocktPath = (basePath+"/websocket").replace("http","ws");
-		websocket = new WebSocket(webSocktPath);
+		var websocket = new WebSocket(webSocktPath);
 
 		//打开webSokcet连接时，回调该函数
 		websocket.onopen = function () {
 			console.log("Socket open");
-			intervalId = setInterval(function() {
-				websocket.send("hello");
-			}, 60000);// keep alive
 		}
 		websocket.onerror = function (){
 			console.log("Socket error");
 			layui.layer.alert("Open web socket failed!");
 		}
-		websocket.onclose = function (){
-			rxWin.val("websocket closed!\r\n");
-			// 如果需要停止重复执行的定时任务
-			clearInterval(intervalId);
-		}
 		//接收信息
 		websocket.onmessage = function (event) {
-			console.log("event.data");
+			var rxWin = layui.$('#rx_win');
 			rxWin.val(rxWin.val()+event.data + "\r\n");
-			rxWin.scrollTop = rxWin.scrollHeight;
+			var obj = document.getElementById("rx_win");
+			obj.scrollTop = obj.scrollHeight;
 		}
-
 	}
-
-
 </script>
 
 </body>