ver：0.0.5

desc：1.新增类似ble小工具收发页面
      2.添加 log4js
poster：张晓宇

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "zxy",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4560,10 +4560,9 @@
       "optional": true
     },
     "date-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-1.2.0.tgz",
-      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-3.0.0.tgz",
+      "integrity": "sha1-64eANlx9KxURB4+0keZHl4DzrZU="
     },
     "dateformat": {
       "version": "1.0.12",
@@ -6732,6 +6731,11 @@
         }
       }
     },
+    "flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npm.taobao.org/flatted/download/flatted-2.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fflatted%2Fdownload%2Fflatted-2.0.2.tgz",
+      "integrity": "sha1-RXWyHivO50NKqb5mL0t7X5wrUTg="
+    },
     "flatten": {
       "version": "1.0.3",
       "resolved": "https://registry.npm.taobao.org/flatten/download/flatten-1.0.3.tgz?cache=0&sync_timestamp=1572489877048&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fflatten%2Fdownload%2Fflatten-1.0.3.tgz",
@@ -9655,12 +9659,28 @@
         "useragent": "2.2.1"
       },
       "dependencies": {
+        "axios": {
+          "version": "0.15.3",
+          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
+          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "follow-redirects": "1.0.0"
+          }
+        },
         "base64id": {
           "version": "1.0.0",
           "resolved": "https://registry.npm.taobao.org/base64id/download/base64id-1.0.0.tgz",
           "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
           "dev": true
         },
+        "date-format": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-1.2.0.tgz",
+          "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+          "dev": true
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
@@ -9739,6 +9759,16 @@
             "has-binary2": "~1.0.2"
           }
         },
+        "follow-redirects": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz?cache=0&sync_timestamp=1585479417937&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.0.0.tgz",
+          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^2.2.0"
+          }
+        },
         "isbinaryfile": {
           "version": "3.0.3",
           "resolved": "https://registry.npm.taobao.org/isbinaryfile/download/isbinaryfile-3.0.3.tgz?cache=0&sync_timestamp=1585923989927&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisbinaryfile%2Fdownload%2Fisbinaryfile-3.0.3.tgz",
@@ -9748,6 +9778,44 @@
             "buffer-alloc": "^1.2.0"
           }
         },
+        "log4js": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npm.taobao.org/log4js/download/log4js-2.11.0.tgz?cache=0&sync_timestamp=1587337864733&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flog4js%2Fdownload%2Flog4js-2.11.0.tgz",
+          "integrity": "sha1-vzkC7/ZcaSPZzpz70ttUFg40AFo=",
+          "dev": true,
+          "requires": {
+            "amqplib": "^0.5.2",
+            "axios": "^0.15.3",
+            "circular-json": "^0.5.4",
+            "date-format": "^1.2.0",
+            "debug": "^3.1.0",
+            "hipchat-notifier": "^1.1.0",
+            "loggly": "^1.1.0",
+            "mailgun-js": "^0.18.0",
+            "nodemailer": "^2.5.0",
+            "redis": "^2.7.1",
+            "semver": "^5.5.0",
+            "slack-node": "~0.2.0",
+            "streamroller": "0.7.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "3.2.6",
+              "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz",
+              "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
+              "dev": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+              "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+              "dev": true
+            }
+          }
+        },
         "mime": {
           "version": "1.6.0",
           "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz",
@@ -9817,6 +9885,35 @@
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
+        "streamroller": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npm.taobao.org/streamroller/download/streamroller-0.7.0.tgz",
+          "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
+          "dev": true,
+          "requires": {
+            "date-format": "^1.2.0",
+            "debug": "^3.1.0",
+            "mkdirp": "^0.5.1",
+            "readable-stream": "^2.3.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "3.2.6",
+              "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz",
+              "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
+              "dev": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+              "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+              "dev": true
+            }
+          }
+        },
         "ws": {
           "version": "3.3.3",
           "resolved": "https://registry.npm.taobao.org/ws/download/ws-3.3.3.tgz",
@@ -10435,57 +10532,29 @@
       }
     },
     "log4js": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npm.taobao.org/log4js/download/log4js-2.11.0.tgz?cache=0&sync_timestamp=1587337864733&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flog4js%2Fdownload%2Flog4js-2.11.0.tgz",
-      "integrity": "sha1-vzkC7/ZcaSPZzpz70ttUFg40AFo=",
-      "dev": true,
+      "version": "6.2.1",
+      "resolved": "https://registry.npm.taobao.org/log4js/download/log4js-6.2.1.tgz?cache=0&sync_timestamp=1587337864733&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flog4js%2Fdownload%2Flog4js-6.2.1.tgz",
+      "integrity": "sha1-/COjvyh/QPW0glmVjl4O0w1Vjus=",
       "requires": {
-        "amqplib": "^0.5.2",
-        "axios": "^0.15.3",
-        "circular-json": "^0.5.4",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "hipchat-notifier": "^1.1.0",
-        "loggly": "^1.1.0",
-        "mailgun-js": "^0.18.0",
-        "nodemailer": "^2.5.0",
-        "redis": "^2.7.1",
-        "semver": "^5.5.0",
-        "slack-node": "~0.2.0",
-        "streamroller": "0.7.0"
+        "date-format": "^3.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.1",
+        "rfdc": "^1.1.4",
+        "streamroller": "^2.2.4"
       },
       "dependencies": {
-        "axios": {
-          "version": "0.15.3",
-          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
-          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
-          "dev": true,
-          "optional": true,
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
           "requires": {
-            "follow-redirects": "1.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "follow-redirects": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz?cache=0&sync_timestamp=1585479417937&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.0.0.tgz",
-          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^2.2.0"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
-              "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
         }
       }
     },
@@ -14343,6 +14412,11 @@
       "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
       "dev": true
     },
+    "rfdc": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npm.taobao.org/rfdc/download/rfdc-1.1.4.tgz",
+      "integrity": "sha1-unLME2egzNnPgahws7WL060H+MI="
+    },
     "rgb2hex": {
       "version": "0.1.10",
       "resolved": "https://registry.npm.taobao.org/rgb2hex/download/rgb2hex-0.1.10.tgz",
@@ -15677,15 +15751,51 @@
       "dev": true
     },
     "streamroller": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npm.taobao.org/streamroller/download/streamroller-0.7.0.tgz",
-      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
-      "dev": true,
+      "version": "2.2.4",
+      "resolved": "https://registry.npm.taobao.org/streamroller/download/streamroller-2.2.4.tgz",
+      "integrity": "sha1-wZjO1C25QIamGTYIGHzoCl8rDlM=",
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "date-format": "^2.1.0",
+        "debug": "^4.1.1",
+        "fs-extra": "^8.1.0"
+      },
+      "dependencies": {
+        "date-format": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-2.1.0.tgz",
+          "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8="
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz",
+          "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+        }
       }
     },
     "strict-uri-encode": {
@@ -16654,8 +16764,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz?cache=0&sync_timestamp=1583530825899&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-0.1.2.tgz",
-      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=",
-      "dev": true
+      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY="
     },
     "unpipe": {
       "version": "1.0.0",

package.json

@@ -59,6 +59,7 @@
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
     "koa": "^2.2.0",
+    "log4js": "^6.2.1",
     "noble": "^1.9.1",
     "socket.io": "^2.3.0",
     "vue": "^2.5.16",

src/renderer/components/ble/bleIndex.vue

@@ -116,7 +116,6 @@
     watch:{
         blueDeviceList:function (val) {
             if(val.length >0) {
-                console.log(val)
                 this.choseDeviceIndex = 0
                 this.characteristicsList = this.blueDeviceList[0].characteristics
             }

src/renderer/components/ble/characteristicsServers.vue

@@ -39,7 +39,7 @@
         <el-table-column
                 prop="name"
                 label="characteristicServiceUUid"
-                width="180">
+                width="120">
           <template slot-scope="scope">
             <span>{{scope.row.characteristic.uuid}}</span>
           </template>
@@ -55,9 +55,10 @@
         <el-table-column
                 prop="name"
                 label="options"
-                width="180">
+                width="280">
           <template slot-scope="scope">
-            <el-button  :disabled ="!canConnect(scope.row.characteristic.properties)"  @click="writeAndRead(scope.row)">write/read</el-button>
+            <el-button  :disabled ="!canConnect(scope.row.characteristic.properties)" type="mini" @click="writeAndRead(scope.row)">压力数据相关</el-button>
+            <el-button  :disabled ="!canConnect(scope.row.characteristic.properties)" type="mini" @click="sendAndReceive(scope.row)">发送/接收数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -68,6 +69,7 @@
                :modal-append-to-body="false"
                :append-to-body="true"
                :show-close="false"
+               :close-on-press-escape="false"
     >
       <div style="text-align: center">
         <div class="head_tip">
@@ -81,6 +83,29 @@
           <el-button @click="stopCollection">停止采集</el-button>
           <el-button @click="resetDevice">复位</el-button>
         </div>
+        <div style="padding-bottom: 20px">
+          <div style="width:140px;height:140px;position:relative;margin-top:30px" >
+            <div ref="heatsample" style="width:540px;height:540px;position:absolute;top:0;left:0" />
+            <chart id="heatmap" style="width:540px;height:540px;position:absolute;top:0"  ref="heatmap"></chart>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">关闭dialog</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="蓝牙收发" width="80%"
+               :close-on-click-modal="false"
+               :visible.sync="sendValidate"
+               :modal-append-to-body="false"
+               :append-to-body="true"
+               :show-close="false"
+               :close-on-press-escape="false"
+    >
+      <div style="text-align: center">
+        <div class="head_tip">
+        </div>
+        <div style="padding-bottom: 20px">
         <el-row>
           <el-col :span="8">
             <div class="grid-content bg-purple">
@@ -95,22 +120,21 @@
           <el-col :span="8">
             <div class="grid-content bg-purple">
               <el-button @click="sendInputData">发送</el-button>
+              <el-button @click="clearInputData">清空接收数据</el-button>
             </div>
           </el-col>
         </el-row>
-        <div style="padding-bottom: 20px">
-          <div style="width:140px;height:140px;position:relative;margin-top:30px" >
-            <div ref="heatsample" style="width:540px;height:540px;position:absolute;top:0;left:0" />
-            <chart id="heatmap" style="width:540px;height:540px;position:absolute;top:0"  ref="heatmap"></chart>
-          </div>
+        <div style="text-align: left">
+          <span>接收到的数据：</span>
+          <div style="white-space:pre">{{strReceiveData}}</div>
         </div>
+
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">关闭dialog</el-button>
       </div>
+      </div>
     </el-dialog>
-
-
   </div>
 
 </template>
@@ -124,8 +148,9 @@
       return {
           localName:typeof (this.$route.query.localName) =='undefined' ?'N/A':this.$route.query.localName,
           validate:false,
+          sendValidate:false,
           sendData:'',
-          inputData:'04 00 02 00'
+          inputData:'12 21'
       }
     },
     created() {
@@ -195,7 +220,7 @@
             return bRes
         },
         writeAndRead(row) {
-            this.$socket.emit('ble', {cmd: 'setup',data:row})
+            this.$socket.emit('ble', {cmd: 'setup',data:row,type:'pressure'})
             this.validate = true
             this.$store.dispatch('resetBlueToothData')
             if(this.h337 !=null) {
@@ -216,9 +241,15 @@
                 this.h337 = heatmap;
             },1000)
         },
+        sendAndReceive(row) {
+            this.$socket.emit('ble', {cmd: 'setup',data:row,type:'other'})
+            this.sendValidate = true
+            this.$store.dispatch('resetBlueToothData')
+        },
         closeDialog() {
             this.$socket.emit('ble', {cmd: 'closeSetUp'})
             this.validate = false
+            this.sendValidate = false
         },
         startSetZero(){
             this.$socket.emit('sendBleData', {type: 'setZero'})
@@ -247,6 +278,9 @@
                 }
                 this.$socket.emit('sendBleData', {type: 'sendOwnData',data:Buffer(data)})
             }
+        },
+        clearInputData() {
+            this.$store.dispatch('resetBlueReceiveData')
         }
 
     },
@@ -256,8 +290,25 @@
         'scanLoading',
         'blueDeviceDisConnectStatus',
         'characteristicServiceList',
-        'pressureData'
+        'pressureData',
+        'blueReceiveData'
       ]),
+      strReceiveData:{
+          get:function () {
+              let returnstr = ''
+              if(this.blueReceiveData.length>0) {
+                  for(let i in this.blueReceiveData) {
+                      returnstr += Number(Number(i)+1) +'、'+ this.blueReceiveData[i] + '\n '
+                  }
+              }
+              return returnstr
+
+
+          },
+          set:function (val) {
+
+          }
+      }
     },
   }
 </script>

src/renderer/store/modules/socket.js

@@ -11,6 +11,7 @@ const state = {
     blueDeviceConnectStatus:-1,  //蓝牙连接状态  1 成功 0失败 -1初始值
     blueDeviceDisConnectStatus:-1,  //蓝牙断开状态  1 成功 0失败 -1初始值
     characteristicServiceList:[],
+    blueReceiveData:[]
 
 }
 
@@ -32,7 +33,10 @@ const actions = {
     },
     resetBlueToothData({commit}) {
         commit('resetBlueToothData')
-    }
+    },
+    resetBlueReceiveData({commit}) {
+        commit('resetBlueReceiveData')
+    },
 
 }
 const mutations = {
@@ -89,6 +93,12 @@ const mutations = {
     SOCKET_pushCharacteristicServerList(state,info) {
         state.characteristicServiceList.push(info)
     },
+    SOCKET_pushBlueData(state,data) {
+        state.blueReceiveData.push(data)
+    },
+    resetBlueReceiveData(state) {
+        state.blueReceiveData = []
+    },
     resetBlueDeviceList(state) {
         state.blueDeviceList = []
         state.scanLoading = true
@@ -107,7 +117,8 @@ const mutations = {
     },
     resetBlueToothData(state) {
         state.blueToothData = ''
-    }
+    },
+
 }
 
 const getters = {
@@ -121,12 +132,13 @@ const getters = {
     scanLoading:state=>state.scanLoading,
     blueDeviceList:state=>state.blueDeviceList,
     characteristicServiceList:state=>state.characteristicServiceList,
+    blueReceiveData:state=>state.blueReceiveData
 }
 
 
-    export default {
-    state,
-    actions,
-    mutations,
-    getters,
-    }
+export default {
+state,
+actions,
+mutations,
+getters,
+}

static/server/app.js

@@ -21,6 +21,18 @@ var lastBuffer = null;
 
 var nowConnectedBlueDeviceId = ''
 
+var log4js = require('log4js');
+
+var allLogPath = process.env['APPDATA'] + '/zxy/logs/'+ commonFunction.getLogDate() + '.log'
+log4js.configure({
+    appenders: { cheese: { type: 'file', filename: allLogPath } },
+    categories: { default: { appenders: ['cheese'], level: 'info' } }
+});
+
+const logger = log4js.getLogger('cheese');
+var receiveType = 'pressure'
+
+
 
 io.sockets.on('connection', function (socket) {
     // 取零
@@ -176,34 +188,37 @@ io.sockets.on('connection', function (socket) {
             // 连接蓝牙设备
             request.args.on_data_cb =  function (data) {
                 // 接收数据！
-                if (lastBuffer !== null) {
-                    data = Buffer.concat([lastBuffer, data]);
-                }
-                let flag = 1;
-                while(flag){
-                    if (data.length < frame_header_and_size_bytes) {
-                        lastBuffer = data;
-                        break;
+                if(receiveType == 'pressure') {
+                    if (lastBuffer !== null) {
+                        data = Buffer.concat([lastBuffer, data]);
                     }
-                    let dataLength = data.readUIntLE(1, 2)
-                    let frameLength = frame_header_and_size_bytes + dataLength
-
-                    if(data.length > frameLength) {
-                        let frame = data.slice(0, frameLength);
-                        setAllCommand(frame)
-                        lastBuffer = data.slice(frameLength)
+                    let flag = 1;
+                    while(flag){
+                        if (data.length < frame_header_and_size_bytes) {
+                            lastBuffer = data;
+                            break;
+                        }
+                        let dataLength = data.readUIntLE(1, 2)
+                        let frameLength = frame_header_and_size_bytes + dataLength
 
-                        if(lastBuffer.length >= frame_header_and_size_bytes) {
-                            data = lastBuffer
-                            continue;
+                        if(data.length > frameLength) {
+                            let frame = data.slice(0, frameLength);
+                            setAllCommand(frame)
+                            lastBuffer = data.slice(frameLength)
+                            if(lastBuffer.length >= frame_header_and_size_bytes) {
+                                data = lastBuffer
+                                continue;
+                            }
+                        } else if(data.length === frameLength) {
+                            setAllCommand(data)
+                            lastBuffer = null;
+                        } else {
+                            lastBuffer = data;
                         }
-                    } else if(data.length === frameLength) {
-                        setAllCommand(data)
-                        lastBuffer = null;
-                    } else {
-                        lastBuffer = data;
+                        flag = 0;
                     }
-                    flag = 0;
+                } else {
+                    io.sockets.emit('pushBlueData', commonFunction.toBuffer(data).toString('hex'))
                 }
                 // io.sockets.emit('blueToothData', buffer)
             }
@@ -236,6 +251,7 @@ io.sockets.on('connection', function (socket) {
             }
         } else if(request.cmd == 'setup') {
             if(nowConnectedBlueDeviceId !='') {
+                receiveType = request.type
                 nobleWrapper.setUp(request.data)
             }
         } else if(request.cmd == 'closeSetUp') {
@@ -332,6 +348,7 @@ socketServer.on('connection',(socket)=>{
 function setAllCommand(validateData) {
 let validNumByteArray = new Uint8Array(validateData);
 let allCommond = commonFunction.buf2hex(validNumByteArray);
+logger.info(allCommond)
 let commond = allCommond.substring(0,2)
 // 判断 帧头 e5 足压扫描
 if(commond == 'e5') {

static/server/protocal/commonFunction.js

@@ -46,9 +46,24 @@ module.exports = {
             }
         )
         return str.join('');
+    },
+    // arrayBuffer to buffer
+    toBuffer(ab) {
+        var buf = new Buffer(ab.byteLength);
+        var view = new Uint8Array(ab);
+        for (var i = 0; i < buf.length; ++i) {
+            buf[i] = view[i];
+        }
+        return buf;
+    },
+    getLogDate() {
+        var myDate = new Date();
+        return  (myDate.getYear()-100).toString()+ '-' + addStrZero(myDate.getMonth()+1) + '-' + addStrZero(myDate.getDate()) +'_'+addStrZero(myDate.getHours())
     }
 }
-
+function addStrZero(num) {
+    return  num < 10 ? '0'+num.toString():num.toString()
+}
 function pressureDataProcess(a,scale,size) {
     var height = 60;
     var width = 60;