feature：更改蓝牙的广播方式

app.js

@@ -1,4 +1,5 @@
 // app.ts
+import btHelper from './devices/bt_helper';
 import mqtt from './utils/mqtt';
 //连接的服务器域名
 const host = 'wxs://mqtt.test.radio1964.com';
@@ -215,6 +216,13 @@ App({
   // 获取蓝牙权限
   getBluetoothStatus() {
     const _this = this;
+    btHelper.initBluetooth((adpter, hasPermission) => {
+      console.log("蓝牙权限", adpter, hasPermission);
+      _this.globalData.scopeBluetooth = hasPermission;
+      if (getCurrentPages()[getCurrentPages().length - 1].getBluetoothStatusCallck) {
+        getCurrentPages()[getCurrentPages().length - 1].getBluetoothStatusCallck(_this.globalData.scopeBluetooth);
+      }
+    });
 
   },
 })

devices/ble_manager.js

@@ -10,7 +10,7 @@ class bleManager {
     }
 
     // 检查蓝牙权限
-    async checkBluetoothPermission() {
+    async checkBluetoothPermission(callback) {
         // return new Promise((resolve, reject) => {
         // 获取蓝牙权限
         const _app = getApp();
@@ -20,12 +20,17 @@ class bleManager {
                     _app.globalData.scopeBluetooth = true;
                     this.hasPermission = true;
                     // console.log('checkBluetoothPermission success, now is', res)
-
+                    if (callback) {
+                        callback(true);
+                    }
                     // resolve(true);
 
                 } else if (res.authSetting["scope.bluetooth"] === undefined) {
                     _app.globalData.scopeBluetooth = false;
                     this.hasPermission = false;
+                    if (callback) {
+                        callback(false);
+                    }
                     wx.authorize({
                         scope: "scope.bluetooth",
                         complete() {
@@ -38,7 +43,9 @@ class bleManager {
                 } else {
                     _this.globalData.scopeBluetooth = false;
                     this.hasPermission = false;
-
+                    if (callback) {
+                        callback(false);
+                    }
                     wx.showModal({
                         title: '请打开系统蓝牙进行配网',
                         content: '如已打开蓝牙仍然弹框，请尝试重启小程序',
@@ -64,29 +71,36 @@ class bleManager {
     }
 
     // 初始化蓝牙适配器
-    async initBluetoothAdapter() {
+    async initBluetoothAdapter(callback) {
         let _this = this
-        // return new Promise((resolve, reject) => {
-        wx.openBluetoothAdapter({
-            success: (res) => {
-                _this.isAvailable = true;
-                // console.log('adapterState success, now is', res)
-
-                // resolve(true);
-            },
-            fail: (err) => {
-                _this.isAvailable = false;
-                console.log('adapterState fail, now is', err)
+        return new Promise((resolve, reject) => {
+            wx.openBluetoothAdapter({
+                success: (res) => {
+                    _this.isAvailable = true;
+                    // console.log('adapterState success, now is', res)
+                    if (callback) {
+                        callback(true);
+                    }
+                    resolve(true);
+                },
+                fail: (err) => {
+                    _this.isAvailable = false;
+                    console.log('adapterState fail, now is', err)
+                    if (callback) {
+                        callback(false);
+                    }
+                    reject(false);
+                }
+            });
+            wx.onBluetoothAdapterStateChange(function (res) {
+                console.log('adapterState changed, now is', res)
+                if (callback) {
+                    callback(res.available ?? false);
+                }
+                _this.isAvailable = res.available ?? false
 
-                // reject(false);
-            }
+            })
         });
-        wx.onBluetoothAdapterStateChange(function (res) {
-            console.log('adapterState changed, now is', res)
-            _this.isAvailable = res.available ?? false
-
-        })
-        // });
     }
 
     closeBle() {
@@ -101,8 +115,8 @@ class bleManager {
         return new Promise((resolve, reject) => {
             wx.getConnectedBluetoothDevices({
                 // services: ["FFC0", "ffc0", "FFC1", "FFC2", "ffc1", "ffc2", "AB00", "ab00", "AB01", "AB02", "FFF1", "fff1", "FFE2", "FFE5",],
-                // services: ["ab00", "0000AB00-0000-1000-8000-00805F9B34FB", "ffe5", "1111"],
-                services: [],
+                services: ["ab00", "ffe5", "1111", "FFC0", "FFC1", "FFF1",],
+                // services: [],
                 // services: [
                 //     "0000ab00-0000-1000-8000-00805f9b34fb",
                 //     "0000ffc0-0000-1000-8000-00805f9b34fb",
@@ -111,12 +125,9 @@ class bleManager {
                 //     "0000FFE5-0000-1000-8000-00805F9B34FB",
                 // ],
                 success: (res) => {
-                    // const connectedDevices = res.devices.map(device => ({
-                    //     deviceId: device.deviceId,
-                    //     name: device.name || device.localName
-                    // }));
-                    console.log('已连接的蓝牙设备:', res);
-                    resolve(res);
+                    let newDevices = this.fiterDevice(res)
+                    console.log('已连接的蓝牙设备:', newDevices);
+                    resolve(newDevices);
                 },
                 fail: (err) => {
                     console.error('获取已连接的蓝牙设备失败:', err);
@@ -502,7 +513,8 @@ class bleManager {
                     let dataResult = []
                     for (let i = 0; i < dataView.byteLength; i++) {
                         // console.log("0x" + dataView.getUint8(i).toString(16))
-                        dataResult.push(dataView.getUint8(i).toString(16))
+                        // dataResult.push("0x" + dataView.getUint8(i).toString(16))
+                        dataResult.push(dataView.getUint8(i))
                     }
                     const result = dataResult
                     console.log("拿到的数据：", result)

devices/bluetooth/bt_cmd.js

@@ -131,18 +131,23 @@ class BtCmd {
     }
 
     // 设置时间
-    static get setTime() {
-        const y = TimeUtil.getYear();
+    static get setDevTime() {
+        const now = new Date();
+        const y = now.getFullYear();
         const year = Math.floor(y / 100);
         const _year = y % 100;
-        const month = TimeUtil.getMonth();
-        const day = TimeUtil.getDay();
-        const hour = TimeUtil.getHour();
-        const minutes = TimeUtil.getMinute();
-        const seconds = TimeUtil.getSecond();
-
-        console.log(`setTime========${year},${_year},${month},${day},${hour},${minutes},${seconds}`);
-        return this._build(CmdRtc.setTime, [year, _year, month, day, hour, minutes, seconds]);
+        const month = now.getMonth() + 1; // getMonth() 返回 0-11，所以需要加 1
+        const day = now.getDate();
+        const hour = now.getHours();
+        const minutes = now.getMinutes();
+        const seconds = now.getSeconds();
+
+        // console.log(`setTime========${CmdRtc.setTime},${year},${_year},${month},${day},${hour},${minutes},${seconds}`);
+        // console.log(`setTime======== 2,    ${CmdRtc.setTime}`);
+
+        let cmd = this._build(0x50, [year, _year, month, day, hour, minutes, seconds]);
+        console.log(`setTime========${cmd}`);
+        return cmd;
     }
 
     // 查询时间

devices/bluetooth/bt_parse.js

@@ -10,6 +10,17 @@ import {
     CmdWeek
 } from './bt_cmd';
 
+import {
+    CmdEvent,
+    EnumCmdEvent,
+    EnumPlayStatus,
+    EnumSupplier
+} from '../cmd_key_event';
+
+import EventManager from '../../utils/event_bus'
+
+
+
 class BtParse {
     // 型号名称
     // static mateX2 = "MW-Mate X(4G_WIFI)";
@@ -58,46 +69,50 @@ class BtParse {
                 // 查询版本号后校验设备
                 else if (type === CmdBase.queryVersion) {
                     const version = CmdBase.parseVersion(value);
-                    //EventManager.fire(CmdEvent.version(version));
-                    //EventManager.fire(CmdEvent.getDeviceInfo());
+                    EventManager.fire(CmdEvent.version(version));
+                    EventManager.fire(CmdEvent.getDeviceInfo());
                 } else if (BtParse._getDataHeader(cmd)) {
                     // 控制指令
                     BtParse._controlCmd(cmd);
                 } else {
+                    console.log("收到不明指令：", cmd);
                     const manufacturer = "";
                     // DeviceManager.instance.device?.manufacturer ?? "";
 
                     // 山景的语音判断
-                    if (manufacturer === EnumSupplier.shanJing) {
-                        const sjCmd = cmd[4];
-                        if (sjCmd === CmdVoice.sjStartVoice) {
-                            BtParse._startRecord(EnumSupplier.shanJing);
-                        } else if (sjCmd === CmdVoice.sjStopVoice) {
-                            BtParse._stopRecord(EnumSupplier.shanJing);
-                        }
-
-                        // 山景的都要走接收数据
-                        BtParse._receiveRecordData(cmd);
-                    } else {
-                        // b1耳机、领芯、杰里p2第二部分语音数据直接走这里
-                        BtParse._receiveRecordData(cmd);
-                    }
+                    // if (manufacturer === EnumSupplier.shanJing) {
+                    //     const sjCmd = cmd[4];
+                    //     if (sjCmd === CmdVoice.sjStartVoice) {
+                    //         BtParse._startRecord(EnumSupplier.shanJing);
+                    //     } else if (sjCmd === CmdVoice.sjStopVoice) {
+                    //         BtParse._stopRecord(EnumSupplier.shanJing);
+                    //     }
+
+                    //     // 山景的都要走接收数据
+                    //     BtParse._receiveRecordData(cmd);
+                    // } else {
+                    //     // b1耳机、领芯、杰里p2第二部分语音数据直接走这里
+                    //     BtParse._receiveRecordData(cmd);
+                    // }
                 }
             }
         }
     }
 
     static _send(cmdEvent) {
-        // todo
-        // EventManager.fire(CmdEvent[cmdEvent]);
+        EventManager.fire(CmdEvent[cmdEvent]);
     }
 
     static _getDataHeader(cmd) {
         if (cmd.length < 4) {
             return false;
         }
+        ["54", "44", "44", "48", "1", "9", "22", "1", "4"]
+
         const header = [0x54, 0x44, 0x44, 0x48];
-        return cmd[0] === header[0] && cmd[1] === header[1] && cmd[2] === header[2] && cmd[3] === header[3];
+        let isCmd = cmd[0] === header[0] && cmd[1] === header[1] && cmd[2] === header[2] && cmd[3] === header[3];
+        // console.log("收到数据头：", cmd[0], header[0], cmd[1], header[1], cmd[2], header[2], cmd[3], header[3],);
+        return isCmd;
     }
 
     // todo 暂时不要
@@ -159,12 +174,6 @@ class BtParse {
         switch (type) {
             // 校验设备
             case CmdBase.checkDeviceSuccess:
-                // 设置100ms间隔，同时发会丢失指令
-                // DeviceManager.instance.setLowKwhWarningTone();
-                // DeviceManager.instance.queryLowKwhWarningTone();
-                // DeviceManager.instance.getAutoPlay();
-                // DeviceManager.instance.setTime();
-                // DeviceManager.instance.getDeviceInfo();
                 break;
 
             // 按键   短按、长按等
@@ -299,34 +308,35 @@ class BtParse {
                 }
 
                 // 仅用于记录设备音量，播控页面显示用
-                //EventManager.fire(CmdEvent.volume({ volume: trueVolume }));
-                // if (DeviceUtil.isAndroid) {
-                //     const name = "";
-                //     // DeviceManager.instance.name;
-                //     if (name === "猫王·霹雳唱机") {
-                //         // VolumeUtil.setVolume(trueVolume);
-                //     }
-                // }
+                EventManager.fire(CmdEvent.volume({ volume: trueVolume }));
+                if (DeviceUtil.isAndroid) {
+                    const name = "";
+                    // todo 
+                    // DeviceManager.instance.name;
+                    if (name === "猫王·霹雳唱机") {
+                        // VolumeUtil.setVolume(trueVolume);
+                    }
+                }
                 break;
 
             // 查询电量
             case CmdKwh.queryKwh:
-                //EventManager.fire(CmdEvent.battery({ kwh: value }));
+                EventManager.fire(CmdEvent.battery({ kwh: value }));
                 break;
 
             // 自动播放 54, 44, 44, 48, 1, 9, 24, 1, 1
             case CmdBase.getAutoPlay:
             case CmdBase.setAutoPlay:
-                // setTimeout(() => {
-                //     EventManager.fire(CmdEvent.playStatus({
-                //         playStatus: value === EnumOpen.open ? EnumPlayStatus.play : EnumPlayStatus.pause,
-                //     }));
-                // }, 300);
+                setTimeout(() => {
+                    EventManager.fire(CmdEvent.playStatus({
+                        playStatus: value === EnumOpen.open ? EnumPlayStatus.play : EnumPlayStatus.pause,
+                    }));
+                }, 300);
                 break;
 
             // 查询低电量设置
             case CmdKwh.queryLowKwhWarningTone:
-                //EventManager.fire(CmdEvent.queryLowKwn({ kwh: value }));
+                EventManager.fire(CmdEvent.queryLowKwn({ kwh: value }));
                 break;
 
             // 耳机电量 index0 ：左耳机， index1：左耳机 ,index2: 充电盒。value： 0-9代表10-100% 获取不到用-1
@@ -342,12 +352,12 @@ class BtParse {
                     kwh = Math.max(value, rightKwh);
                 }
 
-                // EventManager.fire(CmdEvent.batteryEarphone({
-                //     kwhLeft: value,
-                //     kwhBox: boxKwh,
-                //     kwhRight: rightKwh,
-                //     kwh: kwh,
-                // }));
+                EventManager.fire(CmdEvent.batteryEarphone({
+                    kwhLeft: value,
+                    kwhBox: boxKwh,
+                    kwhRight: rightKwh,
+                    kwh: kwh,
+                }));
                 break;
 
             // EQ  [84, 68, 68, 72, 1, 18, 180, 10, 0, 0, 240, 237, 236, 0, 236, 0, 0, 0]
@@ -357,14 +367,14 @@ class BtParse {
                     const result = cmd.slice(8, cmd.length);
                     const list = result.map(element => parseInt(element, 16));
                     console.log("eq==============", list);
-                    // EventManager.fire(CmdEvent.eqs({ eqs: list }));
+                    EventManager.fire(CmdEvent.eqs({ eqs: list }));
                 }
                 break;
 
             // 低延迟  [54, 44, 44, 48, 1, a, b2, 2, 0, 2]
             case CmdEarPhone.queryLowDelayMode:
                 const lowDelayMode = cmd[9];
-                // EventManager.fire(CmdEvent.lowDelayMode({ lowDelayMode, lowDelayModeOpen: value }));
+                EventManager.fire(CmdEvent.lowDelayMode({ lowDelayMode, lowDelayModeOpen: value }));
                 break;
 
             // 耳机低电量
@@ -382,19 +392,19 @@ class BtParse {
                     const minutes = cmd[11];
                     const wakeCycle = CmdWeek.cmd2Week(week);
                     console.log("queryAlarm=====", wakeSwitch, "=", wakeCycle);
-                    // EventManager.fire(CmdEvent.wake({
-                    //     wakeSwitch,
-                    //     wakeCycle,
-                    //     wakeHour: hour,
-                    //     wakeMinutes: minutes,
-                    // }));
+                    EventManager.fire(CmdEvent.wake({
+                        wakeSwitch,
+                        wakeCycle,
+                        wakeHour: hour,
+                        wakeMinutes: minutes,
+                    }));
                 }
                 break;
 
             // 查询自动休眠状态
             case CmdRtc.querySleepAfterPlayPause:
             case CmdRtc.setSleepAfterPlayPause:
-                //EventManager.fire(CmdEvent.pauseSleep({ pauseSleep: value }));
+                EventManager.fire(CmdEvent.pauseSleep({ pauseSleep: value }));
                 break;
 
             // 查询休眠
@@ -404,11 +414,11 @@ class BtParse {
                 const minutes = cmd[10];
                 const leftHour = cmd[11];
                 const leftMinutes = cmd[12];
-                // EventManager.fire(CmdEvent.sleep({
-                //     sleepSwitch,
-                //     sleepHour: hour,
-                //     sleepMinutes: minutes,
-                // }));
+                EventManager.fire(CmdEvent.sleep({
+                    sleepSwitch,
+                    sleepHour: hour,
+                    sleepMinutes: minutes,
+                }));
                 break;
 
             // 开始录音
@@ -422,7 +432,7 @@ class BtParse {
                 const singleC = cmd[8];
                 const doubleC = cmd[9];
                 const longC = cmd[10];
-                //EventManager.fire(CmdEvent.ctrlStatus({ ctrlStatus: [singleC, doubleC, longC] }));
+                EventManager.fire(CmdEvent.ctrlStatus({ ctrlStatus: [singleC, doubleC, longC] }));
                 break;
 
             default:

devices/bt_helper.js

@@ -18,23 +18,8 @@ const bleManager = require('./ble_manager');
 // const EnumLowDelayMode = require('./EnumLowDelayMode');
 // const EnumPlayStatus = require('./EnumPlayStatus');
 
-// 或者使用对象字面量
-const EnumSupplier = {
-    shanJing: "ShanJing",
-    jieLi: "JieLi",
-    lingXin: "LingXin",
-    qiXinWei: "QiXinWei"
-};
-
-const EnumPlayStatus = {
-    none: 'none',
-    play: 'play',
-    pause: 'pause',
-    stop: 'stop',
-    completed: 'completed',
-    error: 'error',
-    buffering: 'buffering', // APP自己定义的特殊处理中间状态
-};
+
+
 
 class BtHelper {
     // static get instance() {
@@ -88,8 +73,8 @@ class BtHelper {
     }
 
     async _connectSuccess() {
-        await btHelper.checkDevice()
-        await btHelper.getDeviceInfo()
+        btHelper.checkDevice()
+        btHelper.getDeviceInfo()
     }
 
     async connect(data, onChanged) {
@@ -104,12 +89,18 @@ class BtHelper {
             if (res === false) {
                 console.log("连接失败")
                 this.disconnect(data)
+                if (onChanged) {
+                    onChanged(false)
+                }
                 return
             }
             const serviceId = await bleManager.discoverServices(data.deviceId);
             if (serviceId == "") {
                 console.log("连接失败")
                 this.disconnect(data)
+                if (onChanged) {
+                    onChanged(false)
+                }
                 return
             }
             // this.setData({ services });
@@ -119,6 +110,9 @@ class BtHelper {
             if (characteristics == "") {
                 console.log("连接失败")
                 this.disconnect(data)
+                if (onChanged) {
+                    onChanged(false)
+                }
                 return
             }
             console.log('device特征值:', characteristics)
@@ -164,8 +158,8 @@ class BtHelper {
         // await this._helper.dispose();
     }
 
-    async send(cmd, type) {
-        // console.log('开始发送数据:', cmd)
+    send(cmd, type) {
+        console.log('开始发送数据:', cmd)
         if (cmd) {
             bleManager.sendData(cmd)
         }
@@ -177,12 +171,16 @@ class BtHelper {
     //     this.initBluetooth();
     //   }
 
-    async initBluetooth() {
+    async initBluetooth(callback) {
         try {
-            bleManager.initBluetoothAdapter();
+            let adpter = await bleManager.initBluetoothAdapter((res) => { });
             // console.log(res)
 
-            bleManager.checkBluetoothPermission();
+            bleManager.checkBluetoothPermission(function (per) {
+                if (callback) {
+                    callback(adpter, per)
+                }
+            });
             // console.log(per)
         } catch (error) {
             console.error(error);
@@ -197,14 +195,16 @@ class BtHelper {
         try {
             const connectedDevices = await bleManager.getConnectedDevices();
             console.log("全部设备1：", connectedDevices)
-            if (connectedDevices.devices.length) {
+            if (connectedDevices.length) {
                 // todo 已经连接上的设备
             }
-            // const allDevices = await bleManager.getAllConnectedDevices()
-            // console.log("全部设备2：", allDevices.length)
-            return connectedDevices
+            const allDevices = await bleManager.getAllConnectedDevices()
+            console.log("全部设备2：", allDevices)
+            let newDevices = connectedDevices.concat(allDevices);
+            return newDevices
         } catch (error) {
             console.error(error);
+            return []
         }
     }
 
@@ -223,7 +223,7 @@ class BtHelper {
         return 400;
     }
 
-    async getDeviceInfo() {
+    getDeviceInfo() {
         // if (DeviceManager.instance.isEarphone) {
         //     this.send(BtCmd.queryKwhEarPhone);
         //     this.send(BtCmd.queryLowDelayMode);
@@ -231,13 +231,13 @@ class BtHelper {
         //     this.send(BtCmd.queryLowPower);
         //     this.send(BtCmd.queryCtrlStatus);
         // } else {
-        await this.send(BtCmd.setTime());
-        await this.send(BtCmd.queryKwh());
-        await this.getSleep();
-        await this.getAlert();
-        await this.send(BtCmd.queryRGB());
-        await this.getVolume();
-        await this.getPauseSleep();
+        this.send(BtCmd.setDevTime());
+        this.send(BtCmd.queryKwh());
+        this.getSleep();
+        this.getAlert();
+        this.send(BtCmd.queryRGB());
+        this.getVolume();
+        this.getPauseSleep();
         // }
     }
 
@@ -282,7 +282,8 @@ class BtHelper {
     }
 
     async setTime() {
-        await this.send(BtCmd.setTime());
+        console.log("setTime========111")
+        // await this.send(BtCmd.setTime());
     }
 
     async setVolume(volume) {
@@ -337,17 +338,17 @@ class BtHelper {
 
     stopVoiceRecordResponse(supplier) {
         console.log(`回调结束录音：${supplier}`);
-        switch (supplier) {
-            case EnumSupplier.jieLi:
-                this.send(BtCmd.jlStopVoiceResponse());
-                break;
-            case EnumSupplier.lingXin:
-                this.send(BtCmd.lxStopVoiceResponse());
-                break;
-            case EnumSupplier.qiXinWei:
-                this.send(BtCmd.b1StopVoiceResponse());
-                break;
-        }
+        // switch (supplier) {
+        //     case EnumSupplier.jieLi:
+        //         this.send(BtCmd.jlStopVoiceResponse());
+        //         break;
+        //     case EnumSupplier.lingXin:
+        //         this.send(BtCmd.lxStopVoiceResponse());
+        //         break;
+        //     case EnumSupplier.qiXinWei:
+        //         this.send(BtCmd.b1StopVoiceResponse());
+        //         break;
+        // }
     }
 
     async getLowDelayMode() {

devices/cmd_key_event.js

@@ -49,11 +49,24 @@ const EnumCmdEvent = {
 };
 
 // 枚举定义
+
 const EnumPlayStatus = {
+    none: 'none',
     play: 'play',
     pause: 'pause',
     stop: 'stop',
-    completed: 'completed'
+    completed: 'completed',
+    error: 'error',
+    buffering: 'buffering', // APP自己定义的特殊处理中间状态
+};
+
+
+// 或者使用对象字面量
+const EnumSupplier = {
+    shanJing: "ShanJing",
+    jieLi: "JieLi",
+    lingXin: "LingXin",
+    qiXinWei: "QiXinWei"
 };
 
 // 设备操作类
@@ -352,4 +365,11 @@ class CmdEvent {
     toString() {
         return `CmdEvent{cmdEvent: ${this.cmdEvent}, channelId: ${this.channelId}, wakeSwitch: ${this.wakeSwitch}, wakeCycle: ${this.wakeCycle}, wakeHour: ${this.wakeHour}, wakeMinutes: ${this.wakeMinutes}, sleepSwitch: ${this.sleepSwitch}, sleepHour: ${this.sleepHour}, sleepMinutes: ${this.sleepMinutes}, kwh: ${this.kwh}, volume: ${this.volume}, version: ${this.version}}`;
     }
-}
+}
+
+module.exports = {
+    CmdEvent,
+    EnumCmdEvent,
+    EnumPlayStatus,
+    EnumSupplier
+};

utils/event_bus.js

@@ -108,7 +108,7 @@ function removeNotification(name,observer) {
 }
 
 /**
- * postNotificationName
+ * fire
  * 发送通知方法
  * 
  * 参数:
@@ -116,10 +116,10 @@ function removeNotification(name,observer) {
  * info: 携带的参数
  */
 
-function postNotificationName(name, info) {
-    console.log("postNotificationName:" + name);
+function fire(name, info) {
+    console.log("fire:" + name);
     if(__notices.length == 0){
-      console.log("postNotificationName error: u hadn't add any notice.");
+      console.log("fire error: u hadn't add any notice.");
       return;
     }
 
@@ -187,6 +187,6 @@ function cmp(x, y) {
 module.exports = {
     addNotification: addNotification,
     removeNotification: removeNotification,
-    postNotificationName: postNotificationName,
+    fire: fire,
     addOnceNotification: addOnceNotification
 }