feat:修改socket连接与关闭时间点

pages/device/device.js

@@ -190,27 +190,6 @@ Page({
     console.log("socket发送失败,res:", res)
   },
 
-  // // 获取设备生产日期
-  // GetManufactureDate: function()
-  // {
-  //   console.log("点击获取生产日期按钮,向服务器请求did")
-  //   websocket_api.SocketTxMsg(
-  //       JSON.stringify({
-  //         "method": "read_did",
-  //         "args": {'N_TA':18,'did_list':['UDS_MANUFACTURING_DATA']}
-  //       }),
-  //       this.WebsocketSendSuccessEvent, 
-  //       this.WebsocketSendFailEvent
-  //     )
-  // },
-  // // 获取设备制造厂商
-  // GetManufacture: function()
-  // {
-  //   var data = "521214"
-  //   // this.setData({inputText: "521214"})
-  //   this.SendBleData(data)
-  // },
-
   //发送指令
   SendBleData: function (str) {
     var that = this
@@ -242,15 +221,8 @@ Page({
     }
   },
 
-  // //点击发送按钮发送指令
-  // SendButton: function () {
-  //   var that = this
-  //   console.log("发送蓝牙数据:", that.data.inputText)
-  //   this.SendBleData(that.data.inputText)
-  // },
-
   onSocketMessageCallback:function(res){
-    console.log("收到服务器消息:res", res);
+    console.log("收到编解码socket消息:", res);
     if(res == "heartbeat") {
       console.log("rx server heartbeat")
     } else {
@@ -272,9 +244,31 @@ Page({
     }
   },
 
+  WebsocketConnStart:function () {
+    console.log("启动连接编解码socket")
+    const Host = 'ws://id27149.com:2222/codec'
+    websocket_api.connectSocket(
+        Host, 
+        this.WebsocketConnSuccessEvent, 
+        this.WebsocketConnFailEvent
+    )},
+
+    WebsocketCloseSuccessEvent:function (res) {
+      console.log("编解码socket连接关闭成功",)
+    },
+  
+    WebsocketCloseFailEvent:function (res) {
+      console.log("编解码socket连接关闭失败,res:", res)
+    },
+
   onLoad: function (options) {
+    //进入页面时的操作.
     var that = this
-    console.log(options)
+
+    //建立socket连接.
+    this.WebsocketConnStart()
+    // 设置socket接收到消息的回调
+    websocket_api.onSocketMessageCallback = this.onSocketMessageCallback;
     //刚进入界面时请求下下拉框列表
     wx.request({
       url: 'http://www.id27149.com:2222/codecInfo',//更新下拉框内容服务器接口地址
@@ -328,8 +322,7 @@ Page({
       }
     })
 
-    // 设置socket接收到消息的回调
-    websocket_api.onSocketMessageCallback = this.onSocketMessageCallback;
+
     that.setData({
       connectedDeviceId: options.connectedDeviceId,
       name:options.name,
@@ -386,6 +379,11 @@ Page({
     })
   },
   
+  onUnload: function(){
+    console.log("页面退出,关闭socket连接")
+    websocket_api.closeSocket(this.WebsocketCloseSuccessEvent, this.WebsocketCloseFailEvent);
+  },
+
   onReady: function () {
 
   },

pages/search/search.js

@@ -1,6 +1,5 @@
 const app = getApp()
 const request_api = require('../../utils/api.js')
-const websocket_api = require('../../utils/socket_api.js')
 
 Page({
   data: {
@@ -147,72 +146,6 @@ Page({
     this.request_api_test()
   },
 
-  WebsocketConnSuccessEvent:function (res) {
-    console.log("socket连接成功,res:",res)
-  },
-
-  WebsocketConnFailEvent:function (res) {
-    console.log("socket连接失败,res:", res)
-  },
-
-  WebsocketCloseSuccessEvent:function (res) {
-    console.log("socket连接关闭成功,res:",res)
-  },
-
-  WebsocketCloseFailEvent:function (res) {
-    console.log("socket连接关闭失败,res:", res)
-  },
-
-  WebsocketConnStart:function () {
-    console.log("启动socket连接")
-    const Host = 'ws://id27149.com:2222/codec'
-    websocket_api.connectSocket(
-        Host, 
-        this.WebsocketConnSuccessEvent, 
-        this.WebsocketConnFailEvent
-      )
-  },
-
-  WebsocketConnButton:function () {
-      // 点击websocket测试按钮事件
-      console.log("websocket建立连接按钮事件")
-      this.WebsocketConnStart()
-  },
-
-  // onSocketMessageCallback:function(res){
-  //   console.log("收到服务器消息:res", res);
-  //   //字符串转为字典.
-  //   if(res == "heartbeat"){
-  //     console.log("rx server heartbear")
-  //   }else{
-  //     const dict = JSON.parse(res)
-  //     if(dict['method'] == "send_data"){
-  //       console.log("将数据通过蓝牙发送至设备,", dict['args'])
-  //     }
-  //   }
-  // },
-
-  WebsocketSendSuccessEvent:function (res) {
-    console.log("socket发送成功,res:",res)
-  },
-
-  WebsocketSendFailEvent:function (res) {
-    console.log("socket发送失败,res:", res)
-  },
-
-  WebsocketSendButton:function () {
-    // 点击websocket发送按钮事件
-    console.log("websocket发送按钮事件")
-    websocket_api.SocketTxMsg(
-        JSON.stringify({
-          "method": "read_did",
-          "args": {'N_TA':18,'did_list':['UDS_MANUFACTURING_DATA']}
-        }),
-        this.WebsocketSendSuccessEvent, 
-        this.WebsocketSendFailEvent
-      )
-},
-
   SearchClick: function(){
     var that=this    
     that.setData({qrcodeMac:""})
@@ -349,9 +282,7 @@ Page({
   onLoad: function (options) {
     var that = this
     // 打开小程序后即创建socket连接
-    this.WebsocketConnStart();
-    // 设置接收消息回调
-    // websocket_api.onSocketMessageCallback = this.onSocketMessageCallback;
+    // this.WebsocketConnStart();
 
     var list_height = ((app.globalData.SystemInfo.windowHeight - 50) * (750 / app.globalData.SystemInfo.windowWidth)) - 110
     that.setData({
@@ -435,8 +366,7 @@ Page({
   },
   
   onUnload: function(){
-    console.log("页面退出时,关闭socket连接")
-    websocket_api.closeSocket(this.WebsocketCloseSuccessEvent, this.WebsocketCloseFailEvent);
+
   },
 
   onReady: function () {