ver：0.0.4

desc：Bluetooth 0.0.4
poster：张晓宇

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "zxy",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -11363,27 +11363,6 @@
         "semver": "5.7.1"
       }
     },
-    "node-bluetooth": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npm.taobao.org/node-bluetooth/download/node-bluetooth-1.2.6.tgz",
-      "integrity": "sha1-EjzypRmBA4BVSa0Q8Ul4mXH1YKA=",
-      "requires": {
-        "bindings": "1.2.1",
-        "nan": "2.14.1"
-      },
-      "dependencies": {
-        "bindings": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbindings%2Fdownload%2Fbindings-1.2.1.tgz",
-          "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE="
-        },
-        "nan": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.1.tgz?cache=0&sync_timestamp=1587497111086&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.1.tgz",
-          "integrity": "sha1-174036MQW5FJTDFHCJMV7/iHSwE="
-        }
-      }
-    },
     "node-forge": {
       "version": "0.9.0",
       "resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524876130&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zxy",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "author": "xiaoyuzhang <771799477@qq.com>",
   "description": "An electron-vue project",
   "license": null,
@@ -60,7 +60,6 @@
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
     "koa": "^2.2.0",
-    "node-bluetooth": "^1.2.6",
     "socket.io": "^2.3.0",
     "vue": "^2.5.16",
     "vue-echarts": "^5.0.0-beta.0",

src/renderer/components/BlueTooth.vue

@@ -0,0 +1,277 @@
+<template>
+  <div id="wrapper">
+    <div style="padding-bottom: 20px">
+      {{showTitleMessage}} <br/>
+      <el-button @click="toIndex" >返回首页</el-button>
+      <el-button @click="searchModel" :disabled="blueToothDevice == ''" >查询当前模式</el-button>
+      <el-button @click="setModel" :disabled="blueToothDevice == ''" >进入配置模式</el-button>
+      <el-button @click="InModel" :disabled="blueToothDevice == ''">进入传输模式</el-button>
+      <br/>
+      <el-row :gutter="20" style="padding-top: 20px" >
+        <el-col :span="6">
+          <el-select v-model="value" filterable placeholder="请选择">
+            <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-radio v-model="radio" label="1">配置</el-radio>
+          <el-radio v-model="radio" label="2">查询</el-radio>
+        </el-col>
+        <el-col :span="6">
+          <span  v-if="value =='wifiAccount'">
+                  wifi账号:
+                 <el-input
+                         placeholder="请输入wifi账号"
+                         v-model="wifiAccount"
+                         clearable>
+                 </el-input>
+                 wifi密码：
+                  <el-input
+                          placeholder="请输入wifi密码"
+                          v-model="wifiPassword"
+                          clearable>
+                 </el-input>
+          </span>
+          <span  v-if="value =='wifiIp'">
+                  wifiIP:
+                 <el-input
+                         placeholder="请输入wifiIP"
+                         v-model="wifiIp"
+                         clearable>
+                 </el-input>
+          </span>
+          <span  v-if="value =='serverIp'">
+                  服务器ip:
+                 <el-input
+                         placeholder="请输入服务器ip"
+                         v-model="serverIp"
+                         clearable>
+                 </el-input>
+                  服务器端口：
+                  <el-input
+                          placeholder="请输入服务器端口"
+                          v-model="serverPort"
+                          clearable>
+                 </el-input>
+          </span>
+
+        </el-col>
+        <el-col :span="6">
+          <el-button @click="sendMessage" :disabled="blueToothDevice == ''">
+            发送
+          </el-button>
+
+        </el-col>
+      </el-row>
+
+      <div v-if="blueSendData!=''">收到数据 {{blueSendData}}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {mapState, mapGetters} from "vuex";
+  import func from '../utils/FunctionSet'
+  export default {
+    name: 'blueTooth',
+    data(){
+        return {
+            options: [{
+                value: 'wifiAccount',
+                label: 'wifi账号密码'
+            }, {
+                value: 'wifiIp',
+                label: 'wifi模块ip'
+            }, {
+                value: 'serverIp',
+                label: '当前服务器Ip与端口'
+            }],
+            value: 'wifiAccount',
+            radio:'1',
+            wifiAccount:'semsx',
+            wifiPassword:'semsx1024',
+            wifiIp:'192.168.1.1',
+            serverIp:'192.168.0.0',
+            serverPort:'8080'
+        }
+    },
+    methods: {
+        toIndex() {
+            this.$router.push('/')
+        },
+        errorNotify(msg) {
+            this.$notify({
+                title: '提示',
+                message: msg,
+                duration: 4500
+            });
+        },
+        successNotify() {
+            this.$notify({
+                title: '提示',
+                message: '成功发送指令',
+                duration: 1500
+            });
+        },
+        //查询当前模式
+        searchModel(){
+            this.$socket.emit('searchModel','searchModel')
+        },
+        //进入配置模式
+        setModel() {
+            this.$socket.emit('setModel','setModel')
+        },
+        //进入传输模式
+        InModel() {
+            this.$socket.emit('InModel','InModel')
+        },
+        // 发送数据
+        sendMessage() {
+            let data = ''
+            let key = ''
+            if(this.value == 'wifiAccount') {
+                // wifi账号密码 字符串拼接
+                if(this.wifiAccount == '' || this.wifiPassword == '') {
+                    this.errorNotify('wifi账户或密码为空')
+                    return;
+                }
+                data = this.wifiAccount + ',' + this.wifiPassword
+                key = this.radio == '1'? 'setWifiAccount':'getWifiAccount'
+            } else if(this.value == 'wifiIp') {
+                //wifi IP
+                if(this.wifiIp == '') {
+                    this.errorNotify('wifiIp为空')
+                    return;
+                }
+                data = this.wifiIp
+                key = this.radio == '1'? 'setWifiIp':'getWifiIp'
+            } else if(this.value == 'serverIp') {
+                //wifi IP
+                if(this.serverIp == '' || this.serverPort == '') {
+                    this.errorNotify('服务器ip与端口为空')
+                    return;
+                }
+                data = this.serverIp + ',' + this.serverPort
+                key = this.radio == '1'? 'setServerIp':'getServerIp'
+            }
+            this.$socket.emit(key,func.strToHexCharCode(data))
+            this.successNotify()
+        }
+    },
+    created() {
+    },
+    computed:{
+        ...mapGetters([
+            'blueToothDevice',
+            'blueSendData'
+        ]),
+        showTitleMessage:{
+            get:function () {
+                if(this.blueToothDevice !='') {
+                    // 当前连接客户端为
+                    return '当前连接的蓝牙客户端mac地址为'+this.blueToothDevice
+                } else {
+                    return '当前未有客户端连接'
+                }
+            },
+            set:function (val) {
+
+            }
+
+        }
+
+    },
+    watch:{
+
+    }
+  }
+
+</script>
+
+<style>
+
+  * {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+  }
+
+  body { font-family: 'Source Sans Pro', sans-serif; }
+
+  #wrapper {
+    background:
+      radial-gradient(
+        ellipse at top left,
+        rgba(255, 255, 255, 1) 40%,
+        rgba(229, 229, 229, .9) 100%
+      );
+    height: 700px;
+    padding: 60px 80px;
+    width: 100vw;
+  }
+
+  #logo {
+    height: auto;
+    margin-bottom: 20px;
+    width: 420px;
+  }
+
+  main {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  main > div { flex-basis: 50%; }
+
+  .left-side {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .welcome {
+    color: #555;
+    font-size: 23px;
+    margin-bottom: 10px;
+  }
+
+  .title {
+    color: #2c3e50;
+    font-size: 20px;
+    font-weight: bold;
+    margin-bottom: 6px;
+  }
+
+  .title.alt {
+    font-size: 18px;
+    margin-bottom: 10px;
+  }
+
+  .doc p {
+    color: black;
+    margin-bottom: 10px;
+  }
+
+  .doc button {
+    font-size: .8em;
+    cursor: pointer;
+    outline: none;
+    padding: 0.75em 2em;
+    border-radius: 2em;
+    display: inline-block;
+    color: #fff;
+    background-color: #4fc08d;
+    transition: all 0.15s ease;
+    box-sizing: border-box;
+    border: 1px solid #4fc08d;
+  }
+
+  .doc button.alt {
+    color: #42b983;
+    background-color: transparent;
+  }
+</style>

src/renderer/components/Config.vue

@@ -38,7 +38,6 @@
 </template>
 
 <script>
-  import h337 from "heatmap.js";
   import {mapState, mapGetters} from "vuex";
   export default {
     name: 'config',

src/renderer/components/LandingPage.vue

@@ -34,7 +34,7 @@
     <el-button @click="stopCollection" :disabled="hasConnectCount == 0">停止采集</el-button>
     <el-button @click="resetDevice" :disabled="hasConnectCount == 0">复位</el-button>
     <el-button @click="toConfig" :disabled="hasConnectCount == 0">跳转至配置</el-button>
-    <el-button @click="test">蓝牙发送</el-button>
+    <el-button @click="toBlueToothSend" :disabled="deviceStatus != 'deviceSuccess'" >跳转至蓝牙发送</el-button>
     <br/>
     <div style="width:540px;height:540px;position:relative;margin-top:30px" >
       <div ref="heatsample" style="width:540px;height:540px;position:absolute;top:0;left:0" />
@@ -85,15 +85,11 @@
       toConfig() {
           this.$router.push('/config')
       },
-      test() {
-          this.$socket.emit('sendBlueTouth','sendBlueTouth')
+      toBlueToothSend() {
+          this.$router.push('/blueTooth')
       }
-
-
-
-
     },
-    created() {
+    mounted() {
         this.$socket.emit('syncConnectCount','resetDevice')
         setTimeout(()=>{
             var dst = this.$refs.heatsample;
@@ -267,13 +263,13 @@
                 }
             });
             this.h337 = heatmap;
-        },2000)
-
+        },1000)
     },
     computed:{
         ...mapGetters([
             'hasConnectCount',
-            'pressureData'
+            'pressureData',
+            'deviceStatus',
         ]),
     },
     watch:{
@@ -284,7 +280,30 @@
                     data: val
                 });
             }
+        },
+        // 监听蓝牙服务是否成功开启
+        deviceStatus:function (val) {
+            if(val == 'deviceSuccess') {
+                this.$notify({
+                    title: '提示',
+                    message: '蓝牙服务开启成功',
+                    duration: 3500
+                });
+            } else if(val == 'noUsb') {
+                this.$notify({
+                    title: '提示',
+                    message: '请插入蓝牙适配器后重启软件',
+                    duration: 0
+                });
+            } else if(val == 'deviceError') {
+                this.$notify({
+                    title: '提示',
+                    message: '请安装插件识别的蓝牙驱动后重启软件',
+                    duration: 0
+                });
+            }
         }
+
     }
   }
 </script>

src/renderer/router/index.js

@@ -19,6 +19,11 @@ export default new Router({
         name: 'config',
         component: require('@/components/Config').default
     },
+    {
+        path: '/blueTooth',
+        name: 'blueTooth',
+        component: require('@/components/BlueTooth').default
+    },
 
   ]
 })

src/renderer/store/modules/socket.js

@@ -3,6 +3,9 @@ import func from '../../utils/FunctionSet'
 const state = {
     hasConnectCount:0,
     pressureData:[],
+    blueToothDevice:'',
+    deviceStatus:'',
+    blueSendData:''
 }
 
 const actions = {
@@ -26,12 +29,24 @@ const mutations = {
     },
     SOCKET_connectedClient(state,data) {
         console.log(data)
+    },
+    SOCKET_setBlueToothDevice(state,data) {
+        state.blueToothDevice = data
+    },
+    SOCKET_setDeviceStatus(state,data) {
+        state.deviceStatus = data
+    },
+    SOCKET_sendBlueData(state,data) {
+        state.blueSendData = func.buf2hex(data)
     }
 }
 
 const getters = {
     hasConnectCount:state=>state.hasConnectCount,
     pressureData:state=>state.pressureData,
+    blueToothDevice:state=>state.blueToothDevice,
+    deviceStatus:state=>state.deviceStatus,
+    blueSendData:state=>state.blueSendData,
 }
 
 

src/renderer/utils/FunctionSet.js

@@ -59,6 +59,16 @@ module.exports = {
 
         // join all the hex values of the elements into a single string
         return hexParts.join('');
+    },
+    // 字符串转16进制数组
+    strToHexCharCode(str) {
+        if(str === "")
+            return "";
+        var hexCharCode = [];
+        for(var i = 0; i < str.length; i++) {
+            hexCharCode.push((str.charCodeAt(i)).toString(16));
+        }
+        return hexCharCode;
     }
 
 }

static/server/app.js

@@ -9,7 +9,6 @@ var sendProtocal = require('./protocal/sendProtocal')
 var command = require('./protocal/command')
 var commonFunction = require('./protocal/commonFunction')
 var blueTouth = require('./blueTouth')
-blueTouth.setIo(io)
 // socket 服务开启
 
 let socketEvent = null;
@@ -57,6 +56,9 @@ io.sockets.on('connection', function (socket) {
             console.log('已有初始连接' +connectCount +'个')
         }
         io.sockets.emit('connectCount', connectCount);
+        io.sockets.emit('setDeviceStatus', blueTouth.getBlueServerStatus());
+        // 将io对象传递给blueTooth js （发送连接客户端已经断开客户端消息发送）
+        blueTouth.setIo(io)
     })
     // 发送获取采样频率指令
     socket.on('checkCaiyang',function (sendData) {
@@ -111,13 +113,59 @@ io.sockets.on('connection', function (socket) {
     socket.on('sendBlueTouth',function (sendData) {
         blueTouth.sendData('123')
     })
-
+    socket.on('searchModel',function (sendData) {
+        let data = sendProtocal.searchModel();
+        blueTouth.sendData(data)
+    })
+    socket.on('setModel',function (sendData) {
+        let data = sendProtocal.inSetModel();
+        blueTouth.sendData(data)
+    })
+    socket.on('InModel',function (sendData) {
+        let data = sendProtocal.inTransModel();
+        blueTouth.sendData(data)
+    })
+    // 蓝牙设置wifi账号密码
+    socket.on('setWifiAccount',function (sendData) {
+        let data = sendProtocal.blueToothSendCommand(
+            sendData,'wifiAccount','set')
+        blueTouth.sendData(data)
+    })
+    // 蓝牙获取wifi账号密码
+    socket.on('getWifiAccount',function (sendData) {
+        let data = sendProtocal.blueToothSendCommand(
+            sendData,'wifiAccount','get')
+        blueTouth.sendData(data)
+    })
+    // 蓝牙设置wifiIP
+    socket.on('setWifiIp',function (sendData) {
+        let data = sendProtocal.blueToothSendCommand(
+            sendData,'wifiIp','set')
+        blueTouth.sendData(data)
+    })
+    // 蓝牙获取wifi账号密码
+    socket.on('getWifiIp',function (sendData) {
+        let data = sendProtocal.blueToothSendCommand(
+            sendData,'wifiIp','get')
+        blueTouth.sendData(data)
+    })
+    // 蓝牙设置 服务端IP与端口
+    socket.on('setServerIp',function (sendData) {
+        let data = sendProtocal.blueToothSendCommand(
+            sendData,'serverIp','set')
+        blueTouth.sendData(data)
+    })
+    // 蓝牙获取wifi账号密码
+    socket.on('getServerIp',function (sendData) {
+        let data = sendProtocal.blueToothSendCommand(
+            sendData,'serverIp','get')
+        blueTouth.sendData(data)
+    })
 })
 
 const frame_header_and_size_bytes = 1 + 2;
 
 socketServer.on('connection',(socket)=>{
-    console.log('连接已建立')
     socketEvent = socket
     socketServer.getConnections((err, count)=>{
         if(err){
@@ -126,6 +174,8 @@ socketServer.on('connection',(socket)=>{
             console.log(`当前有${count}个连接`);
             connectCount = count
             io.sockets.emit('connectCount', count);
+
+
         }
     });
     socket.on('data', (data)=>{

static/server/blueTouth.js

@@ -31,7 +31,7 @@ function Utf8ArrayToStr(array) {
     }
     return out;
 }
-var ioNew = null
+var blueServerStatus = ''
 try {
     bleno.on('stateChange', function(state) {
         console.log('on -> stateChange: ' + state);
@@ -44,8 +44,8 @@ try {
     bleno.on('advertisingStart', function(error) {
         console.log('on -> advertisingStart: ' + (error ? 'error ' + error : 'success'));
         if (!error) {
-            io.sockets.emit('blueConnect', 'success');
             console.log('start');
+            blueServerStatus = 'deviceSuccess'
             var Descriptor = bleno.Descriptor;
             var descriptor = new Descriptor({
                 uuid: '212112',
@@ -61,13 +61,15 @@ try {
                     descriptor
                 ],
                 onWriteRequest: function (data, offset, withoutResponse,callBack) {
-                    var obj = JSON.parse( Utf8ArrayToStr(new Uint8Array(data)))
+                    ioNew.sockets.emit('sendBlueData',data);
+                    //var obj = JSON.parse( Utf8ArrayToStr(new Uint8Array(data)))
                     //console.log(withoutResponse)
                     callBack()
                 },
                 onReadRequest: function (offset, callBack) {
                     var result = characteristic.RESULT_SUCCESS;
-                    //var data = new Buffer('321');
+                    var data = new Buffer('connectTest');
+                    callBack(result,data)
                     sendMessageHandle = callBack
                 }
 
@@ -85,17 +87,17 @@ try {
                 if (error) {
                     console.log(error);
                 }
-                console.log('success');
             });
         } else {
         }
     });
 
     bleno.on('disconnect',function (clientAddress) {
-        console.log('disconnectAddress')
+        ioNew.sockets.emit('setBlueToothDevice','');
+        ioNew.sockets.emit('sendBlueData','');
     })
     bleno.on('accept',function (clientAddress) {
-        console.log('connectAddress')
+        ioNew.sockets.emit('setBlueToothDevice',clientAddress);
     })
     bleno.on('advertisingStartError', function(error) {
         console.log(error)
@@ -103,24 +105,30 @@ try {
 }catch (err){
     // 判断用户是否开启蓝牙 或者是堵塞
     if(err.message == 'No compatible USB Bluetooth 4.0 device found!') {
-        // 没有插设备
+        // 没有插蓝牙适配器
+        blueServerStatus = 'noUsb'
+    } else {
+        // 驱动错误
+        blueServerStatus = 'deviceError'
     }
-
-    console.log(err.message)
 }
 var sendMessageHandle = null
 var messageObj = null
+var ioNew = null
+
 
 module.exports = {
+    // 蓝牙 传输数据
     sendData:function (buffer) {
         if(sendMessageHandle) {
             var result =messageObj.RESULT_SUCCESS;
-            var data = new Buffer('woshi zhangxiaoyu');
-            sendMessageHandle(result,data)
+            sendMessageHandle(result,buffer)
         }
     },
-    setIo:function (data) {
-        ioNew  = data
+    getBlueServerStatus:function () {
+        return blueServerStatus
+    },
+    setIo:function(data) {
+        ioNew = data
     }
-
 }

static/server/protocal/commonFunction.js

@@ -35,7 +35,7 @@ module.exports = {
                 }
             }
         }
-        return pressureDataProcess(dataAll,1,4)
+        return pressureDataProcess(dataAll,2.5,4)
     },
 }
 

static/server/protocal/sendProtocal.js

@@ -58,7 +58,7 @@ module.exports = {
       let data = [];
       data.push(head)
       // 计算长度
-      let size = (1+1+arrData.length).toString(16)
+      let size = (1+1+arrData.length)
       data.push(size)
       data.push(0x00)
       data.push(realcmd)
@@ -73,6 +73,68 @@ module.exports = {
       console.log(Buffer(data))
       return Buffer(data);
   },
+  // 查询当前模式
+  searchModel:function () {
+      let data = [];
+      data.push(0x05);
+      data.push(0x00);
+      data.push(0x01);
+      data.push(0x00);
+      return Buffer(data);
+  },
+  // 进入配置模式
+  inSetModel:function () {
+      let data = [];
+      data.push(0x05);
+      data.push(0x00);
+      data.push(0x02);
+      data.push(0x00);
+      return Buffer(data);
+  },
+  // 进入传输模式
+  inTransModel:function () {
+      let data = [];
+      data.push(0x05);
+      data.push(0x00);
+      data.push(0x03);
+      data.push(0x00);
+      return Buffer(data);
+  },
+  // 蓝牙模块发送 查询配置指令
+  blueToothSendCommand:function (arrData,cmd,type) {
+      let head  = 0xf7
+      let realcmd = 0x00
+      if(type == 'get') {
+          realcmd = 0x01
+      } else {
+          realcmd = 0x02
+      }
+      let id = 0x00
+      if(cmd == 'wifiAccount') {
+          id = 0xa1
+      } else if (cmd == 'wifiIp') {
+          id = 0xa2
+      } else if(cmd == 'serverIp') {
+          id = 0xa3
+      }
+      let data = [];
+      data.push(head)
+      // 计算长度
+      let size = (1+1+arrData.length)
+      data.push(size)
+      data.push(0x00)
+      data.push(realcmd)
+      data.push(id)
+      let sum = 0
+      for(let i in arrData) {
+          data.push(parseInt(arrData[i],16))
+          sum += parseInt(arrData[i],16)
+      }
+      let checkSum = (realcmd + id + sum) & 0xff
+      data.push(checkSum)
+      console.log(Buffer(data))
+      return Buffer(data);
+  }  
 
 }