ver：0.0.5

desc：1. characteristicsServers  有notify 也设置为可连接
      2. 用户可自主编辑发送指令
poster：张晓宇

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zxy",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "author": "xiaoyuzhang <771799477@qq.com>",
   "description": "An electron-vue project",
   "license": null,

src/renderer/components/ble/characteristicsServers.vue

@@ -62,7 +62,7 @@
         </el-table-column>
       </el-table>
 
-    <el-dialog title="添加小程序模板" width="80%"
+    <el-dialog title="发送蓝牙数据" width="80%"
                :close-on-click-modal="false"
                :visible.sync="validate"
                :modal-append-to-body="false"
@@ -81,7 +81,23 @@
           <el-button @click="stopCollection">停止采集</el-button>
           <el-button @click="resetDevice">复位</el-button>
         </div>
-
+        <el-row>
+          <el-col :span="8">
+            <div class="grid-content bg-purple">
+              <span>请输入指令（hex）：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="grid-content bg-purple-light">
+              <el-input v-model="inputData" placeholder="请输入内容"></el-input>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="grid-content bg-purple">
+              <el-button @click="sendInputData">发送</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" />
@@ -109,6 +125,7 @@
           localName:typeof (this.$route.query.localName) =='undefined' ?'N/A':this.$route.query.localName,
           validate:false,
           sendData:'',
+          inputData:'04 00 02 00'
       }
     },
     created() {
@@ -168,9 +185,11 @@
             for(let j of properties) {
                 if (j=='write'||j=='read') {
                     flag ++
+                } else if(j == 'notify') {
+                    flag += 2
                 }
             }
-            if(flag == 1) {
+            if(flag >= 1) {
                 bRes = true
             }
             return bRes
@@ -215,9 +234,21 @@
         },
         resetDevice() {
             this.$socket.emit('sendBleData', {type: 'resetDevice'})
+        },
+        sendInputData() {
+            if(this.inputData =='') {
+                this.errorNotify('输入指令值不能为空')
+            } else {
+                // 16进制数操作
+                let arr = this.inputData.trim().split(" ");
+                let data = []
+                for(let j of arr) {
+                    data.push(parseInt(j,16))
+                }
+                this.$socket.emit('sendBleData', {type: 'sendOwnData',data:Buffer(data)})
+            }
         }
 
-
     },
     computed: {
       ...mapGetters([

static/server/app.js

@@ -240,7 +240,6 @@ io.sockets.on('connection', function (socket) {
             }
         } else if(request.cmd == 'closeSetUp') {
             // 用户关闭dialog  并把CharacteristicServer 取消订阅 unsubscribe
-            console.log('close')
             nobleWrapper.disSetUp()
         }
     });
@@ -263,6 +262,9 @@ io.sockets.on('connection', function (socket) {
             case 'resetDevice':
                 sendData = sendProtocal.resetDevice()
                 break;
+            case 'sendOwnData':
+                sendData = data.data
+                break;
         }
         nobleWrapper.write(sendData,function (res) {
             console.log(res)

static/server/ble/nobleWrapper.js

@@ -130,7 +130,6 @@ module.exports = {
   disSetUp:function () {
       if(connectedCharacteristic != null) {
           connectedCharacteristic.unsubscribe(error =>{
-              console.log(error)
               if(error ==null) {
                   console.log('unsubscribe,success!')
                   connectedCharacteristic = null

static/server/protocal/sendProtocal.js

@@ -70,7 +70,6 @@ module.exports = {
       }
       let checkSum = (realcmd + id + sum) & 0xff
       data.push(checkSum)
-      console.log(Buffer(data))
       return Buffer(data);
   },
   // 查询当前模式